diff --git a/.env.development b/.env.development
index 2d64f2f..37992fd 100644
--- a/.env.development
+++ b/.env.development
@@ -1,10 +1,10 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
 #房可鑫测试
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 

diff --git a/.env.development b/.env.development
index 2d64f2f..37992fd 100644
--- a/.env.development
+++ b/.env.development
@@ -1,10 +1,10 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
 #房可鑫测试
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index d2b2d53..8fcecda 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -77,3 +77,14 @@
     data,
   })
 }
+
+// 详情
+export function getStream(data: { id: string }) {
+  return request({
+    url: `${prefix}/order/form/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+

diff --git a/.env.development b/.env.development
index 2d64f2f..37992fd 100644
--- a/.env.development
+++ b/.env.development
@@ -1,10 +1,10 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
 #房可鑫测试
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index d2b2d53..8fcecda 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -77,3 +77,14 @@
     data,
   })
 }
+
+// 详情
+export function getStream(data: { id: string }) {
+  return request({
+    url: `${prefix}/order/form/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/index.ts b/src/api/index.ts
index a368449..24bb58b 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -26,7 +26,7 @@
 const request = axios.create({
   // baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL,
   baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL,
-  timeout: 1000 * 60,
+  timeout: 1000 * 60 * 2,
   responseType: 'json',
 })
 

diff --git a/.env.development b/.env.development
index 2d64f2f..37992fd 100644
--- a/.env.development
+++ b/.env.development
@@ -1,10 +1,10 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
 #房可鑫测试
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index d2b2d53..8fcecda 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -77,3 +77,14 @@
     data,
   })
 }
+
+// 详情
+export function getStream(data: { id: string }) {
+  return request({
+    url: `${prefix}/order/form/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/index.ts b/src/api/index.ts
index a368449..24bb58b 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -26,7 +26,7 @@
 const request = axios.create({
   // baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL,
   baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL,
-  timeout: 1000 * 60,
+  timeout: 1000 * 60 * 2,
   responseType: 'json',
 })
 
diff --git a/src/views/business/schedule/certPrint/components/filePreviewDialog.vue b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
index 6789bff..cef9f05 100644
--- a/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
+++ b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="FilePreviewDialog">
 import VuePdfEmbed from 'vue-pdf-embed'
 import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading } from 'element-plus'
 import { getPhotoUrl } from '@/api/system/tool'
 // 弹窗显示状态
 const dialogVisible = ref(false)
@@ -12,11 +13,16 @@
  * @param printFileName 文件名
  */
 function initDialog(printFileName: string) {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   getPhotoUrl(printFileName).then((res) => {
     dialogVisible.value = true
     const url = res.data
     pdfUrl.value = res.data
     pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
     // proxy.$refs.pdf.print()
     // download(url, row.printFileName as string)
   })

diff --git a/.env.development b/.env.development
index 2d64f2f..37992fd 100644
--- a/.env.development
+++ b/.env.development
@@ -1,10 +1,10 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
 #房可鑫测试
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index d2b2d53..8fcecda 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -77,3 +77,14 @@
     data,
   })
 }
+
+// 详情
+export function getStream(data: { id: string }) {
+  return request({
+    url: `${prefix}/order/form/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/index.ts b/src/api/index.ts
index a368449..24bb58b 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -26,7 +26,7 @@
 const request = axios.create({
   // baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL,
   baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL,
-  timeout: 1000 * 60,
+  timeout: 1000 * 60 * 2,
   responseType: 'json',
 })
 
diff --git a/src/views/business/schedule/certPrint/components/filePreviewDialog.vue b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
index 6789bff..cef9f05 100644
--- a/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
+++ b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="FilePreviewDialog">
 import VuePdfEmbed from 'vue-pdf-embed'
 import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading } from 'element-plus'
 import { getPhotoUrl } from '@/api/system/tool'
 // 弹窗显示状态
 const dialogVisible = ref(false)
@@ -12,11 +13,16 @@
  * @param printFileName 文件名
  */
 function initDialog(printFileName: string) {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   getPhotoUrl(printFileName).then((res) => {
     dialogVisible.value = true
     const url = res.data
     pdfUrl.value = res.data
     pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
     // proxy.$refs.pdf.print()
     // download(url, row.printFileName as string)
   })
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index bb4d128..c917cc9 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -12,8 +12,9 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getUid } from '@/utils/getUid'
 import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
-import { addOrder, getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
 import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
+import { printPdf } from '@/utils/printUtils'
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
@@ -28,8 +29,8 @@
   orderCode: '', // 委托书编号
   postalCode: '', // 委托方邮编
   orderId: '', // 委托书编号
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
+  deliverer: '', // 送检人/联系人
+  // delivererTel: '', // 送样人联系方式
   orderTime: '', // 委托日期
   planDeliverTime: '', // 预计送达时间
   requireOverTime: '', // 要求检完时间
@@ -45,16 +46,16 @@
   certificationCompany: '', // 证书单位名称
   certificationCompanyAddress: '', // 证书单位地址
 
-  needContact: '1', // 需联络后再做退件处理1、直接退件处理2
-  receivePersonNo: '', // 收件人工号
-  receivePersonName: '', // 收件人名称
+  needContact: '1', // 需联络后再做退件处理0、直接退件处理1
+  staffNo: '', // 收件人工号
+  staffName: '', // 收件人名称
   receiveDate: '', // 收件日期
-  director: '', // 联系人
-  mobile: '', // 移动电话
+  fixedTel: '', // 固定电话
+  delivererTel: '', // 移动电话
   email: '', // 电子邮件或qq
-  fpdwmc: '', // 发票单位名称
+  invoiceCompany: '', // 发票单位名称
 })
-const checkCertificateList = ref([]) // 对证书要求
+const checkCertificateList = ref([]) as any// 对证书要求多选框
 const scanSampleRef = ref() // 标签绑定弹窗ref
 const certificationsMap = ref<dictType[]>([]) // 证书类别
 const powerVoltageMap = ref<dictType[]>([]) // 电源电压
@@ -73,10 +74,10 @@
   { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   // { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '外观状态', value: 'wgzt', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
   { text: '检测项目', value: 'measureContent', align: 'center', required: false },
   // { text: '样品状态', value: 'sampleStatusName', align: 'center' },
-  { text: '检测依据标准', value: 'appendixDescn', align: 'center', required: false },
+  { text: '检测依据标准', value: 'accordStandard', align: 'center', required: false },
   { text: '备注', value: 'remark', align: 'center', required: false },
 
 ])
@@ -86,9 +87,9 @@
   { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
   { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
-  { text: '证书要求', value: 'zsyq', align: 'center', required: false },
-  { text: '外观状态', value: 'wgzt', align: 'center', required: true },
-  { text: '客户特殊要求', value: 'khtsyq', align: 'center', required: false },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
   { text: '备注', value: 'remark', align: 'center', required: false },
 ])
 
@@ -104,8 +105,8 @@
 }
 // 校验规则
 const rules = reactive<FormRules>({
-  deliverer: [{ required: true, message: '要求送样人必填', trigger: 'blur' }],
-  delivererTel: [{ required: true, message: '要求送样人联系方式必填', trigger: 'blur' }],
+  // deliverer: [{ required: true, message: '要求送样人必填', trigger: 'blur' }],
+  // delivererTel: [{ required: true, message: '要求送样人联系方式必填', trigger: 'blur' }],
   customerNo: [{ required: true, message: '要求委托方代码必填', trigger: 'change' }],
   customerName: [{ required: true, message: '要求委托方名称必填', trigger: 'change' }],
   // phone: [{ required: true, message: '要求委托方电话必填', trigger: 'change' }],
@@ -118,11 +119,11 @@
   certificationCompany: [{ required: true, message: '要求证书单位名称必填', trigger: 'blur' }],
   certificationCompanyAddress: [{ required: true, message: '要求证书单位地址必填', trigger: 'blur' }],
 
-  director: [{ required: true, message: '联系人必填', trigger: 'blur' }],
-  mobile: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
+  deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
+  delivererTel: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
   phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
   email: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
-  fpdwmc: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
+  invoiceCompany: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
 }) // 表单验证规则
 
 // 从路由中获取页面类型参数
@@ -235,8 +236,8 @@
     dataForm.value.phone = val[0].phone // 委托方电话
     dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
 
-    dataForm.value.director = val[0].director // 联系人
-    dataForm.value.mobile = val[0].mobile // 移动电话
+    dataForm.value.deliverer = val[0].director // 联系人
+    dataForm.value.delivererTel = val[0].mobile // 移动电话
     dataForm.value.email = val[0].email // 电子邮件或qq
     dataForm.value.postalCode = val[0].postalCode // 邮编
     dataForm.value.certificationCompany = val[0].customerName // 证书单位名称
@@ -277,7 +278,7 @@
 // 检查表格第几行信息未完善
 const checkList = () => {
   // const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage || !item.measureContent))
-  const index = list.value.findIndex(item => !item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.wgzt)
+  const index = list.value.findIndex((item: any) => !item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.appearanceStatus)
   if (index !== -1) {
     return index + 1
   }
@@ -298,9 +299,13 @@
     sampleName: '', // 样品名称
     sampleModel: '', // 样品型号
     manufacturingNo: '', // 出厂编号
-    powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    measureContent: '', // 检定项目
+    appearanceStatus: '', // 外观状态
+    measureContent: '', // 检测依据标准
+    certificateRequire: '', // 证书要求
+    specialRequire: '', // 客户特殊要求
+    powerVoltage: '', // 电源电压
+    accordStandard: '', // 附件说明
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -401,6 +406,14 @@
         const params = {
           ...dataForm.value,
           customerPhone: dataForm.value.phone, // 委托方电话
+          accordLab: checkCertificateList.value.includes('如无相应检定规程/校准规范,可按本实验室的方法进行校准') ? '1' : '0',
+          agreeOther: checkCertificateList.value.includes('如不能出具所选证书类型,同意受托方出具其他类型证书') ? '1' : '0',
+          needAccordDeclare: checkCertificateList.value.includes('需要符合性声明') ? '1' : '0',
+          needAdvice: checkCertificateList.value.includes('需要建议再校准日期') ? '1' : '0',
+          contactReturn: dataForm.value.needContact === '1' ? '1' : '0', // 需联系之后退件处理
+          directReturn: dataForm.value.needContact === '2' ? '1' : '0', // 直接退件处理
+          orderType: orderType.value === 'measure' ? '1' : orderType.value === 'calibration' ? '2' : '',
+          orderTypeName: orderType.value === 'measure' ? '检测委托单' : orderType.value === 'calibration' ? '检定或校准委托单' : '',
           customerSampleInfoList: list.value,
         }
         if (pageType.value === 'edit') { // 编辑
@@ -452,14 +465,18 @@
 // --------------------------------------------------------------------------------------
 
 // 点击打印
-const printObj = ref({
-  id: 'main', // 需要打印元素的id
-  popTitle: '委托书详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const printPDF = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  getStream({ id: infoId.value }).then((res) => {
+    loading.close()
+    const pdfStream = new Blob([res.data])
+    const blobUrl = URL.createObjectURL(pdfStream)
+    printPdf(blobUrl)
+  })
+}
 
 // 获取详细信息
 const getInfo = () => {
@@ -470,6 +487,27 @@
   getOrderDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
     dataForm.value.phone = res.data.customerPhone
+
+    if (`${res.data.accordLab}` === '1') {
+      checkCertificateList.value.push('如无相应检定规程/校准规范,可按本实验室的方法进行校准')
+    }
+    if (`${res.data.agreeOther}` === '1') {
+      checkCertificateList.value.push('如不能出具所选证书类型,同意受托方出具其他类型证书')
+    }
+    if (`${res.data.needAccordDeclare}` === '1') {
+      checkCertificateList.value.push('需要符合性声明')
+    }
+    if (`${res.data.needAdvice}` === '1') {
+      checkCertificateList.value.push('需要建议再校准日期')
+    }
+    if (`${res.data.contactReturn}` === '1') { // 需联系之后退件处理
+      dataForm.value.needContact = '1'
+    }
+    if (`${res.data.directReturn}` === '1') { // 直接退件处理
+      dataForm.value.needContact = '2'
+    }
+    orderType.value = res.data.orderType === '1' ? 'measure' : 'calibration' // 委托书类型
+
     list.value = res.data.customerSampleInfoList.map((item: any) => {
       return {
         ...item,
@@ -488,23 +526,27 @@
 }
 // 选完计量人员
 const confirmSelectPerson = (val: any) => {
-  dataForm.value.receivePersonNo = val[0].staffNo// 收件人工号
-  dataForm.value.receivePersonName = val[0].name// 收件人名称
+  dataForm.value.staffNo = val[0].staffNo// 收件人工号
+  dataForm.value.staffName = val[0].name// 收件人名称
 }
 // -----------------------------------------------------------------------------------------------
 watch(() => orderType.value, (newValue) => {
   if (newValue === 'measure') {
     columns.value = columnsMeasure.value
   }
-  else {
+  else if (newValue === 'calibration') {
     columns.value = columnsCalibration.value
   }
 }, { immediate: true })
+
+watch(() => checkCertificateList.value, (list) => {
+  console.log(list)
+}, { deep: true })
 onMounted(async () => {
   await getDict()
+  orderType.value = $route.query.orderType as string // 委托书类型 1检测委托单、2检定或校准委托单
   // 非添加页面获取详情
   if (pageType.value !== 'add') {
-    orderType.value = $route.query.orderType as string // 委托书类型 1检测委托单、2检定或校准委托单
     getInfo()
   }
 })
@@ -519,9 +561,9 @@
           航天计量检测技术（江苏）有限公司
         </div>
       </div>
-      <detail-page title="检测/校准委托单">
+      <detail-page :title="orderType === '1' ? '检测委托单' : '检定或校准委托单'">
         <template #btns>
-          <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          <el-button v-if="pageType === 'detail'" type="primary" @click="printPDF">
             打印
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
@@ -599,9 +641,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="联系人:" prop="director">
+                <el-form-item label="联系人:" prop="deliverer">
                   <el-input
-                    v-model="dataForm.director"
+                    v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail' || isReceived"
@@ -619,9 +661,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="移动电话:" prop="mobile">
+                <el-form-item label="移动电话:" prop="delivererTel">
                   <el-input
-                    v-model="dataForm.mobile"
+                    v-model="dataForm.delivererTel"
                     :placeholder="pageType === 'detail' ? '' : '请输入移动电话'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail' || isReceived"
@@ -656,20 +698,20 @@
                 <el-form-item label="预约取样时间:" prop="requireOverTime">
                   <el-date-picker
                     v-model="dataForm.requireOverTime"
-                    type="datetime"
+                    type="date"
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入预约取样时间'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail' || isReceived"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="发票单位名称:" prop="fpdwmc">
+                <el-form-item label="发票单位名称:" prop="invoiceCompany">
                   <el-input
-                    v-model="dataForm.fpdwmc"
+                    v-model="dataForm.invoiceCompany"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail' || isReceived"
                     :placeholder="pageType === 'detail' ? '' : '请输入发票单位名称'"
@@ -750,24 +792,24 @@
                 </el-col>
               </el-form-item>
             </el-row>
-            <el-row :gutter="24">
+            <el-row v-if="orderType === 'calibration'" :gutter="24">
               <el-form-item label=" ">
                 <el-col :span="24" style="display: flex;align-items: center;">
                   <span style="font-size: 13px;margin-right: 60px;">2.对证书要求</span>
-                  <el-checkbox-group v-model="checkCertificateList">
+                  <el-checkbox-group v-model="checkCertificateList" :disabled="pageType === 'detail' || isReceived">
                     <el-checkbox label="需要符合性声明" />
-                    <el-checkbox label="如无相应检定规程/校准规范，可按本实验室的方法进行校准" />
+                    <el-checkbox label="如无相应检定规程/校准规范,可按本实验室的方法进行校准" />
                     <el-checkbox label="需要建议再校准日期" />
-                    <el-checkbox label="如不能出具所选证书类型，同意受托方出具其他类型证书" />
+                    <el-checkbox label="如不能出具所选证书类型,同意受托方出具其他类型证书" />
                   </el-checkbox-group>
                 </el-col>
               </el-form-item>
             </el-row>
             <el-row :gutter="24">
               <el-col :span="8">
-                <el-form-item label="收件人工号:" prop="receivePersonNo">
+                <el-form-item label="收件人工号:" prop="staffNo">
                   <el-input
-                    v-model.trim="dataForm.receivePersonNo"
+                    v-model.trim="dataForm.staffNo"
                     :placeholder="pageType === 'detail' ? '' : '请选择收件人工号'"
                     disabled
                     class="full-width-input"
@@ -785,9 +827,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="收件人姓名:" prop="receivePersonName">
+                <el-form-item label="收件人姓名:" prop="staffName">
                   <el-input
-                    v-model.trim="dataForm.receivePersonName"
+                    v-model.trim="dataForm.staffName"
                     :placeholder="pageType === 'detail' ? '' : '请输入收件人姓名'"
                     disabled
                     class="full-width-input"
@@ -916,9 +958,9 @@
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
               />
-              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注、检测依据标准 -->
               <el-input
-                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark' || item.value === 'wgzt' || item.value === 'zsyq' || item.value === 'khtsyq')"
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark' || item.value === 'appearanceStatus' || item.value === 'certificateRequire' || item.value === 'specialRequire' || item.value === 'accordStandard')"
                 v-model="scope.row[item.value]"
                 type="textarea"
                 autosize
@@ -928,7 +970,7 @@
               <!-- 除电源电压和样品编号另外的行 -->
               <!-- <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && item.value !== 'appendixDescn' && item.value !== 'measureContent' && !scope.row.isEdit">{{ scope.row[item.value] }}</span> -->
               <!-- 除样品编号另外的行 -->
-              <span v-if="item.value !== 'sampleNo' && item.value !== 'appendixDescn' && item.value !== 'measureContent' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <span v-if="item.value !== 'specialRequire' && item.value !== 'certificateRequire' && item.value !== 'remark' && item.value !== 'accordStandard' && item.value !== 'sampleNo' && item.value !== 'appendixDescn' && item.value !== 'measureContent' && item.value !== 'appearanceStatus' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
               <!-- 样品编号不可编辑 -->
               <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
               <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">

diff --git a/.env.development b/.env.development
index 2d64f2f..37992fd 100644
--- a/.env.development
+++ b/.env.development
@@ -1,10 +1,10 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
 #房可鑫测试
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index d2b2d53..8fcecda 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -77,3 +77,14 @@
     data,
   })
 }
+
+// 详情
+export function getStream(data: { id: string }) {
+  return request({
+    url: `${prefix}/order/form/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/index.ts b/src/api/index.ts
index a368449..24bb58b 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -26,7 +26,7 @@
 const request = axios.create({
   // baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL,
   baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL,
-  timeout: 1000 * 60,
+  timeout: 1000 * 60 * 2,
   responseType: 'json',
 })
 
diff --git a/src/views/business/schedule/certPrint/components/filePreviewDialog.vue b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
index 6789bff..cef9f05 100644
--- a/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
+++ b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="FilePreviewDialog">
 import VuePdfEmbed from 'vue-pdf-embed'
 import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading } from 'element-plus'
 import { getPhotoUrl } from '@/api/system/tool'
 // 弹窗显示状态
 const dialogVisible = ref(false)
@@ -12,11 +13,16 @@
  * @param printFileName 文件名
  */
 function initDialog(printFileName: string) {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   getPhotoUrl(printFileName).then((res) => {
     dialogVisible.value = true
     const url = res.data
     pdfUrl.value = res.data
     pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
     // proxy.$refs.pdf.print()
     // download(url, row.printFileName as string)
   })
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index bb4d128..c917cc9 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -12,8 +12,9 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getUid } from '@/utils/getUid'
 import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
-import { addOrder, getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
 import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
+import { printPdf } from '@/utils/printUtils'
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
@@ -28,8 +29,8 @@
   orderCode: '', // 委托书编号
   postalCode: '', // 委托方邮编
   orderId: '', // 委托书编号
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
+  deliverer: '', // 送检人/联系人
+  // delivererTel: '', // 送样人联系方式
   orderTime: '', // 委托日期
   planDeliverTime: '', // 预计送达时间
   requireOverTime: '', // 要求检完时间
@@ -45,16 +46,16 @@
   certificationCompany: '', // 证书单位名称
   certificationCompanyAddress: '', // 证书单位地址
 
-  needContact: '1', // 需联络后再做退件处理1、直接退件处理2
-  receivePersonNo: '', // 收件人工号
-  receivePersonName: '', // 收件人名称
+  needContact: '1', // 需联络后再做退件处理0、直接退件处理1
+  staffNo: '', // 收件人工号
+  staffName: '', // 收件人名称
   receiveDate: '', // 收件日期
-  director: '', // 联系人
-  mobile: '', // 移动电话
+  fixedTel: '', // 固定电话
+  delivererTel: '', // 移动电话
   email: '', // 电子邮件或qq
-  fpdwmc: '', // 发票单位名称
+  invoiceCompany: '', // 发票单位名称
 })
-const checkCertificateList = ref([]) // 对证书要求
+const checkCertificateList = ref([]) as any// 对证书要求多选框
 const scanSampleRef = ref() // 标签绑定弹窗ref
 const certificationsMap = ref<dictType[]>([]) // 证书类别
 const powerVoltageMap = ref<dictType[]>([]) // 电源电压
@@ -73,10 +74,10 @@
   { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   // { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '外观状态', value: 'wgzt', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
   { text: '检测项目', value: 'measureContent', align: 'center', required: false },
   // { text: '样品状态', value: 'sampleStatusName', align: 'center' },
-  { text: '检测依据标准', value: 'appendixDescn', align: 'center', required: false },
+  { text: '检测依据标准', value: 'accordStandard', align: 'center', required: false },
   { text: '备注', value: 'remark', align: 'center', required: false },
 
 ])
@@ -86,9 +87,9 @@
   { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
   { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
-  { text: '证书要求', value: 'zsyq', align: 'center', required: false },
-  { text: '外观状态', value: 'wgzt', align: 'center', required: true },
-  { text: '客户特殊要求', value: 'khtsyq', align: 'center', required: false },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
   { text: '备注', value: 'remark', align: 'center', required: false },
 ])
 
@@ -104,8 +105,8 @@
 }
 // 校验规则
 const rules = reactive<FormRules>({
-  deliverer: [{ required: true, message: '要求送样人必填', trigger: 'blur' }],
-  delivererTel: [{ required: true, message: '要求送样人联系方式必填', trigger: 'blur' }],
+  // deliverer: [{ required: true, message: '要求送样人必填', trigger: 'blur' }],
+  // delivererTel: [{ required: true, message: '要求送样人联系方式必填', trigger: 'blur' }],
   customerNo: [{ required: true, message: '要求委托方代码必填', trigger: 'change' }],
   customerName: [{ required: true, message: '要求委托方名称必填', trigger: 'change' }],
   // phone: [{ required: true, message: '要求委托方电话必填', trigger: 'change' }],
@@ -118,11 +119,11 @@
   certificationCompany: [{ required: true, message: '要求证书单位名称必填', trigger: 'blur' }],
   certificationCompanyAddress: [{ required: true, message: '要求证书单位地址必填', trigger: 'blur' }],
 
-  director: [{ required: true, message: '联系人必填', trigger: 'blur' }],
-  mobile: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
+  deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
+  delivererTel: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
   phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
   email: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
-  fpdwmc: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
+  invoiceCompany: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
 }) // 表单验证规则
 
 // 从路由中获取页面类型参数
@@ -235,8 +236,8 @@
     dataForm.value.phone = val[0].phone // 委托方电话
     dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
 
-    dataForm.value.director = val[0].director // 联系人
-    dataForm.value.mobile = val[0].mobile // 移动电话
+    dataForm.value.deliverer = val[0].director // 联系人
+    dataForm.value.delivererTel = val[0].mobile // 移动电话
     dataForm.value.email = val[0].email // 电子邮件或qq
     dataForm.value.postalCode = val[0].postalCode // 邮编
     dataForm.value.certificationCompany = val[0].customerName // 证书单位名称
@@ -277,7 +278,7 @@
 // 检查表格第几行信息未完善
 const checkList = () => {
   // const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage || !item.measureContent))
-  const index = list.value.findIndex(item => !item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.wgzt)
+  const index = list.value.findIndex((item: any) => !item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.appearanceStatus)
   if (index !== -1) {
     return index + 1
   }
@@ -298,9 +299,13 @@
     sampleName: '', // 样品名称
     sampleModel: '', // 样品型号
     manufacturingNo: '', // 出厂编号
-    powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    measureContent: '', // 检定项目
+    appearanceStatus: '', // 外观状态
+    measureContent: '', // 检测依据标准
+    certificateRequire: '', // 证书要求
+    specialRequire: '', // 客户特殊要求
+    powerVoltage: '', // 电源电压
+    accordStandard: '', // 附件说明
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -401,6 +406,14 @@
         const params = {
           ...dataForm.value,
           customerPhone: dataForm.value.phone, // 委托方电话
+          accordLab: checkCertificateList.value.includes('如无相应检定规程/校准规范,可按本实验室的方法进行校准') ? '1' : '0',
+          agreeOther: checkCertificateList.value.includes('如不能出具所选证书类型,同意受托方出具其他类型证书') ? '1' : '0',
+          needAccordDeclare: checkCertificateList.value.includes('需要符合性声明') ? '1' : '0',
+          needAdvice: checkCertificateList.value.includes('需要建议再校准日期') ? '1' : '0',
+          contactReturn: dataForm.value.needContact === '1' ? '1' : '0', // 需联系之后退件处理
+          directReturn: dataForm.value.needContact === '2' ? '1' : '0', // 直接退件处理
+          orderType: orderType.value === 'measure' ? '1' : orderType.value === 'calibration' ? '2' : '',
+          orderTypeName: orderType.value === 'measure' ? '检测委托单' : orderType.value === 'calibration' ? '检定或校准委托单' : '',
           customerSampleInfoList: list.value,
         }
         if (pageType.value === 'edit') { // 编辑
@@ -452,14 +465,18 @@
 // --------------------------------------------------------------------------------------
 
 // 点击打印
-const printObj = ref({
-  id: 'main', // 需要打印元素的id
-  popTitle: '委托书详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const printPDF = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  getStream({ id: infoId.value }).then((res) => {
+    loading.close()
+    const pdfStream = new Blob([res.data])
+    const blobUrl = URL.createObjectURL(pdfStream)
+    printPdf(blobUrl)
+  })
+}
 
 // 获取详细信息
 const getInfo = () => {
@@ -470,6 +487,27 @@
   getOrderDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
     dataForm.value.phone = res.data.customerPhone
+
+    if (`${res.data.accordLab}` === '1') {
+      checkCertificateList.value.push('如无相应检定规程/校准规范,可按本实验室的方法进行校准')
+    }
+    if (`${res.data.agreeOther}` === '1') {
+      checkCertificateList.value.push('如不能出具所选证书类型,同意受托方出具其他类型证书')
+    }
+    if (`${res.data.needAccordDeclare}` === '1') {
+      checkCertificateList.value.push('需要符合性声明')
+    }
+    if (`${res.data.needAdvice}` === '1') {
+      checkCertificateList.value.push('需要建议再校准日期')
+    }
+    if (`${res.data.contactReturn}` === '1') { // 需联系之后退件处理
+      dataForm.value.needContact = '1'
+    }
+    if (`${res.data.directReturn}` === '1') { // 直接退件处理
+      dataForm.value.needContact = '2'
+    }
+    orderType.value = res.data.orderType === '1' ? 'measure' : 'calibration' // 委托书类型
+
     list.value = res.data.customerSampleInfoList.map((item: any) => {
       return {
         ...item,
@@ -488,23 +526,27 @@
 }
 // 选完计量人员
 const confirmSelectPerson = (val: any) => {
-  dataForm.value.receivePersonNo = val[0].staffNo// 收件人工号
-  dataForm.value.receivePersonName = val[0].name// 收件人名称
+  dataForm.value.staffNo = val[0].staffNo// 收件人工号
+  dataForm.value.staffName = val[0].name// 收件人名称
 }
 // -----------------------------------------------------------------------------------------------
 watch(() => orderType.value, (newValue) => {
   if (newValue === 'measure') {
     columns.value = columnsMeasure.value
   }
-  else {
+  else if (newValue === 'calibration') {
     columns.value = columnsCalibration.value
   }
 }, { immediate: true })
+
+watch(() => checkCertificateList.value, (list) => {
+  console.log(list)
+}, { deep: true })
 onMounted(async () => {
   await getDict()
+  orderType.value = $route.query.orderType as string // 委托书类型 1检测委托单、2检定或校准委托单
   // 非添加页面获取详情
   if (pageType.value !== 'add') {
-    orderType.value = $route.query.orderType as string // 委托书类型 1检测委托单、2检定或校准委托单
     getInfo()
   }
 })
@@ -519,9 +561,9 @@
           航天计量检测技术（江苏）有限公司
         </div>
       </div>
-      <detail-page title="检测/校准委托单">
+      <detail-page :title="orderType === '1' ? '检测委托单' : '检定或校准委托单'">
         <template #btns>
-          <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          <el-button v-if="pageType === 'detail'" type="primary" @click="printPDF">
             打印
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
@@ -599,9 +641,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="联系人:" prop="director">
+                <el-form-item label="联系人:" prop="deliverer">
                   <el-input
-                    v-model="dataForm.director"
+                    v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail' || isReceived"
@@ -619,9 +661,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="移动电话:" prop="mobile">
+                <el-form-item label="移动电话:" prop="delivererTel">
                   <el-input
-                    v-model="dataForm.mobile"
+                    v-model="dataForm.delivererTel"
                     :placeholder="pageType === 'detail' ? '' : '请输入移动电话'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail' || isReceived"
@@ -656,20 +698,20 @@
                 <el-form-item label="预约取样时间:" prop="requireOverTime">
                   <el-date-picker
                     v-model="dataForm.requireOverTime"
-                    type="datetime"
+                    type="date"
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入预约取样时间'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail' || isReceived"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="发票单位名称:" prop="fpdwmc">
+                <el-form-item label="发票单位名称:" prop="invoiceCompany">
                   <el-input
-                    v-model="dataForm.fpdwmc"
+                    v-model="dataForm.invoiceCompany"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail' || isReceived"
                     :placeholder="pageType === 'detail' ? '' : '请输入发票单位名称'"
@@ -750,24 +792,24 @@
                 </el-col>
               </el-form-item>
             </el-row>
-            <el-row :gutter="24">
+            <el-row v-if="orderType === 'calibration'" :gutter="24">
               <el-form-item label=" ">
                 <el-col :span="24" style="display: flex;align-items: center;">
                   <span style="font-size: 13px;margin-right: 60px;">2.对证书要求</span>
-                  <el-checkbox-group v-model="checkCertificateList">
+                  <el-checkbox-group v-model="checkCertificateList" :disabled="pageType === 'detail' || isReceived">
                     <el-checkbox label="需要符合性声明" />
-                    <el-checkbox label="如无相应检定规程/校准规范，可按本实验室的方法进行校准" />
+                    <el-checkbox label="如无相应检定规程/校准规范,可按本实验室的方法进行校准" />
                     <el-checkbox label="需要建议再校准日期" />
-                    <el-checkbox label="如不能出具所选证书类型，同意受托方出具其他类型证书" />
+                    <el-checkbox label="如不能出具所选证书类型,同意受托方出具其他类型证书" />
                   </el-checkbox-group>
                 </el-col>
               </el-form-item>
             </el-row>
             <el-row :gutter="24">
               <el-col :span="8">
-                <el-form-item label="收件人工号:" prop="receivePersonNo">
+                <el-form-item label="收件人工号:" prop="staffNo">
                   <el-input
-                    v-model.trim="dataForm.receivePersonNo"
+                    v-model.trim="dataForm.staffNo"
                     :placeholder="pageType === 'detail' ? '' : '请选择收件人工号'"
                     disabled
                     class="full-width-input"
@@ -785,9 +827,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="收件人姓名:" prop="receivePersonName">
+                <el-form-item label="收件人姓名:" prop="staffName">
                   <el-input
-                    v-model.trim="dataForm.receivePersonName"
+                    v-model.trim="dataForm.staffName"
                     :placeholder="pageType === 'detail' ? '' : '请输入收件人姓名'"
                     disabled
                     class="full-width-input"
@@ -916,9 +958,9 @@
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
               />
-              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注、检测依据标准 -->
               <el-input
-                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark' || item.value === 'wgzt' || item.value === 'zsyq' || item.value === 'khtsyq')"
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark' || item.value === 'appearanceStatus' || item.value === 'certificateRequire' || item.value === 'specialRequire' || item.value === 'accordStandard')"
                 v-model="scope.row[item.value]"
                 type="textarea"
                 autosize
@@ -928,7 +970,7 @@
               <!-- 除电源电压和样品编号另外的行 -->
               <!-- <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && item.value !== 'appendixDescn' && item.value !== 'measureContent' && !scope.row.isEdit">{{ scope.row[item.value] }}</span> -->
               <!-- 除样品编号另外的行 -->
-              <span v-if="item.value !== 'sampleNo' && item.value !== 'appendixDescn' && item.value !== 'measureContent' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <span v-if="item.value !== 'specialRequire' && item.value !== 'certificateRequire' && item.value !== 'remark' && item.value !== 'accordStandard' && item.value !== 'sampleNo' && item.value !== 'appendixDescn' && item.value !== 'measureContent' && item.value !== 'appearanceStatus' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
               <!-- 样品编号不可编辑 -->
               <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
               <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 570b074..fb5bb15 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -40,8 +40,8 @@
 const showPopover = ref(false) // 是否展示popover
 
 const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'orderCode', align: 'center', width: '180px' },
-  { text: '委托单类型', value: 'orderType', align: 'center', width: '180px' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '180px' },
+  { text: '委托单类型', value: 'orderTypeName', align: 'center', width: '180px' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   // { text: '送样人', value: 'deliverer', align: 'center' },
@@ -113,6 +113,7 @@
       return {
         ...item,
         isUrgentName: item.isUrgent == 1 ? '是' : '否',
+        orderTypeName: `${item.orderType}` === '1' ? '检测委托单' : `${item.orderType}` === '2' ? '检定或校准委托单' : item.orderType,
       }
     })
 
@@ -209,7 +210,7 @@
     }
     exportOrderList(params).then((res) => {
       const blob = new Blob([res.data])
-      exportFile(blob, '委托书列表.xlsx')
+      exportFile(blob, '委托单列表.xlsx')
     })
   }
   else {
@@ -228,11 +229,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '委托书列表')
+    printJSON(list.value, properties, '委托单列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '委托书列表')
+    printJSON(printList, properties, '委托单列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -316,7 +317,7 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.orderCode"
-          placeholder="委托书编号"
+          placeholder="委托单编号"
           class="short-input"
           clearable
         />
@@ -324,7 +325,15 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.customerNo"
-          placeholder="委托方代码/名称"
+          placeholder="委托方代码"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
           class="short-input"
           clearable
         />
@@ -332,12 +341,12 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.deliverer"
-          placeholder="送样人"
+          placeholder="联系人"
           class="short-input"
           clearable
         />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.isUrgent" placeholder="是否加急" style="width: 120px;" clearable>
           <el-option
             v-for="item in isUrgentMap"
@@ -346,7 +355,7 @@
             :value="item.value"
           />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-select v-model="listQuery.status" placeholder="接收状态" style="width: 120px;" clearable>
           <el-option

diff --git a/.env.development b/.env.development
index 2d64f2f..37992fd 100644
--- a/.env.development
+++ b/.env.development
@@ -1,10 +1,10 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
 #房可鑫测试
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index d2b2d53..8fcecda 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -77,3 +77,14 @@
     data,
   })
 }
+
+// 详情
+export function getStream(data: { id: string }) {
+  return request({
+    url: `${prefix}/order/form/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/index.ts b/src/api/index.ts
index a368449..24bb58b 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -26,7 +26,7 @@
 const request = axios.create({
   // baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL,
   baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL,
-  timeout: 1000 * 60,
+  timeout: 1000 * 60 * 2,
   responseType: 'json',
 })
 
diff --git a/src/views/business/schedule/certPrint/components/filePreviewDialog.vue b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
index 6789bff..cef9f05 100644
--- a/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
+++ b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="FilePreviewDialog">
 import VuePdfEmbed from 'vue-pdf-embed'
 import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading } from 'element-plus'
 import { getPhotoUrl } from '@/api/system/tool'
 // 弹窗显示状态
 const dialogVisible = ref(false)
@@ -12,11 +13,16 @@
  * @param printFileName 文件名
  */
 function initDialog(printFileName: string) {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   getPhotoUrl(printFileName).then((res) => {
     dialogVisible.value = true
     const url = res.data
     pdfUrl.value = res.data
     pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
     // proxy.$refs.pdf.print()
     // download(url, row.printFileName as string)
   })
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index bb4d128..c917cc9 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -12,8 +12,9 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getUid } from '@/utils/getUid'
 import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
-import { addOrder, getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
 import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
+import { printPdf } from '@/utils/printUtils'
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
@@ -28,8 +29,8 @@
   orderCode: '', // 委托书编号
   postalCode: '', // 委托方邮编
   orderId: '', // 委托书编号
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
+  deliverer: '', // 送检人/联系人
+  // delivererTel: '', // 送样人联系方式
   orderTime: '', // 委托日期
   planDeliverTime: '', // 预计送达时间
   requireOverTime: '', // 要求检完时间
@@ -45,16 +46,16 @@
   certificationCompany: '', // 证书单位名称
   certificationCompanyAddress: '', // 证书单位地址
 
-  needContact: '1', // 需联络后再做退件处理1、直接退件处理2
-  receivePersonNo: '', // 收件人工号
-  receivePersonName: '', // 收件人名称
+  needContact: '1', // 需联络后再做退件处理0、直接退件处理1
+  staffNo: '', // 收件人工号
+  staffName: '', // 收件人名称
   receiveDate: '', // 收件日期
-  director: '', // 联系人
-  mobile: '', // 移动电话
+  fixedTel: '', // 固定电话
+  delivererTel: '', // 移动电话
   email: '', // 电子邮件或qq
-  fpdwmc: '', // 发票单位名称
+  invoiceCompany: '', // 发票单位名称
 })
-const checkCertificateList = ref([]) // 对证书要求
+const checkCertificateList = ref([]) as any// 对证书要求多选框
 const scanSampleRef = ref() // 标签绑定弹窗ref
 const certificationsMap = ref<dictType[]>([]) // 证书类别
 const powerVoltageMap = ref<dictType[]>([]) // 电源电压
@@ -73,10 +74,10 @@
   { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   // { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '外观状态', value: 'wgzt', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
   { text: '检测项目', value: 'measureContent', align: 'center', required: false },
   // { text: '样品状态', value: 'sampleStatusName', align: 'center' },
-  { text: '检测依据标准', value: 'appendixDescn', align: 'center', required: false },
+  { text: '检测依据标准', value: 'accordStandard', align: 'center', required: false },
   { text: '备注', value: 'remark', align: 'center', required: false },
 
 ])
@@ -86,9 +87,9 @@
   { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
   { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
-  { text: '证书要求', value: 'zsyq', align: 'center', required: false },
-  { text: '外观状态', value: 'wgzt', align: 'center', required: true },
-  { text: '客户特殊要求', value: 'khtsyq', align: 'center', required: false },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
   { text: '备注', value: 'remark', align: 'center', required: false },
 ])
 
@@ -104,8 +105,8 @@
 }
 // 校验规则
 const rules = reactive<FormRules>({
-  deliverer: [{ required: true, message: '要求送样人必填', trigger: 'blur' }],
-  delivererTel: [{ required: true, message: '要求送样人联系方式必填', trigger: 'blur' }],
+  // deliverer: [{ required: true, message: '要求送样人必填', trigger: 'blur' }],
+  // delivererTel: [{ required: true, message: '要求送样人联系方式必填', trigger: 'blur' }],
   customerNo: [{ required: true, message: '要求委托方代码必填', trigger: 'change' }],
   customerName: [{ required: true, message: '要求委托方名称必填', trigger: 'change' }],
   // phone: [{ required: true, message: '要求委托方电话必填', trigger: 'change' }],
@@ -118,11 +119,11 @@
   certificationCompany: [{ required: true, message: '要求证书单位名称必填', trigger: 'blur' }],
   certificationCompanyAddress: [{ required: true, message: '要求证书单位地址必填', trigger: 'blur' }],
 
-  director: [{ required: true, message: '联系人必填', trigger: 'blur' }],
-  mobile: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
+  deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
+  delivererTel: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
   phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
   email: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
-  fpdwmc: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
+  invoiceCompany: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
 }) // 表单验证规则
 
 // 从路由中获取页面类型参数
@@ -235,8 +236,8 @@
     dataForm.value.phone = val[0].phone // 委托方电话
     dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
 
-    dataForm.value.director = val[0].director // 联系人
-    dataForm.value.mobile = val[0].mobile // 移动电话
+    dataForm.value.deliverer = val[0].director // 联系人
+    dataForm.value.delivererTel = val[0].mobile // 移动电话
     dataForm.value.email = val[0].email // 电子邮件或qq
     dataForm.value.postalCode = val[0].postalCode // 邮编
     dataForm.value.certificationCompany = val[0].customerName // 证书单位名称
@@ -277,7 +278,7 @@
 // 检查表格第几行信息未完善
 const checkList = () => {
   // const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage || !item.measureContent))
-  const index = list.value.findIndex(item => !item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.wgzt)
+  const index = list.value.findIndex((item: any) => !item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.appearanceStatus)
   if (index !== -1) {
     return index + 1
   }
@@ -298,9 +299,13 @@
     sampleName: '', // 样品名称
     sampleModel: '', // 样品型号
     manufacturingNo: '', // 出厂编号
-    powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    measureContent: '', // 检定项目
+    appearanceStatus: '', // 外观状态
+    measureContent: '', // 检测依据标准
+    certificateRequire: '', // 证书要求
+    specialRequire: '', // 客户特殊要求
+    powerVoltage: '', // 电源电压
+    accordStandard: '', // 附件说明
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -401,6 +406,14 @@
         const params = {
           ...dataForm.value,
           customerPhone: dataForm.value.phone, // 委托方电话
+          accordLab: checkCertificateList.value.includes('如无相应检定规程/校准规范,可按本实验室的方法进行校准') ? '1' : '0',
+          agreeOther: checkCertificateList.value.includes('如不能出具所选证书类型,同意受托方出具其他类型证书') ? '1' : '0',
+          needAccordDeclare: checkCertificateList.value.includes('需要符合性声明') ? '1' : '0',
+          needAdvice: checkCertificateList.value.includes('需要建议再校准日期') ? '1' : '0',
+          contactReturn: dataForm.value.needContact === '1' ? '1' : '0', // 需联系之后退件处理
+          directReturn: dataForm.value.needContact === '2' ? '1' : '0', // 直接退件处理
+          orderType: orderType.value === 'measure' ? '1' : orderType.value === 'calibration' ? '2' : '',
+          orderTypeName: orderType.value === 'measure' ? '检测委托单' : orderType.value === 'calibration' ? '检定或校准委托单' : '',
           customerSampleInfoList: list.value,
         }
         if (pageType.value === 'edit') { // 编辑
@@ -452,14 +465,18 @@
 // --------------------------------------------------------------------------------------
 
 // 点击打印
-const printObj = ref({
-  id: 'main', // 需要打印元素的id
-  popTitle: '委托书详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const printPDF = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  getStream({ id: infoId.value }).then((res) => {
+    loading.close()
+    const pdfStream = new Blob([res.data])
+    const blobUrl = URL.createObjectURL(pdfStream)
+    printPdf(blobUrl)
+  })
+}
 
 // 获取详细信息
 const getInfo = () => {
@@ -470,6 +487,27 @@
   getOrderDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
     dataForm.value.phone = res.data.customerPhone
+
+    if (`${res.data.accordLab}` === '1') {
+      checkCertificateList.value.push('如无相应检定规程/校准规范,可按本实验室的方法进行校准')
+    }
+    if (`${res.data.agreeOther}` === '1') {
+      checkCertificateList.value.push('如不能出具所选证书类型,同意受托方出具其他类型证书')
+    }
+    if (`${res.data.needAccordDeclare}` === '1') {
+      checkCertificateList.value.push('需要符合性声明')
+    }
+    if (`${res.data.needAdvice}` === '1') {
+      checkCertificateList.value.push('需要建议再校准日期')
+    }
+    if (`${res.data.contactReturn}` === '1') { // 需联系之后退件处理
+      dataForm.value.needContact = '1'
+    }
+    if (`${res.data.directReturn}` === '1') { // 直接退件处理
+      dataForm.value.needContact = '2'
+    }
+    orderType.value = res.data.orderType === '1' ? 'measure' : 'calibration' // 委托书类型
+
     list.value = res.data.customerSampleInfoList.map((item: any) => {
       return {
         ...item,
@@ -488,23 +526,27 @@
 }
 // 选完计量人员
 const confirmSelectPerson = (val: any) => {
-  dataForm.value.receivePersonNo = val[0].staffNo// 收件人工号
-  dataForm.value.receivePersonName = val[0].name// 收件人名称
+  dataForm.value.staffNo = val[0].staffNo// 收件人工号
+  dataForm.value.staffName = val[0].name// 收件人名称
 }
 // -----------------------------------------------------------------------------------------------
 watch(() => orderType.value, (newValue) => {
   if (newValue === 'measure') {
     columns.value = columnsMeasure.value
   }
-  else {
+  else if (newValue === 'calibration') {
     columns.value = columnsCalibration.value
   }
 }, { immediate: true })
+
+watch(() => checkCertificateList.value, (list) => {
+  console.log(list)
+}, { deep: true })
 onMounted(async () => {
   await getDict()
+  orderType.value = $route.query.orderType as string // 委托书类型 1检测委托单、2检定或校准委托单
   // 非添加页面获取详情
   if (pageType.value !== 'add') {
-    orderType.value = $route.query.orderType as string // 委托书类型 1检测委托单、2检定或校准委托单
     getInfo()
   }
 })
@@ -519,9 +561,9 @@
           航天计量检测技术（江苏）有限公司
         </div>
       </div>
-      <detail-page title="检测/校准委托单">
+      <detail-page :title="orderType === '1' ? '检测委托单' : '检定或校准委托单'">
         <template #btns>
-          <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          <el-button v-if="pageType === 'detail'" type="primary" @click="printPDF">
             打印
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
@@ -599,9 +641,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="联系人:" prop="director">
+                <el-form-item label="联系人:" prop="deliverer">
                   <el-input
-                    v-model="dataForm.director"
+                    v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail' || isReceived"
@@ -619,9 +661,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="移动电话:" prop="mobile">
+                <el-form-item label="移动电话:" prop="delivererTel">
                   <el-input
-                    v-model="dataForm.mobile"
+                    v-model="dataForm.delivererTel"
                     :placeholder="pageType === 'detail' ? '' : '请输入移动电话'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail' || isReceived"
@@ -656,20 +698,20 @@
                 <el-form-item label="预约取样时间:" prop="requireOverTime">
                   <el-date-picker
                     v-model="dataForm.requireOverTime"
-                    type="datetime"
+                    type="date"
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入预约取样时间'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail' || isReceived"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="发票单位名称:" prop="fpdwmc">
+                <el-form-item label="发票单位名称:" prop="invoiceCompany">
                   <el-input
-                    v-model="dataForm.fpdwmc"
+                    v-model="dataForm.invoiceCompany"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail' || isReceived"
                     :placeholder="pageType === 'detail' ? '' : '请输入发票单位名称'"
@@ -750,24 +792,24 @@
                 </el-col>
               </el-form-item>
             </el-row>
-            <el-row :gutter="24">
+            <el-row v-if="orderType === 'calibration'" :gutter="24">
               <el-form-item label=" ">
                 <el-col :span="24" style="display: flex;align-items: center;">
                   <span style="font-size: 13px;margin-right: 60px;">2.对证书要求</span>
-                  <el-checkbox-group v-model="checkCertificateList">
+                  <el-checkbox-group v-model="checkCertificateList" :disabled="pageType === 'detail' || isReceived">
                     <el-checkbox label="需要符合性声明" />
-                    <el-checkbox label="如无相应检定规程/校准规范，可按本实验室的方法进行校准" />
+                    <el-checkbox label="如无相应检定规程/校准规范,可按本实验室的方法进行校准" />
                     <el-checkbox label="需要建议再校准日期" />
-                    <el-checkbox label="如不能出具所选证书类型，同意受托方出具其他类型证书" />
+                    <el-checkbox label="如不能出具所选证书类型,同意受托方出具其他类型证书" />
                   </el-checkbox-group>
                 </el-col>
               </el-form-item>
             </el-row>
             <el-row :gutter="24">
               <el-col :span="8">
-                <el-form-item label="收件人工号:" prop="receivePersonNo">
+                <el-form-item label="收件人工号:" prop="staffNo">
                   <el-input
-                    v-model.trim="dataForm.receivePersonNo"
+                    v-model.trim="dataForm.staffNo"
                     :placeholder="pageType === 'detail' ? '' : '请选择收件人工号'"
                     disabled
                     class="full-width-input"
@@ -785,9 +827,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="收件人姓名:" prop="receivePersonName">
+                <el-form-item label="收件人姓名:" prop="staffName">
                   <el-input
-                    v-model.trim="dataForm.receivePersonName"
+                    v-model.trim="dataForm.staffName"
                     :placeholder="pageType === 'detail' ? '' : '请输入收件人姓名'"
                     disabled
                     class="full-width-input"
@@ -916,9 +958,9 @@
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
               />
-              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注、检测依据标准 -->
               <el-input
-                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark' || item.value === 'wgzt' || item.value === 'zsyq' || item.value === 'khtsyq')"
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark' || item.value === 'appearanceStatus' || item.value === 'certificateRequire' || item.value === 'specialRequire' || item.value === 'accordStandard')"
                 v-model="scope.row[item.value]"
                 type="textarea"
                 autosize
@@ -928,7 +970,7 @@
               <!-- 除电源电压和样品编号另外的行 -->
               <!-- <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && item.value !== 'appendixDescn' && item.value !== 'measureContent' && !scope.row.isEdit">{{ scope.row[item.value] }}</span> -->
               <!-- 除样品编号另外的行 -->
-              <span v-if="item.value !== 'sampleNo' && item.value !== 'appendixDescn' && item.value !== 'measureContent' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <span v-if="item.value !== 'specialRequire' && item.value !== 'certificateRequire' && item.value !== 'remark' && item.value !== 'accordStandard' && item.value !== 'sampleNo' && item.value !== 'appendixDescn' && item.value !== 'measureContent' && item.value !== 'appearanceStatus' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
               <!-- 样品编号不可编辑 -->
               <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
               <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 570b074..fb5bb15 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -40,8 +40,8 @@
 const showPopover = ref(false) // 是否展示popover
 
 const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'orderCode', align: 'center', width: '180px' },
-  { text: '委托单类型', value: 'orderType', align: 'center', width: '180px' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '180px' },
+  { text: '委托单类型', value: 'orderTypeName', align: 'center', width: '180px' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   // { text: '送样人', value: 'deliverer', align: 'center' },
@@ -113,6 +113,7 @@
       return {
         ...item,
         isUrgentName: item.isUrgent == 1 ? '是' : '否',
+        orderTypeName: `${item.orderType}` === '1' ? '检测委托单' : `${item.orderType}` === '2' ? '检定或校准委托单' : item.orderType,
       }
     })
 
@@ -209,7 +210,7 @@
     }
     exportOrderList(params).then((res) => {
       const blob = new Blob([res.data])
-      exportFile(blob, '委托书列表.xlsx')
+      exportFile(blob, '委托单列表.xlsx')
     })
   }
   else {
@@ -228,11 +229,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '委托书列表')
+    printJSON(list.value, properties, '委托单列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '委托书列表')
+    printJSON(printList, properties, '委托单列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -316,7 +317,7 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.orderCode"
-          placeholder="委托书编号"
+          placeholder="委托单编号"
           class="short-input"
           clearable
         />
@@ -324,7 +325,15 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.customerNo"
-          placeholder="委托方代码/名称"
+          placeholder="委托方代码"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
           class="short-input"
           clearable
         />
@@ -332,12 +341,12 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.deliverer"
-          placeholder="送样人"
+          placeholder="联系人"
           class="short-input"
           clearable
         />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.isUrgent" placeholder="是否加急" style="width: 120px;" clearable>
           <el-option
             v-for="item in isUrgentMap"
@@ -346,7 +355,7 @@
             :value="item.value"
           />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-select v-model="listQuery.status" placeholder="接收状态" style="width: 120px;" clearable>
           <el-option
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index fdc089d..90fbef7 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -32,6 +32,8 @@
   statusName?: string // 样品接收状态
   certificationCompany?: string // 证书单位名称
   certificationCompanyAddress?: string // 证书单位地址
+  orderType: string // 委托单类型
+
 }
 
 // 详情表单
@@ -41,7 +43,7 @@
   postalCode: string // 委托方邮编
   orderId?: string // 委托书id
   deliverer: string // 送检人
-  delivererTel: string // 送样人联系方式
+  // delivererTel: string // 送样人联系方式
   orderTime: string // 委托日期
   planDeliverTime: string // 预计送达时间
   requireOverTime: string // 要求检完时间
@@ -58,13 +60,14 @@
   certificationCompanyAddress: string // 证书单位地址
 
   needContact: string // 需联络后再做退件处理1、直接退件处理2
-  receivePersonNo: string // 收件人工号
-  receivePersonName: string // 收件人名称
+  staffNo: string // 收件人工号
+  staffName: string // 收件人名称
   receiveDate: string // 收件日期
-  director: string // 联系人
-  mobile: string // 移动电话
+  // director: string // 联系人
+  fixedTel: string // 固定电话
+  delivererTel: string // 移动电话
   email: string // 电子邮件或qq
-  fpdwmc: string // 发票单位名称
+  invoiceCompany: string // 发票单位名称
 }
 
 // 样品清单
@@ -81,6 +84,11 @@
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
   isExistSample?: string // 是否存在样品库中 1存在、0不存在
+
+  appearanceStatus: string // 外观状态
+  accordStandard: string // 检测依据标准
+  certificateRequire: string // 证书要求
+  specialRequire: string // 客户特殊要求
 }
 
 // 字典

diff --git a/.env.development b/.env.development
index 2d64f2f..37992fd 100644
--- a/.env.development
+++ b/.env.development
@@ -1,10 +1,10 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
 #房可鑫测试
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index d2b2d53..8fcecda 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -77,3 +77,14 @@
     data,
   })
 }
+
+// 详情
+export function getStream(data: { id: string }) {
+  return request({
+    url: `${prefix}/order/form/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/index.ts b/src/api/index.ts
index a368449..24bb58b 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -26,7 +26,7 @@
 const request = axios.create({
   // baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL,
   baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL,
-  timeout: 1000 * 60,
+  timeout: 1000 * 60 * 2,
   responseType: 'json',
 })
 
diff --git a/src/views/business/schedule/certPrint/components/filePreviewDialog.vue b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
index 6789bff..cef9f05 100644
--- a/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
+++ b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="FilePreviewDialog">
 import VuePdfEmbed from 'vue-pdf-embed'
 import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading } from 'element-plus'
 import { getPhotoUrl } from '@/api/system/tool'
 // 弹窗显示状态
 const dialogVisible = ref(false)
@@ -12,11 +13,16 @@
  * @param printFileName 文件名
  */
 function initDialog(printFileName: string) {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   getPhotoUrl(printFileName).then((res) => {
     dialogVisible.value = true
     const url = res.data
     pdfUrl.value = res.data
     pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
     // proxy.$refs.pdf.print()
     // download(url, row.printFileName as string)
   })
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index bb4d128..c917cc9 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -12,8 +12,9 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getUid } from '@/utils/getUid'
 import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
-import { addOrder, getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
 import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
+import { printPdf } from '@/utils/printUtils'
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
@@ -28,8 +29,8 @@
   orderCode: '', // 委托书编号
   postalCode: '', // 委托方邮编
   orderId: '', // 委托书编号
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
+  deliverer: '', // 送检人/联系人
+  // delivererTel: '', // 送样人联系方式
   orderTime: '', // 委托日期
   planDeliverTime: '', // 预计送达时间
   requireOverTime: '', // 要求检完时间
@@ -45,16 +46,16 @@
   certificationCompany: '', // 证书单位名称
   certificationCompanyAddress: '', // 证书单位地址
 
-  needContact: '1', // 需联络后再做退件处理1、直接退件处理2
-  receivePersonNo: '', // 收件人工号
-  receivePersonName: '', // 收件人名称
+  needContact: '1', // 需联络后再做退件处理0、直接退件处理1
+  staffNo: '', // 收件人工号
+  staffName: '', // 收件人名称
   receiveDate: '', // 收件日期
-  director: '', // 联系人
-  mobile: '', // 移动电话
+  fixedTel: '', // 固定电话
+  delivererTel: '', // 移动电话
   email: '', // 电子邮件或qq
-  fpdwmc: '', // 发票单位名称
+  invoiceCompany: '', // 发票单位名称
 })
-const checkCertificateList = ref([]) // 对证书要求
+const checkCertificateList = ref([]) as any// 对证书要求多选框
 const scanSampleRef = ref() // 标签绑定弹窗ref
 const certificationsMap = ref<dictType[]>([]) // 证书类别
 const powerVoltageMap = ref<dictType[]>([]) // 电源电压
@@ -73,10 +74,10 @@
   { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   // { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '外观状态', value: 'wgzt', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
   { text: '检测项目', value: 'measureContent', align: 'center', required: false },
   // { text: '样品状态', value: 'sampleStatusName', align: 'center' },
-  { text: '检测依据标准', value: 'appendixDescn', align: 'center', required: false },
+  { text: '检测依据标准', value: 'accordStandard', align: 'center', required: false },
   { text: '备注', value: 'remark', align: 'center', required: false },
 
 ])
@@ -86,9 +87,9 @@
   { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
   { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
-  { text: '证书要求', value: 'zsyq', align: 'center', required: false },
-  { text: '外观状态', value: 'wgzt', align: 'center', required: true },
-  { text: '客户特殊要求', value: 'khtsyq', align: 'center', required: false },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
   { text: '备注', value: 'remark', align: 'center', required: false },
 ])
 
@@ -104,8 +105,8 @@
 }
 // 校验规则
 const rules = reactive<FormRules>({
-  deliverer: [{ required: true, message: '要求送样人必填', trigger: 'blur' }],
-  delivererTel: [{ required: true, message: '要求送样人联系方式必填', trigger: 'blur' }],
+  // deliverer: [{ required: true, message: '要求送样人必填', trigger: 'blur' }],
+  // delivererTel: [{ required: true, message: '要求送样人联系方式必填', trigger: 'blur' }],
   customerNo: [{ required: true, message: '要求委托方代码必填', trigger: 'change' }],
   customerName: [{ required: true, message: '要求委托方名称必填', trigger: 'change' }],
   // phone: [{ required: true, message: '要求委托方电话必填', trigger: 'change' }],
@@ -118,11 +119,11 @@
   certificationCompany: [{ required: true, message: '要求证书单位名称必填', trigger: 'blur' }],
   certificationCompanyAddress: [{ required: true, message: '要求证书单位地址必填', trigger: 'blur' }],
 
-  director: [{ required: true, message: '联系人必填', trigger: 'blur' }],
-  mobile: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
+  deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
+  delivererTel: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
   phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
   email: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
-  fpdwmc: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
+  invoiceCompany: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
 }) // 表单验证规则
 
 // 从路由中获取页面类型参数
@@ -235,8 +236,8 @@
     dataForm.value.phone = val[0].phone // 委托方电话
     dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
 
-    dataForm.value.director = val[0].director // 联系人
-    dataForm.value.mobile = val[0].mobile // 移动电话
+    dataForm.value.deliverer = val[0].director // 联系人
+    dataForm.value.delivererTel = val[0].mobile // 移动电话
     dataForm.value.email = val[0].email // 电子邮件或qq
     dataForm.value.postalCode = val[0].postalCode // 邮编
     dataForm.value.certificationCompany = val[0].customerName // 证书单位名称
@@ -277,7 +278,7 @@
 // 检查表格第几行信息未完善
 const checkList = () => {
   // const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage || !item.measureContent))
-  const index = list.value.findIndex(item => !item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.wgzt)
+  const index = list.value.findIndex((item: any) => !item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.appearanceStatus)
   if (index !== -1) {
     return index + 1
   }
@@ -298,9 +299,13 @@
     sampleName: '', // 样品名称
     sampleModel: '', // 样品型号
     manufacturingNo: '', // 出厂编号
-    powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    measureContent: '', // 检定项目
+    appearanceStatus: '', // 外观状态
+    measureContent: '', // 检测依据标准
+    certificateRequire: '', // 证书要求
+    specialRequire: '', // 客户特殊要求
+    powerVoltage: '', // 电源电压
+    accordStandard: '', // 附件说明
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -401,6 +406,14 @@
         const params = {
           ...dataForm.value,
           customerPhone: dataForm.value.phone, // 委托方电话
+          accordLab: checkCertificateList.value.includes('如无相应检定规程/校准规范,可按本实验室的方法进行校准') ? '1' : '0',
+          agreeOther: checkCertificateList.value.includes('如不能出具所选证书类型,同意受托方出具其他类型证书') ? '1' : '0',
+          needAccordDeclare: checkCertificateList.value.includes('需要符合性声明') ? '1' : '0',
+          needAdvice: checkCertificateList.value.includes('需要建议再校准日期') ? '1' : '0',
+          contactReturn: dataForm.value.needContact === '1' ? '1' : '0', // 需联系之后退件处理
+          directReturn: dataForm.value.needContact === '2' ? '1' : '0', // 直接退件处理
+          orderType: orderType.value === 'measure' ? '1' : orderType.value === 'calibration' ? '2' : '',
+          orderTypeName: orderType.value === 'measure' ? '检测委托单' : orderType.value === 'calibration' ? '检定或校准委托单' : '',
           customerSampleInfoList: list.value,
         }
         if (pageType.value === 'edit') { // 编辑
@@ -452,14 +465,18 @@
 // --------------------------------------------------------------------------------------
 
 // 点击打印
-const printObj = ref({
-  id: 'main', // 需要打印元素的id
-  popTitle: '委托书详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const printPDF = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  getStream({ id: infoId.value }).then((res) => {
+    loading.close()
+    const pdfStream = new Blob([res.data])
+    const blobUrl = URL.createObjectURL(pdfStream)
+    printPdf(blobUrl)
+  })
+}
 
 // 获取详细信息
 const getInfo = () => {
@@ -470,6 +487,27 @@
   getOrderDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
     dataForm.value.phone = res.data.customerPhone
+
+    if (`${res.data.accordLab}` === '1') {
+      checkCertificateList.value.push('如无相应检定规程/校准规范,可按本实验室的方法进行校准')
+    }
+    if (`${res.data.agreeOther}` === '1') {
+      checkCertificateList.value.push('如不能出具所选证书类型,同意受托方出具其他类型证书')
+    }
+    if (`${res.data.needAccordDeclare}` === '1') {
+      checkCertificateList.value.push('需要符合性声明')
+    }
+    if (`${res.data.needAdvice}` === '1') {
+      checkCertificateList.value.push('需要建议再校准日期')
+    }
+    if (`${res.data.contactReturn}` === '1') { // 需联系之后退件处理
+      dataForm.value.needContact = '1'
+    }
+    if (`${res.data.directReturn}` === '1') { // 直接退件处理
+      dataForm.value.needContact = '2'
+    }
+    orderType.value = res.data.orderType === '1' ? 'measure' : 'calibration' // 委托书类型
+
     list.value = res.data.customerSampleInfoList.map((item: any) => {
       return {
         ...item,
@@ -488,23 +526,27 @@
 }
 // 选完计量人员
 const confirmSelectPerson = (val: any) => {
-  dataForm.value.receivePersonNo = val[0].staffNo// 收件人工号
-  dataForm.value.receivePersonName = val[0].name// 收件人名称
+  dataForm.value.staffNo = val[0].staffNo// 收件人工号
+  dataForm.value.staffName = val[0].name// 收件人名称
 }
 // -----------------------------------------------------------------------------------------------
 watch(() => orderType.value, (newValue) => {
   if (newValue === 'measure') {
     columns.value = columnsMeasure.value
   }
-  else {
+  else if (newValue === 'calibration') {
     columns.value = columnsCalibration.value
   }
 }, { immediate: true })
+
+watch(() => checkCertificateList.value, (list) => {
+  console.log(list)
+}, { deep: true })
 onMounted(async () => {
   await getDict()
+  orderType.value = $route.query.orderType as string // 委托书类型 1检测委托单、2检定或校准委托单
   // 非添加页面获取详情
   if (pageType.value !== 'add') {
-    orderType.value = $route.query.orderType as string // 委托书类型 1检测委托单、2检定或校准委托单
     getInfo()
   }
 })
@@ -519,9 +561,9 @@
           航天计量检测技术（江苏）有限公司
         </div>
       </div>
-      <detail-page title="检测/校准委托单">
+      <detail-page :title="orderType === '1' ? '检测委托单' : '检定或校准委托单'">
         <template #btns>
-          <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          <el-button v-if="pageType === 'detail'" type="primary" @click="printPDF">
             打印
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
@@ -599,9 +641,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="联系人:" prop="director">
+                <el-form-item label="联系人:" prop="deliverer">
                   <el-input
-                    v-model="dataForm.director"
+                    v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail' || isReceived"
@@ -619,9 +661,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="移动电话:" prop="mobile">
+                <el-form-item label="移动电话:" prop="delivererTel">
                   <el-input
-                    v-model="dataForm.mobile"
+                    v-model="dataForm.delivererTel"
                     :placeholder="pageType === 'detail' ? '' : '请输入移动电话'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail' || isReceived"
@@ -656,20 +698,20 @@
                 <el-form-item label="预约取样时间:" prop="requireOverTime">
                   <el-date-picker
                     v-model="dataForm.requireOverTime"
-                    type="datetime"
+                    type="date"
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入预约取样时间'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail' || isReceived"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="发票单位名称:" prop="fpdwmc">
+                <el-form-item label="发票单位名称:" prop="invoiceCompany">
                   <el-input
-                    v-model="dataForm.fpdwmc"
+                    v-model="dataForm.invoiceCompany"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail' || isReceived"
                     :placeholder="pageType === 'detail' ? '' : '请输入发票单位名称'"
@@ -750,24 +792,24 @@
                 </el-col>
               </el-form-item>
             </el-row>
-            <el-row :gutter="24">
+            <el-row v-if="orderType === 'calibration'" :gutter="24">
               <el-form-item label=" ">
                 <el-col :span="24" style="display: flex;align-items: center;">
                   <span style="font-size: 13px;margin-right: 60px;">2.对证书要求</span>
-                  <el-checkbox-group v-model="checkCertificateList">
+                  <el-checkbox-group v-model="checkCertificateList" :disabled="pageType === 'detail' || isReceived">
                     <el-checkbox label="需要符合性声明" />
-                    <el-checkbox label="如无相应检定规程/校准规范，可按本实验室的方法进行校准" />
+                    <el-checkbox label="如无相应检定规程/校准规范,可按本实验室的方法进行校准" />
                     <el-checkbox label="需要建议再校准日期" />
-                    <el-checkbox label="如不能出具所选证书类型，同意受托方出具其他类型证书" />
+                    <el-checkbox label="如不能出具所选证书类型,同意受托方出具其他类型证书" />
                   </el-checkbox-group>
                 </el-col>
               </el-form-item>
             </el-row>
             <el-row :gutter="24">
               <el-col :span="8">
-                <el-form-item label="收件人工号:" prop="receivePersonNo">
+                <el-form-item label="收件人工号:" prop="staffNo">
                   <el-input
-                    v-model.trim="dataForm.receivePersonNo"
+                    v-model.trim="dataForm.staffNo"
                     :placeholder="pageType === 'detail' ? '' : '请选择收件人工号'"
                     disabled
                     class="full-width-input"
@@ -785,9 +827,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="收件人姓名:" prop="receivePersonName">
+                <el-form-item label="收件人姓名:" prop="staffName">
                   <el-input
-                    v-model.trim="dataForm.receivePersonName"
+                    v-model.trim="dataForm.staffName"
                     :placeholder="pageType === 'detail' ? '' : '请输入收件人姓名'"
                     disabled
                     class="full-width-input"
@@ -916,9 +958,9 @@
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
               />
-              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注、检测依据标准 -->
               <el-input
-                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark' || item.value === 'wgzt' || item.value === 'zsyq' || item.value === 'khtsyq')"
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark' || item.value === 'appearanceStatus' || item.value === 'certificateRequire' || item.value === 'specialRequire' || item.value === 'accordStandard')"
                 v-model="scope.row[item.value]"
                 type="textarea"
                 autosize
@@ -928,7 +970,7 @@
               <!-- 除电源电压和样品编号另外的行 -->
               <!-- <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && item.value !== 'appendixDescn' && item.value !== 'measureContent' && !scope.row.isEdit">{{ scope.row[item.value] }}</span> -->
               <!-- 除样品编号另外的行 -->
-              <span v-if="item.value !== 'sampleNo' && item.value !== 'appendixDescn' && item.value !== 'measureContent' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <span v-if="item.value !== 'specialRequire' && item.value !== 'certificateRequire' && item.value !== 'remark' && item.value !== 'accordStandard' && item.value !== 'sampleNo' && item.value !== 'appendixDescn' && item.value !== 'measureContent' && item.value !== 'appearanceStatus' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
               <!-- 样品编号不可编辑 -->
               <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
               <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 570b074..fb5bb15 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -40,8 +40,8 @@
 const showPopover = ref(false) // 是否展示popover
 
 const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'orderCode', align: 'center', width: '180px' },
-  { text: '委托单类型', value: 'orderType', align: 'center', width: '180px' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '180px' },
+  { text: '委托单类型', value: 'orderTypeName', align: 'center', width: '180px' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   // { text: '送样人', value: 'deliverer', align: 'center' },
@@ -113,6 +113,7 @@
       return {
         ...item,
         isUrgentName: item.isUrgent == 1 ? '是' : '否',
+        orderTypeName: `${item.orderType}` === '1' ? '检测委托单' : `${item.orderType}` === '2' ? '检定或校准委托单' : item.orderType,
       }
     })
 
@@ -209,7 +210,7 @@
     }
     exportOrderList(params).then((res) => {
       const blob = new Blob([res.data])
-      exportFile(blob, '委托书列表.xlsx')
+      exportFile(blob, '委托单列表.xlsx')
     })
   }
   else {
@@ -228,11 +229,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '委托书列表')
+    printJSON(list.value, properties, '委托单列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '委托书列表')
+    printJSON(printList, properties, '委托单列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -316,7 +317,7 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.orderCode"
-          placeholder="委托书编号"
+          placeholder="委托单编号"
           class="short-input"
           clearable
         />
@@ -324,7 +325,15 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.customerNo"
-          placeholder="委托方代码/名称"
+          placeholder="委托方代码"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
           class="short-input"
           clearable
         />
@@ -332,12 +341,12 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.deliverer"
-          placeholder="送样人"
+          placeholder="联系人"
           class="short-input"
           clearable
         />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.isUrgent" placeholder="是否加急" style="width: 120px;" clearable>
           <el-option
             v-for="item in isUrgentMap"
@@ -346,7 +355,7 @@
             :value="item.value"
           />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-select v-model="listQuery.status" placeholder="接收状态" style="width: 120px;" clearable>
           <el-option
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index fdc089d..90fbef7 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -32,6 +32,8 @@
   statusName?: string // 样品接收状态
   certificationCompany?: string // 证书单位名称
   certificationCompanyAddress?: string // 证书单位地址
+  orderType: string // 委托单类型
+
 }
 
 // 详情表单
@@ -41,7 +43,7 @@
   postalCode: string // 委托方邮编
   orderId?: string // 委托书id
   deliverer: string // 送检人
-  delivererTel: string // 送样人联系方式
+  // delivererTel: string // 送样人联系方式
   orderTime: string // 委托日期
   planDeliverTime: string // 预计送达时间
   requireOverTime: string // 要求检完时间
@@ -58,13 +60,14 @@
   certificationCompanyAddress: string // 证书单位地址
 
   needContact: string // 需联络后再做退件处理1、直接退件处理2
-  receivePersonNo: string // 收件人工号
-  receivePersonName: string // 收件人名称
+  staffNo: string // 收件人工号
+  staffName: string // 收件人名称
   receiveDate: string // 收件日期
-  director: string // 联系人
-  mobile: string // 移动电话
+  // director: string // 联系人
+  fixedTel: string // 固定电话
+  delivererTel: string // 移动电话
   email: string // 电子邮件或qq
-  fpdwmc: string // 发票单位名称
+  invoiceCompany: string // 发票单位名称
 }
 
 // 样品清单
@@ -81,6 +84,11 @@
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
   isExistSample?: string // 是否存在样品库中 1存在、0不存在
+
+  appearanceStatus: string // 外观状态
+  accordStandard: string // 检测依据标准
+  certificateRequire: string // 证书要求
+  specialRequire: string // 客户特殊要求
 }
 
 // 字典
diff --git a/src/views/business/subpackage/certificate/certificate-interface.ts b/src/views/business/subpackage/certificate/certificate-interface.ts
index aff651a..59e032b 100644
--- a/src/views/business/subpackage/certificate/certificate-interface.ts
+++ b/src/views/business/subpackage/certificate/certificate-interface.ts
@@ -3,6 +3,7 @@
   certificateCode: string // 证书号
   certificateName: string // 证书名称
   outsourcerId: string // 检测单位,分包方id
+  manufacturingNo: string // 出厂编号
   printStatus: string // 打印状态（1已打印、0未打印，不传为查询全部）
   sampleName: string // 样品名称
   sampleNo: string // 样品编号

diff --git a/.env.development b/.env.development
index 2d64f2f..37992fd 100644
--- a/.env.development
+++ b/.env.development
@@ -1,10 +1,10 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
 #房可鑫测试
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index d2b2d53..8fcecda 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -77,3 +77,14 @@
     data,
   })
 }
+
+// 详情
+export function getStream(data: { id: string }) {
+  return request({
+    url: `${prefix}/order/form/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/index.ts b/src/api/index.ts
index a368449..24bb58b 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -26,7 +26,7 @@
 const request = axios.create({
   // baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL,
   baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL,
-  timeout: 1000 * 60,
+  timeout: 1000 * 60 * 2,
   responseType: 'json',
 })
 
diff --git a/src/views/business/schedule/certPrint/components/filePreviewDialog.vue b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
index 6789bff..cef9f05 100644
--- a/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
+++ b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="FilePreviewDialog">
 import VuePdfEmbed from 'vue-pdf-embed'
 import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading } from 'element-plus'
 import { getPhotoUrl } from '@/api/system/tool'
 // 弹窗显示状态
 const dialogVisible = ref(false)
@@ -12,11 +13,16 @@
  * @param printFileName 文件名
  */
 function initDialog(printFileName: string) {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   getPhotoUrl(printFileName).then((res) => {
     dialogVisible.value = true
     const url = res.data
     pdfUrl.value = res.data
     pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
     // proxy.$refs.pdf.print()
     // download(url, row.printFileName as string)
   })
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index bb4d128..c917cc9 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -12,8 +12,9 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getUid } from '@/utils/getUid'
 import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
-import { addOrder, getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
 import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
+import { printPdf } from '@/utils/printUtils'
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
@@ -28,8 +29,8 @@
   orderCode: '', // 委托书编号
   postalCode: '', // 委托方邮编
   orderId: '', // 委托书编号
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
+  deliverer: '', // 送检人/联系人
+  // delivererTel: '', // 送样人联系方式
   orderTime: '', // 委托日期
   planDeliverTime: '', // 预计送达时间
   requireOverTime: '', // 要求检完时间
@@ -45,16 +46,16 @@
   certificationCompany: '', // 证书单位名称
   certificationCompanyAddress: '', // 证书单位地址
 
-  needContact: '1', // 需联络后再做退件处理1、直接退件处理2
-  receivePersonNo: '', // 收件人工号
-  receivePersonName: '', // 收件人名称
+  needContact: '1', // 需联络后再做退件处理0、直接退件处理1
+  staffNo: '', // 收件人工号
+  staffName: '', // 收件人名称
   receiveDate: '', // 收件日期
-  director: '', // 联系人
-  mobile: '', // 移动电话
+  fixedTel: '', // 固定电话
+  delivererTel: '', // 移动电话
   email: '', // 电子邮件或qq
-  fpdwmc: '', // 发票单位名称
+  invoiceCompany: '', // 发票单位名称
 })
-const checkCertificateList = ref([]) // 对证书要求
+const checkCertificateList = ref([]) as any// 对证书要求多选框
 const scanSampleRef = ref() // 标签绑定弹窗ref
 const certificationsMap = ref<dictType[]>([]) // 证书类别
 const powerVoltageMap = ref<dictType[]>([]) // 电源电压
@@ -73,10 +74,10 @@
   { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   // { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '外观状态', value: 'wgzt', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
   { text: '检测项目', value: 'measureContent', align: 'center', required: false },
   // { text: '样品状态', value: 'sampleStatusName', align: 'center' },
-  { text: '检测依据标准', value: 'appendixDescn', align: 'center', required: false },
+  { text: '检测依据标准', value: 'accordStandard', align: 'center', required: false },
   { text: '备注', value: 'remark', align: 'center', required: false },
 
 ])
@@ -86,9 +87,9 @@
   { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
   { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
-  { text: '证书要求', value: 'zsyq', align: 'center', required: false },
-  { text: '外观状态', value: 'wgzt', align: 'center', required: true },
-  { text: '客户特殊要求', value: 'khtsyq', align: 'center', required: false },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
   { text: '备注', value: 'remark', align: 'center', required: false },
 ])
 
@@ -104,8 +105,8 @@
 }
 // 校验规则
 const rules = reactive<FormRules>({
-  deliverer: [{ required: true, message: '要求送样人必填', trigger: 'blur' }],
-  delivererTel: [{ required: true, message: '要求送样人联系方式必填', trigger: 'blur' }],
+  // deliverer: [{ required: true, message: '要求送样人必填', trigger: 'blur' }],
+  // delivererTel: [{ required: true, message: '要求送样人联系方式必填', trigger: 'blur' }],
   customerNo: [{ required: true, message: '要求委托方代码必填', trigger: 'change' }],
   customerName: [{ required: true, message: '要求委托方名称必填', trigger: 'change' }],
   // phone: [{ required: true, message: '要求委托方电话必填', trigger: 'change' }],
@@ -118,11 +119,11 @@
   certificationCompany: [{ required: true, message: '要求证书单位名称必填', trigger: 'blur' }],
   certificationCompanyAddress: [{ required: true, message: '要求证书单位地址必填', trigger: 'blur' }],
 
-  director: [{ required: true, message: '联系人必填', trigger: 'blur' }],
-  mobile: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
+  deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
+  delivererTel: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
   phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
   email: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
-  fpdwmc: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
+  invoiceCompany: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
 }) // 表单验证规则
 
 // 从路由中获取页面类型参数
@@ -235,8 +236,8 @@
     dataForm.value.phone = val[0].phone // 委托方电话
     dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
 
-    dataForm.value.director = val[0].director // 联系人
-    dataForm.value.mobile = val[0].mobile // 移动电话
+    dataForm.value.deliverer = val[0].director // 联系人
+    dataForm.value.delivererTel = val[0].mobile // 移动电话
     dataForm.value.email = val[0].email // 电子邮件或qq
     dataForm.value.postalCode = val[0].postalCode // 邮编
     dataForm.value.certificationCompany = val[0].customerName // 证书单位名称
@@ -277,7 +278,7 @@
 // 检查表格第几行信息未完善
 const checkList = () => {
   // const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage || !item.measureContent))
-  const index = list.value.findIndex(item => !item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.wgzt)
+  const index = list.value.findIndex((item: any) => !item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.appearanceStatus)
   if (index !== -1) {
     return index + 1
   }
@@ -298,9 +299,13 @@
     sampleName: '', // 样品名称
     sampleModel: '', // 样品型号
     manufacturingNo: '', // 出厂编号
-    powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    measureContent: '', // 检定项目
+    appearanceStatus: '', // 外观状态
+    measureContent: '', // 检测依据标准
+    certificateRequire: '', // 证书要求
+    specialRequire: '', // 客户特殊要求
+    powerVoltage: '', // 电源电压
+    accordStandard: '', // 附件说明
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -401,6 +406,14 @@
         const params = {
           ...dataForm.value,
           customerPhone: dataForm.value.phone, // 委托方电话
+          accordLab: checkCertificateList.value.includes('如无相应检定规程/校准规范,可按本实验室的方法进行校准') ? '1' : '0',
+          agreeOther: checkCertificateList.value.includes('如不能出具所选证书类型,同意受托方出具其他类型证书') ? '1' : '0',
+          needAccordDeclare: checkCertificateList.value.includes('需要符合性声明') ? '1' : '0',
+          needAdvice: checkCertificateList.value.includes('需要建议再校准日期') ? '1' : '0',
+          contactReturn: dataForm.value.needContact === '1' ? '1' : '0', // 需联系之后退件处理
+          directReturn: dataForm.value.needContact === '2' ? '1' : '0', // 直接退件处理
+          orderType: orderType.value === 'measure' ? '1' : orderType.value === 'calibration' ? '2' : '',
+          orderTypeName: orderType.value === 'measure' ? '检测委托单' : orderType.value === 'calibration' ? '检定或校准委托单' : '',
           customerSampleInfoList: list.value,
         }
         if (pageType.value === 'edit') { // 编辑
@@ -452,14 +465,18 @@
 // --------------------------------------------------------------------------------------
 
 // 点击打印
-const printObj = ref({
-  id: 'main', // 需要打印元素的id
-  popTitle: '委托书详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const printPDF = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  getStream({ id: infoId.value }).then((res) => {
+    loading.close()
+    const pdfStream = new Blob([res.data])
+    const blobUrl = URL.createObjectURL(pdfStream)
+    printPdf(blobUrl)
+  })
+}
 
 // 获取详细信息
 const getInfo = () => {
@@ -470,6 +487,27 @@
   getOrderDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
     dataForm.value.phone = res.data.customerPhone
+
+    if (`${res.data.accordLab}` === '1') {
+      checkCertificateList.value.push('如无相应检定规程/校准规范,可按本实验室的方法进行校准')
+    }
+    if (`${res.data.agreeOther}` === '1') {
+      checkCertificateList.value.push('如不能出具所选证书类型,同意受托方出具其他类型证书')
+    }
+    if (`${res.data.needAccordDeclare}` === '1') {
+      checkCertificateList.value.push('需要符合性声明')
+    }
+    if (`${res.data.needAdvice}` === '1') {
+      checkCertificateList.value.push('需要建议再校准日期')
+    }
+    if (`${res.data.contactReturn}` === '1') { // 需联系之后退件处理
+      dataForm.value.needContact = '1'
+    }
+    if (`${res.data.directReturn}` === '1') { // 直接退件处理
+      dataForm.value.needContact = '2'
+    }
+    orderType.value = res.data.orderType === '1' ? 'measure' : 'calibration' // 委托书类型
+
     list.value = res.data.customerSampleInfoList.map((item: any) => {
       return {
         ...item,
@@ -488,23 +526,27 @@
 }
 // 选完计量人员
 const confirmSelectPerson = (val: any) => {
-  dataForm.value.receivePersonNo = val[0].staffNo// 收件人工号
-  dataForm.value.receivePersonName = val[0].name// 收件人名称
+  dataForm.value.staffNo = val[0].staffNo// 收件人工号
+  dataForm.value.staffName = val[0].name// 收件人名称
 }
 // -----------------------------------------------------------------------------------------------
 watch(() => orderType.value, (newValue) => {
   if (newValue === 'measure') {
     columns.value = columnsMeasure.value
   }
-  else {
+  else if (newValue === 'calibration') {
     columns.value = columnsCalibration.value
   }
 }, { immediate: true })
+
+watch(() => checkCertificateList.value, (list) => {
+  console.log(list)
+}, { deep: true })
 onMounted(async () => {
   await getDict()
+  orderType.value = $route.query.orderType as string // 委托书类型 1检测委托单、2检定或校准委托单
   // 非添加页面获取详情
   if (pageType.value !== 'add') {
-    orderType.value = $route.query.orderType as string // 委托书类型 1检测委托单、2检定或校准委托单
     getInfo()
   }
 })
@@ -519,9 +561,9 @@
           航天计量检测技术（江苏）有限公司
         </div>
       </div>
-      <detail-page title="检测/校准委托单">
+      <detail-page :title="orderType === '1' ? '检测委托单' : '检定或校准委托单'">
         <template #btns>
-          <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          <el-button v-if="pageType === 'detail'" type="primary" @click="printPDF">
             打印
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
@@ -599,9 +641,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="联系人:" prop="director">
+                <el-form-item label="联系人:" prop="deliverer">
                   <el-input
-                    v-model="dataForm.director"
+                    v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail' || isReceived"
@@ -619,9 +661,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="移动电话:" prop="mobile">
+                <el-form-item label="移动电话:" prop="delivererTel">
                   <el-input
-                    v-model="dataForm.mobile"
+                    v-model="dataForm.delivererTel"
                     :placeholder="pageType === 'detail' ? '' : '请输入移动电话'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail' || isReceived"
@@ -656,20 +698,20 @@
                 <el-form-item label="预约取样时间:" prop="requireOverTime">
                   <el-date-picker
                     v-model="dataForm.requireOverTime"
-                    type="datetime"
+                    type="date"
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入预约取样时间'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail' || isReceived"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="发票单位名称:" prop="fpdwmc">
+                <el-form-item label="发票单位名称:" prop="invoiceCompany">
                   <el-input
-                    v-model="dataForm.fpdwmc"
+                    v-model="dataForm.invoiceCompany"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail' || isReceived"
                     :placeholder="pageType === 'detail' ? '' : '请输入发票单位名称'"
@@ -750,24 +792,24 @@
                 </el-col>
               </el-form-item>
             </el-row>
-            <el-row :gutter="24">
+            <el-row v-if="orderType === 'calibration'" :gutter="24">
               <el-form-item label=" ">
                 <el-col :span="24" style="display: flex;align-items: center;">
                   <span style="font-size: 13px;margin-right: 60px;">2.对证书要求</span>
-                  <el-checkbox-group v-model="checkCertificateList">
+                  <el-checkbox-group v-model="checkCertificateList" :disabled="pageType === 'detail' || isReceived">
                     <el-checkbox label="需要符合性声明" />
-                    <el-checkbox label="如无相应检定规程/校准规范，可按本实验室的方法进行校准" />
+                    <el-checkbox label="如无相应检定规程/校准规范,可按本实验室的方法进行校准" />
                     <el-checkbox label="需要建议再校准日期" />
-                    <el-checkbox label="如不能出具所选证书类型，同意受托方出具其他类型证书" />
+                    <el-checkbox label="如不能出具所选证书类型,同意受托方出具其他类型证书" />
                   </el-checkbox-group>
                 </el-col>
               </el-form-item>
             </el-row>
             <el-row :gutter="24">
               <el-col :span="8">
-                <el-form-item label="收件人工号:" prop="receivePersonNo">
+                <el-form-item label="收件人工号:" prop="staffNo">
                   <el-input
-                    v-model.trim="dataForm.receivePersonNo"
+                    v-model.trim="dataForm.staffNo"
                     :placeholder="pageType === 'detail' ? '' : '请选择收件人工号'"
                     disabled
                     class="full-width-input"
@@ -785,9 +827,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="收件人姓名:" prop="receivePersonName">
+                <el-form-item label="收件人姓名:" prop="staffName">
                   <el-input
-                    v-model.trim="dataForm.receivePersonName"
+                    v-model.trim="dataForm.staffName"
                     :placeholder="pageType === 'detail' ? '' : '请输入收件人姓名'"
                     disabled
                     class="full-width-input"
@@ -916,9 +958,9 @@
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
               />
-              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注、检测依据标准 -->
               <el-input
-                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark' || item.value === 'wgzt' || item.value === 'zsyq' || item.value === 'khtsyq')"
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark' || item.value === 'appearanceStatus' || item.value === 'certificateRequire' || item.value === 'specialRequire' || item.value === 'accordStandard')"
                 v-model="scope.row[item.value]"
                 type="textarea"
                 autosize
@@ -928,7 +970,7 @@
               <!-- 除电源电压和样品编号另外的行 -->
               <!-- <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && item.value !== 'appendixDescn' && item.value !== 'measureContent' && !scope.row.isEdit">{{ scope.row[item.value] }}</span> -->
               <!-- 除样品编号另外的行 -->
-              <span v-if="item.value !== 'sampleNo' && item.value !== 'appendixDescn' && item.value !== 'measureContent' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <span v-if="item.value !== 'specialRequire' && item.value !== 'certificateRequire' && item.value !== 'remark' && item.value !== 'accordStandard' && item.value !== 'sampleNo' && item.value !== 'appendixDescn' && item.value !== 'measureContent' && item.value !== 'appearanceStatus' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
               <!-- 样品编号不可编辑 -->
               <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
               <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 570b074..fb5bb15 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -40,8 +40,8 @@
 const showPopover = ref(false) // 是否展示popover
 
 const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'orderCode', align: 'center', width: '180px' },
-  { text: '委托单类型', value: 'orderType', align: 'center', width: '180px' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '180px' },
+  { text: '委托单类型', value: 'orderTypeName', align: 'center', width: '180px' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   // { text: '送样人', value: 'deliverer', align: 'center' },
@@ -113,6 +113,7 @@
       return {
         ...item,
         isUrgentName: item.isUrgent == 1 ? '是' : '否',
+        orderTypeName: `${item.orderType}` === '1' ? '检测委托单' : `${item.orderType}` === '2' ? '检定或校准委托单' : item.orderType,
       }
     })
 
@@ -209,7 +210,7 @@
     }
     exportOrderList(params).then((res) => {
       const blob = new Blob([res.data])
-      exportFile(blob, '委托书列表.xlsx')
+      exportFile(blob, '委托单列表.xlsx')
     })
   }
   else {
@@ -228,11 +229,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '委托书列表')
+    printJSON(list.value, properties, '委托单列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '委托书列表')
+    printJSON(printList, properties, '委托单列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -316,7 +317,7 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.orderCode"
-          placeholder="委托书编号"
+          placeholder="委托单编号"
           class="short-input"
           clearable
         />
@@ -324,7 +325,15 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.customerNo"
-          placeholder="委托方代码/名称"
+          placeholder="委托方代码"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
           class="short-input"
           clearable
         />
@@ -332,12 +341,12 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.deliverer"
-          placeholder="送样人"
+          placeholder="联系人"
           class="short-input"
           clearable
         />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.isUrgent" placeholder="是否加急" style="width: 120px;" clearable>
           <el-option
             v-for="item in isUrgentMap"
@@ -346,7 +355,7 @@
             :value="item.value"
           />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-select v-model="listQuery.status" placeholder="接收状态" style="width: 120px;" clearable>
           <el-option
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index fdc089d..90fbef7 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -32,6 +32,8 @@
   statusName?: string // 样品接收状态
   certificationCompany?: string // 证书单位名称
   certificationCompanyAddress?: string // 证书单位地址
+  orderType: string // 委托单类型
+
 }
 
 // 详情表单
@@ -41,7 +43,7 @@
   postalCode: string // 委托方邮编
   orderId?: string // 委托书id
   deliverer: string // 送检人
-  delivererTel: string // 送样人联系方式
+  // delivererTel: string // 送样人联系方式
   orderTime: string // 委托日期
   planDeliverTime: string // 预计送达时间
   requireOverTime: string // 要求检完时间
@@ -58,13 +60,14 @@
   certificationCompanyAddress: string // 证书单位地址
 
   needContact: string // 需联络后再做退件处理1、直接退件处理2
-  receivePersonNo: string // 收件人工号
-  receivePersonName: string // 收件人名称
+  staffNo: string // 收件人工号
+  staffName: string // 收件人名称
   receiveDate: string // 收件日期
-  director: string // 联系人
-  mobile: string // 移动电话
+  // director: string // 联系人
+  fixedTel: string // 固定电话
+  delivererTel: string // 移动电话
   email: string // 电子邮件或qq
-  fpdwmc: string // 发票单位名称
+  invoiceCompany: string // 发票单位名称
 }
 
 // 样品清单
@@ -81,6 +84,11 @@
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
   isExistSample?: string // 是否存在样品库中 1存在、0不存在
+
+  appearanceStatus: string // 外观状态
+  accordStandard: string // 检测依据标准
+  certificateRequire: string // 证书要求
+  specialRequire: string // 客户特殊要求
 }
 
 // 字典
diff --git a/src/views/business/subpackage/certificate/certificate-interface.ts b/src/views/business/subpackage/certificate/certificate-interface.ts
index aff651a..59e032b 100644
--- a/src/views/business/subpackage/certificate/certificate-interface.ts
+++ b/src/views/business/subpackage/certificate/certificate-interface.ts
@@ -3,6 +3,7 @@
   certificateCode: string // 证书号
   certificateName: string // 证书名称
   outsourcerId: string // 检测单位,分包方id
+  manufacturingNo: string // 出厂编号
   printStatus: string // 打印状态（1已打印、0未打印，不传为查询全部）
   sampleName: string // 样品名称
   sampleNo: string // 样品编号
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index 9573ffa..119d852 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -84,6 +84,7 @@
   listQuery.value = {
     certificateCode: '', // 证书号
     certificateName: '', // 证书名称
+    manufacturingNo: '', // 出厂编号
     outsourcerId: '', // 检测单位,分包方id
     printStatus: '', // 打印状态（1已打印、0未打印，不传为查询全部）
     sampleName: '', // 样品名称
@@ -121,6 +122,7 @@
     const params = {
       certificateCode: listQuery.value.certificateCode, // 证书号
       certificateName: listQuery.value.certificateName, // 证书名称
+      manufacturingNo: listQuery.value.manufacturingNo, // 出厂编号
       outsourcerId: listQuery.value.outsourcerId, // 检测单位,分包方id
       printStatus: listQuery.value.printStatus, // 打印状态（1已打印、0未打印，不传为查询全部）
       sampleName: listQuery.value.sampleName, // 样品名称
@@ -197,8 +199,8 @@
 const filePreviewDialogRef = ref() // 预览弹窗ref
 
 // 查看证书
-const checkCertificate = () => {
-  filePreviewDialogRef.value.initDialog(printFileName.value)
+const checkCertificate = (row: any) => {
+  filePreviewDialogRef.value.initDialog(row.certificateFile)
 }
 
 onMounted(async () => {
@@ -268,7 +270,7 @@
                 <el-button size="small" link type="primary" @click="handleDetail(row, 'detail')">
                   详情
                 </el-button>
-                <el-button size="small" link type="primary" @click="checkCertificate">
+                <el-button size="small" link type="primary" @click="checkCertificate(row)">
                   查看证书
                 </el-button>
                 <!-- <el-button size="small" link type="primary" @click="print(row)">