diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 841e0cb..d4d60fe 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -47,7 +47,7 @@
         show: true,
         icon: 'circle',
         orient: 'vertile', // 图例方向
-        align: 'left', // 图例标记和文本的对齐，默认自动
+        align: 'center', // 图例标记和文本的对齐，默认自动
         top: 5,
         right: 20,
         itemWidth: 12,

diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 841e0cb..d4d60fe 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -47,7 +47,7 @@
         show: true,
         icon: 'circle',
         orient: 'vertile', // 图例方向
-        align: 'left', // 图例标记和文本的对齐，默认自动
+        align: 'center', // 图例标记和文本的对齐，默认自动
         top: 5,
         right: 20,
         itemWidth: 12,
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
index 4e6da78..8ca8f47 100644
--- a/src/views/business/fieldTest/components/selectStaffList.vue
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -1,6 +1,6 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="SelectStaffListDialog">
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import { getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -55,6 +55,7 @@
 }
 // 获取数据列表
 const fetchData = () => {
+  loadingTable.value = true
   select.value = -1
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
@@ -67,6 +68,7 @@
       })
       total.value = parseInt(res.data.total)
     }
+    loadingTable.value = false
   })
 }
 // 搜索

diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 841e0cb..d4d60fe 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -47,7 +47,7 @@
         show: true,
         icon: 'circle',
         orient: 'vertile', // 图例方向
-        align: 'left', // 图例标记和文本的对齐，默认自动
+        align: 'center', // 图例标记和文本的对齐，默认自动
         top: 5,
         right: 20,
         itemWidth: 12,
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
index 4e6da78..8ca8f47 100644
--- a/src/views/business/fieldTest/components/selectStaffList.vue
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -1,6 +1,6 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="SelectStaffListDialog">
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import { getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -55,6 +55,7 @@
 }
 // 获取数据列表
 const fetchData = () => {
+  loadingTable.value = true
   select.value = -1
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
@@ -67,6 +68,7 @@
       })
       total.value = parseInt(res.data.total)
     }
+    loadingTable.value = false
   })
 }
 // 搜索
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 43ba781..edf8c48 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -340,6 +340,7 @@
     })
   }
 }
+
 // 打印列表
 function printList() {
   // 打印列

diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 841e0cb..d4d60fe 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -47,7 +47,7 @@
         show: true,
         icon: 'circle',
         orient: 'vertile', // 图例方向
-        align: 'left', // 图例标记和文本的对齐，默认自动
+        align: 'center', // 图例标记和文本的对齐，默认自动
         top: 5,
         right: 20,
         itemWidth: 12,
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
index 4e6da78..8ca8f47 100644
--- a/src/views/business/fieldTest/components/selectStaffList.vue
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -1,6 +1,6 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="SelectStaffListDialog">
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import { getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -55,6 +55,7 @@
 }
 // 获取数据列表
 const fetchData = () => {
+  loadingTable.value = true
   select.value = -1
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
@@ -67,6 +68,7 @@
       })
       total.value = parseInt(res.data.total)
     }
+    loadingTable.value = false
   })
 }
 // 搜索
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 43ba781..edf8c48 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -340,6 +340,7 @@
     })
   }
 }
+
 // 打印列表
 function printList() {
   // 打印列
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 729f2b4..bb4d128 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -13,6 +13,7 @@
 import { getUid } from '@/utils/getUid'
 import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
 import { addOrder, getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
@@ -20,10 +21,12 @@
 const visible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const ruleFormRef = ref()
+const orderType = ref('') // 委托书类型 1检测委托单、2检定或校准委托单
 // 表单
 const dataForm: Ref<IOrderDetail> = ref({
   id: '',
   orderCode: '', // 委托书编号
+  postalCode: '', // 委托方邮编
   orderId: '', // 委托书编号
   deliverer: '', // 送检人
   delivererTel: '', // 送样人联系方式
@@ -41,7 +44,17 @@
   certifications: '', // 证书类别
   certificationCompany: '', // 证书单位名称
   certificationCompanyAddress: '', // 证书单位地址
+
+  needContact: '1', // 需联络后再做退件处理1、直接退件处理2
+  receivePersonNo: '', // 收件人工号
+  receivePersonName: '', // 收件人名称
+  receiveDate: '', // 收件日期
+  director: '', // 联系人
+  mobile: '', // 移动电话
+  email: '', // 电子邮件或qq
+  fpdwmc: '', // 发票单位名称
 })
+const checkCertificateList = ref([]) // 对证书要求
 const scanSampleRef = ref() // 标签绑定弹窗ref
 const certificationsMap = ref<dictType[]>([]) // 证书类别
 const powerVoltageMap = ref<dictType[]>([]) // 电源电压
@@ -52,17 +65,31 @@
 const list = ref<ISampleList[]>([])// 表格数据
 // 选中的内容
 const checkoutList = ref([])
+const columns = ref([]) as any
 // 表头
-const columns = ref([
-  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true },
-  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
-  { text: '型号', value: 'sampleModel', align: 'center', required: true },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
-  { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '样品状态', value: 'sampleStatusName', align: 'center' },
-  { text: '附件说明', value: 'appendixDescn', align: 'center', width: '180' },
-  // { text: '备注', value: 'remark', align: 'center' },
-  { text: '校准/检测项目', value: 'measureContent', align: 'center', required: true, width: '180' },
+const columnsMeasure = ref([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { 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: 'powerVoltage', align: 'center', required: true },
+  { text: '外观状态', value: 'wgzt', 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: 'remark', align: 'center', required: false },
+
+])
+// 表头
+const columnsCalibration = ref([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { 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: 'remark', align: 'center', required: false },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -81,7 +108,7 @@
   delivererTel: [{ required: true, message: '要求送样人联系方式必填', trigger: 'blur' }],
   customerNo: [{ required: true, message: '要求委托方代码必填', trigger: 'change' }],
   customerName: [{ required: true, message: '要求委托方名称必填', trigger: 'change' }],
-  phone: [{ required: true, message: '要求委托方电话必填', trigger: 'change' }],
+  // phone: [{ required: true, message: '要求委托方电话必填', trigger: 'change' }],
   customerAddress: [{ required: true, message: '要求委托方地址必填', trigger: 'change' }],
   orderTime: [{ type: 'date', required: true, message: '要求委托日期必填', trigger: 'change' }],
   planDeliverTime: [{ type: 'date', required: true, message: '要求预计送达时间必填', trigger: 'change' }],
@@ -90,6 +117,12 @@
   isUrgent: [{ required: true, message: '要求是否加急必填', trigger: 'change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称必填', trigger: 'blur' }],
   certificationCompanyAddress: [{ required: true, message: '要求证书单位地址必填', trigger: 'blur' }],
+
+  director: [{ required: true, message: '联系人必填', trigger: 'blur' }],
+  mobile: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
+  phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
+  email: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
+  fpdwmc: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
 }) // 表单验证规则
 
 // 从路由中获取页面类型参数
@@ -201,6 +234,13 @@
     dataForm.value.customerName = val[0].customerName // 委托方名称
     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.email = val[0].email // 电子邮件或qq
+    dataForm.value.postalCode = val[0].postalCode // 邮编
+    dataForm.value.certificationCompany = val[0].customerName // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].fullAddress // 证书单位地址
   }
 }
 
@@ -237,7 +277,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.powerVoltage || !item.measureContent)
+  const index = list.value.findIndex(item => !item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.wgzt)
   if (index !== -1) {
     return index + 1
   }
@@ -440,10 +480,31 @@
   })
 }
 
+// ---------------------------------------收件人-------------------------------------------------
+const merterPersonRef = ref() // 计量人员Ref
+// 点击选择
+const selectReceivePerson = () => {
+  merterPersonRef.value.initDialog()
+}
+// 选完计量人员
+const confirmSelectPerson = (val: any) => {
+  dataForm.value.receivePersonNo = val[0].staffNo// 收件人工号
+  dataForm.value.receivePersonName = val[0].name// 收件人名称
+}
+// -----------------------------------------------------------------------------------------------
+watch(() => orderType.value, (newValue) => {
+  if (newValue === 'measure') {
+    columns.value = columnsMeasure.value
+  }
+  else {
+    columns.value = columnsCalibration.value
+  }
+}, { immediate: true })
 onMounted(async () => {
   await getDict()
   // 非添加页面获取详情
   if (pageType.value !== 'add') {
+    orderType.value = $route.query.orderType as string // 委托书类型 1检测委托单、2检定或校准委托单
     getInfo()
   }
 })
@@ -483,78 +544,17 @@
                 <el-form-item label="委托书编号:" prop="orderCode">
                   <el-input
                     v-model="dataForm.orderCode"
-                    :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                    :placeholder="pageType === 'detail' ? ' ' : '系统自动生成'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="送样人:" prop="deliverer">
-                  <el-input
-                    v-model="dataForm.deliverer"
-                    :placeholder="pageType === 'detail' ? '' : '请输入送样人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail' || isReceived"
-                  />
-                </el-form-item>
-              </el-col><el-col :span="8">
-                <el-form-item label="联系方式:" prop="delivererTel">
-                  <el-input
-                    v-model="dataForm.delivererTel"
-                    :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail' || isReceived"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="委托日期:" prop="orderTime">
-                  <el-date-picker
-                    v-model="dataForm.orderTime"
-                    type="date"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail' || isReceived"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="预计送达时间:" prop="planDeliverTime">
-                  <el-date-picker
-                    v-model="dataForm.planDeliverTime"
-                    type="datetime"
-                    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"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="要求检完时间:" prop="requireOverTime">
-                  <el-date-picker
-                    v-model="dataForm.requireOverTime"
-                    type="datetime"
-                    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"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
                 <el-form-item label="委托方代码" prop="customerNo">
                   <el-input
                     v-model="dataForm.customerNo"
-                    :placeholder="pageType === 'detail' ? '' : '请选择'"
+                    :placeholder="pageType === 'detail' ? ' ' : '请选择'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   >
@@ -570,17 +570,17 @@
                 <el-form-item label="委托方名称" prop="customerName">
                   <el-input
                     v-model="dataForm.customerName"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                    :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="委托方电话">
+                <el-form-item label="邮政编码" prop="postalCode">
                   <el-input
-                    v-model="dataForm.phone"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                    v-model="dataForm.postalCode"
+                    :placeholder="pageType === 'detail' ? ' ' : '邮政编码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
@@ -598,8 +598,84 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="联系人:" prop="director">
+                  <el-input
+                    v-model="dataForm.director"
+                    :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="固定电话:" prop="phone">
+                  <el-input
+                    v-model="dataForm.phone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入固定电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="移动电话:" prop="mobile">
+                  <el-input
+                    v-model="dataForm.mobile"
+                    :placeholder="pageType === 'detail' ? '' : '请输入移动电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="电子邮件/QQ:" prop="email">
+                  <el-input
+                    v-model="dataForm.email"
+                    :placeholder="pageType === 'detail' ? '' : '请输入电子邮件/QQ'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="预约送达时间:" prop="planDeliverTime">
+                  <el-date-picker
+                    v-model="dataForm.planDeliverTime"
+                    type="datetime"
+                    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"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="预约取样时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    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"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="发票单位名称:" prop="fpdwmc">
+                  <el-input
+                    v-model="dataForm.fpdwmc"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                    :placeholder="pageType === 'detail' ? '' : '请输入发票单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="8">
                 <el-form-item label="证书单位名称:" prop="certificationCompany">
                   <el-input
@@ -610,18 +686,6 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="证书类别:" prop="certifications">
-                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail' || isReceived" class="full-width-input">
-                    <el-option
-                      v-for="i in certificationsMap"
-                      :key="i.value"
-                      :label="i.name"
-                      :value="i.value"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
               <el-col :span="16">
                 <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
                   <el-input
@@ -634,6 +698,130 @@
                   />
                 </el-form-item>
               </el-col>
+              <!-- <el-col :span="8">
+                <el-form-item label="送样人:" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送样人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col> -->
+              <!-- <el-col :span="8">
+                <el-form-item label="联系方式:" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col> -->
+
+              <!-- <el-col :span="8">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col> -->
+            </el-row>
+            <el-row :gutter="24">
+              <el-form-item label="说明:">
+                <el-col :span="24" style="display: flex;align-items: center;">
+                  <!-- <span style="font-weight: 600;font-size: 13px;">说明</span> -->
+                  <span style="font-size: 13px;margin-right: 60px;">1.如仪器出现故障或不合格</span>
+                  <el-radio-group v-model="dataForm.needContact" :disabled="pageType === 'detail' || isReceived">
+                    <el-radio label="1">
+                      需联络后再做退件处理
+                    </el-radio>
+                    <el-radio label="2">
+                      直接退件处理
+                    </el-radio>
+                  </el-radio-group>
+                </el-col>
+              </el-form-item>
+            </el-row>
+            <el-row :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 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-input
+                    v-model.trim="dataForm.receivePersonNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择收件人工号'"
+                    disabled
+                    class="full-width-input"
+                    clearable
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button
+                        size="small"
+                        @click="selectReceivePerson"
+                      >
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="收件人姓名:" prop="receivePersonName">
+                  <el-input
+                    v-model.trim="dataForm.receivePersonName"
+                    :placeholder="pageType === 'detail' ? '' : '请输入收件人姓名'"
+                    disabled
+                    class="full-width-input"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="收件日期:" prop="receiveDate">
+                  <el-date-picker
+                    v-model="dataForm.receiveDate"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择收件日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <!-- <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="证书类别:" prop="certifications">
+                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail' || isReceived" class="full-width-input">
+                    <el-option
+                      v-for="i in certificationsMap"
+                      :key="i.value"
+                      :label="i.name"
+                      :value="i.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
 
               <el-col :span="8">
                 <el-form-item label="是否加急:" prop="isUrgent">
@@ -647,8 +835,8 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24" class="marg">
+            </el-row> -->
+            <!-- <el-row :gutter="24" class="marg">
               <el-col :span="16">
                 <el-form-item label="备注:">
                   <el-input
@@ -661,9 +849,9 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
 
-            <el-row :gutter="24" class="marg">
+            <!-- <el-row :gutter="24" class="marg">
               <el-col :span="16">
                 <el-form-item label="附件:">
                   <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
@@ -674,7 +862,7 @@
                   </el-button>
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
           </el-form>
           <div style="color: red;font-size: 13px;">
             *本委托单一式两份 双方各执一份
@@ -730,7 +918,7 @@
               />
               <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
               <el-input
-                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark')"
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark' || item.value === 'wgzt' || item.value === 'zsyq' || item.value === 'khtsyq')"
                 v-model="scope.row[item.value]"
                 type="textarea"
                 autosize
@@ -782,6 +970,8 @@
     <!-- 选择样品组件 -->
     <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" :customer-id="dataForm.customerId" :order-id="infoId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <scan-sample-dialog ref="scanSampleRef" title="扫描添加样品" @confirm="scanOver" />
+    <!-- 选择计量人员组件列表 -->
+    <select-staff-list ref="merterPersonRef" :is-multi-merter-person="false" @add="confirmSelectPerson" />
   </app-container>
 </template>
 
@@ -886,3 +1076,9 @@
 }
 </style>
 
+<style lang="scss">
+.el-radio__label {
+  display: block !important;
+}
+</style>
+

diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 841e0cb..d4d60fe 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -47,7 +47,7 @@
         show: true,
         icon: 'circle',
         orient: 'vertile', // 图例方向
-        align: 'left', // 图例标记和文本的对齐，默认自动
+        align: 'center', // 图例标记和文本的对齐，默认自动
         top: 5,
         right: 20,
         itemWidth: 12,
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
index 4e6da78..8ca8f47 100644
--- a/src/views/business/fieldTest/components/selectStaffList.vue
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -1,6 +1,6 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="SelectStaffListDialog">
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import { getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -55,6 +55,7 @@
 }
 // 获取数据列表
 const fetchData = () => {
+  loadingTable.value = true
   select.value = -1
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
@@ -67,6 +68,7 @@
       })
       total.value = parseInt(res.data.total)
     }
+    loadingTable.value = false
   })
 }
 // 搜索
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 43ba781..edf8c48 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -340,6 +340,7 @@
     })
   }
 }
+
 // 打印列表
 function printList() {
   // 打印列
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 729f2b4..bb4d128 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -13,6 +13,7 @@
 import { getUid } from '@/utils/getUid'
 import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
 import { addOrder, getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
@@ -20,10 +21,12 @@
 const visible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const ruleFormRef = ref()
+const orderType = ref('') // 委托书类型 1检测委托单、2检定或校准委托单
 // 表单
 const dataForm: Ref<IOrderDetail> = ref({
   id: '',
   orderCode: '', // 委托书编号
+  postalCode: '', // 委托方邮编
   orderId: '', // 委托书编号
   deliverer: '', // 送检人
   delivererTel: '', // 送样人联系方式
@@ -41,7 +44,17 @@
   certifications: '', // 证书类别
   certificationCompany: '', // 证书单位名称
   certificationCompanyAddress: '', // 证书单位地址
+
+  needContact: '1', // 需联络后再做退件处理1、直接退件处理2
+  receivePersonNo: '', // 收件人工号
+  receivePersonName: '', // 收件人名称
+  receiveDate: '', // 收件日期
+  director: '', // 联系人
+  mobile: '', // 移动电话
+  email: '', // 电子邮件或qq
+  fpdwmc: '', // 发票单位名称
 })
+const checkCertificateList = ref([]) // 对证书要求
 const scanSampleRef = ref() // 标签绑定弹窗ref
 const certificationsMap = ref<dictType[]>([]) // 证书类别
 const powerVoltageMap = ref<dictType[]>([]) // 电源电压
@@ -52,17 +65,31 @@
 const list = ref<ISampleList[]>([])// 表格数据
 // 选中的内容
 const checkoutList = ref([])
+const columns = ref([]) as any
 // 表头
-const columns = ref([
-  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true },
-  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
-  { text: '型号', value: 'sampleModel', align: 'center', required: true },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
-  { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '样品状态', value: 'sampleStatusName', align: 'center' },
-  { text: '附件说明', value: 'appendixDescn', align: 'center', width: '180' },
-  // { text: '备注', value: 'remark', align: 'center' },
-  { text: '校准/检测项目', value: 'measureContent', align: 'center', required: true, width: '180' },
+const columnsMeasure = ref([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { 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: 'powerVoltage', align: 'center', required: true },
+  { text: '外观状态', value: 'wgzt', 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: 'remark', align: 'center', required: false },
+
+])
+// 表头
+const columnsCalibration = ref([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { 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: 'remark', align: 'center', required: false },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -81,7 +108,7 @@
   delivererTel: [{ required: true, message: '要求送样人联系方式必填', trigger: 'blur' }],
   customerNo: [{ required: true, message: '要求委托方代码必填', trigger: 'change' }],
   customerName: [{ required: true, message: '要求委托方名称必填', trigger: 'change' }],
-  phone: [{ required: true, message: '要求委托方电话必填', trigger: 'change' }],
+  // phone: [{ required: true, message: '要求委托方电话必填', trigger: 'change' }],
   customerAddress: [{ required: true, message: '要求委托方地址必填', trigger: 'change' }],
   orderTime: [{ type: 'date', required: true, message: '要求委托日期必填', trigger: 'change' }],
   planDeliverTime: [{ type: 'date', required: true, message: '要求预计送达时间必填', trigger: 'change' }],
@@ -90,6 +117,12 @@
   isUrgent: [{ required: true, message: '要求是否加急必填', trigger: 'change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称必填', trigger: 'blur' }],
   certificationCompanyAddress: [{ required: true, message: '要求证书单位地址必填', trigger: 'blur' }],
+
+  director: [{ required: true, message: '联系人必填', trigger: 'blur' }],
+  mobile: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
+  phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
+  email: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
+  fpdwmc: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
 }) // 表单验证规则
 
 // 从路由中获取页面类型参数
@@ -201,6 +234,13 @@
     dataForm.value.customerName = val[0].customerName // 委托方名称
     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.email = val[0].email // 电子邮件或qq
+    dataForm.value.postalCode = val[0].postalCode // 邮编
+    dataForm.value.certificationCompany = val[0].customerName // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].fullAddress // 证书单位地址
   }
 }
 
@@ -237,7 +277,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.powerVoltage || !item.measureContent)
+  const index = list.value.findIndex(item => !item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.wgzt)
   if (index !== -1) {
     return index + 1
   }
@@ -440,10 +480,31 @@
   })
 }
 
+// ---------------------------------------收件人-------------------------------------------------
+const merterPersonRef = ref() // 计量人员Ref
+// 点击选择
+const selectReceivePerson = () => {
+  merterPersonRef.value.initDialog()
+}
+// 选完计量人员
+const confirmSelectPerson = (val: any) => {
+  dataForm.value.receivePersonNo = val[0].staffNo// 收件人工号
+  dataForm.value.receivePersonName = val[0].name// 收件人名称
+}
+// -----------------------------------------------------------------------------------------------
+watch(() => orderType.value, (newValue) => {
+  if (newValue === 'measure') {
+    columns.value = columnsMeasure.value
+  }
+  else {
+    columns.value = columnsCalibration.value
+  }
+}, { immediate: true })
 onMounted(async () => {
   await getDict()
   // 非添加页面获取详情
   if (pageType.value !== 'add') {
+    orderType.value = $route.query.orderType as string // 委托书类型 1检测委托单、2检定或校准委托单
     getInfo()
   }
 })
@@ -483,78 +544,17 @@
                 <el-form-item label="委托书编号:" prop="orderCode">
                   <el-input
                     v-model="dataForm.orderCode"
-                    :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                    :placeholder="pageType === 'detail' ? ' ' : '系统自动生成'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="送样人:" prop="deliverer">
-                  <el-input
-                    v-model="dataForm.deliverer"
-                    :placeholder="pageType === 'detail' ? '' : '请输入送样人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail' || isReceived"
-                  />
-                </el-form-item>
-              </el-col><el-col :span="8">
-                <el-form-item label="联系方式:" prop="delivererTel">
-                  <el-input
-                    v-model="dataForm.delivererTel"
-                    :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail' || isReceived"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="委托日期:" prop="orderTime">
-                  <el-date-picker
-                    v-model="dataForm.orderTime"
-                    type="date"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail' || isReceived"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="预计送达时间:" prop="planDeliverTime">
-                  <el-date-picker
-                    v-model="dataForm.planDeliverTime"
-                    type="datetime"
-                    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"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="要求检完时间:" prop="requireOverTime">
-                  <el-date-picker
-                    v-model="dataForm.requireOverTime"
-                    type="datetime"
-                    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"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
                 <el-form-item label="委托方代码" prop="customerNo">
                   <el-input
                     v-model="dataForm.customerNo"
-                    :placeholder="pageType === 'detail' ? '' : '请选择'"
+                    :placeholder="pageType === 'detail' ? ' ' : '请选择'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   >
@@ -570,17 +570,17 @@
                 <el-form-item label="委托方名称" prop="customerName">
                   <el-input
                     v-model="dataForm.customerName"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                    :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="委托方电话">
+                <el-form-item label="邮政编码" prop="postalCode">
                   <el-input
-                    v-model="dataForm.phone"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                    v-model="dataForm.postalCode"
+                    :placeholder="pageType === 'detail' ? ' ' : '邮政编码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
@@ -598,8 +598,84 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="联系人:" prop="director">
+                  <el-input
+                    v-model="dataForm.director"
+                    :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="固定电话:" prop="phone">
+                  <el-input
+                    v-model="dataForm.phone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入固定电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="移动电话:" prop="mobile">
+                  <el-input
+                    v-model="dataForm.mobile"
+                    :placeholder="pageType === 'detail' ? '' : '请输入移动电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="电子邮件/QQ:" prop="email">
+                  <el-input
+                    v-model="dataForm.email"
+                    :placeholder="pageType === 'detail' ? '' : '请输入电子邮件/QQ'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="预约送达时间:" prop="planDeliverTime">
+                  <el-date-picker
+                    v-model="dataForm.planDeliverTime"
+                    type="datetime"
+                    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"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="预约取样时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    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"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="发票单位名称:" prop="fpdwmc">
+                  <el-input
+                    v-model="dataForm.fpdwmc"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                    :placeholder="pageType === 'detail' ? '' : '请输入发票单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="8">
                 <el-form-item label="证书单位名称:" prop="certificationCompany">
                   <el-input
@@ -610,18 +686,6 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="证书类别:" prop="certifications">
-                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail' || isReceived" class="full-width-input">
-                    <el-option
-                      v-for="i in certificationsMap"
-                      :key="i.value"
-                      :label="i.name"
-                      :value="i.value"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
               <el-col :span="16">
                 <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
                   <el-input
@@ -634,6 +698,130 @@
                   />
                 </el-form-item>
               </el-col>
+              <!-- <el-col :span="8">
+                <el-form-item label="送样人:" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送样人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col> -->
+              <!-- <el-col :span="8">
+                <el-form-item label="联系方式:" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col> -->
+
+              <!-- <el-col :span="8">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col> -->
+            </el-row>
+            <el-row :gutter="24">
+              <el-form-item label="说明:">
+                <el-col :span="24" style="display: flex;align-items: center;">
+                  <!-- <span style="font-weight: 600;font-size: 13px;">说明</span> -->
+                  <span style="font-size: 13px;margin-right: 60px;">1.如仪器出现故障或不合格</span>
+                  <el-radio-group v-model="dataForm.needContact" :disabled="pageType === 'detail' || isReceived">
+                    <el-radio label="1">
+                      需联络后再做退件处理
+                    </el-radio>
+                    <el-radio label="2">
+                      直接退件处理
+                    </el-radio>
+                  </el-radio-group>
+                </el-col>
+              </el-form-item>
+            </el-row>
+            <el-row :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 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-input
+                    v-model.trim="dataForm.receivePersonNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择收件人工号'"
+                    disabled
+                    class="full-width-input"
+                    clearable
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button
+                        size="small"
+                        @click="selectReceivePerson"
+                      >
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="收件人姓名:" prop="receivePersonName">
+                  <el-input
+                    v-model.trim="dataForm.receivePersonName"
+                    :placeholder="pageType === 'detail' ? '' : '请输入收件人姓名'"
+                    disabled
+                    class="full-width-input"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="收件日期:" prop="receiveDate">
+                  <el-date-picker
+                    v-model="dataForm.receiveDate"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择收件日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <!-- <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="证书类别:" prop="certifications">
+                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail' || isReceived" class="full-width-input">
+                    <el-option
+                      v-for="i in certificationsMap"
+                      :key="i.value"
+                      :label="i.name"
+                      :value="i.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
 
               <el-col :span="8">
                 <el-form-item label="是否加急:" prop="isUrgent">
@@ -647,8 +835,8 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24" class="marg">
+            </el-row> -->
+            <!-- <el-row :gutter="24" class="marg">
               <el-col :span="16">
                 <el-form-item label="备注:">
                   <el-input
@@ -661,9 +849,9 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
 
-            <el-row :gutter="24" class="marg">
+            <!-- <el-row :gutter="24" class="marg">
               <el-col :span="16">
                 <el-form-item label="附件:">
                   <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
@@ -674,7 +862,7 @@
                   </el-button>
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
           </el-form>
           <div style="color: red;font-size: 13px;">
             *本委托单一式两份 双方各执一份
@@ -730,7 +918,7 @@
               />
               <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
               <el-input
-                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark')"
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark' || item.value === 'wgzt' || item.value === 'zsyq' || item.value === 'khtsyq')"
                 v-model="scope.row[item.value]"
                 type="textarea"
                 autosize
@@ -782,6 +970,8 @@
     <!-- 选择样品组件 -->
     <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" :customer-id="dataForm.customerId" :order-id="infoId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <scan-sample-dialog ref="scanSampleRef" title="扫描添加样品" @confirm="scanOver" />
+    <!-- 选择计量人员组件列表 -->
+    <select-staff-list ref="merterPersonRef" :is-multi-merter-person="false" @add="confirmSelectPerson" />
   </app-container>
 </template>
 
@@ -886,3 +1076,9 @@
 }
 </style>
 
+<style lang="scss">
+.el-radio__label {
+  display: block !important;
+}
+</style>
+
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 2294b88..570b074 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -34,15 +34,21 @@
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const statusMap = ref<dictType[]>([]) // 接收状态
 const backReasonDialogRef = ref() // 退回弹出框ref
+// const orderType = ref(false) // 委托书类型 1检测委托单、2检定或校准委托单
+const measureType = ref(true) // 委托书类型 1检测委托单
+const correctType = ref(false) // 委托书类型 检定或校准委托单
+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: 'customerNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '送样人', value: 'deliverer', align: 'center' },
-  { text: '联系方式', value: 'customerPhone', align: 'center' },
+  // { text: '送样人', value: 'deliverer', align: 'center' },
+  { text: '联系人', value: 'deliverer', align: 'center' },
+  // { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100px', styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
+  // { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100px', styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '100px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   // { text: '备注', value: 'remark', align: 'center' },
@@ -281,6 +287,23 @@
   })
 }
 
+// ----------------------------------------popover-------------------------------------------
+// 点击确定
+const confirm = () => {
+  $router.push({
+    path: '/schedule/order/add',
+    query: {
+      orderType: measureType.value ? 'measure' : 'calibration', // 委托书类型 1检测委托单、2检定或校准委托单
+    },
+  })
+}
+// ------------------------------------------------------------------------------------------
+watch(() => measureType.value, (newValue) => {
+  correctType.value = !newValue
+})
+watch(() => correctType.value, (newValue) => {
+  measureType.value = !newValue
+})
 fetchData(true)
 </script>
 
@@ -301,7 +324,7 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.customerNo"
-          placeholder="委托方代码"
+          placeholder="委托方代码/名称"
           class="short-input"
           clearable
         />
@@ -339,7 +362,30 @@
       <template #btns-right>
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/orderList/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" /> -->
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/orderList/import')" icon="icon-template" title="模板下载" type="primary" @click="templateDownload" /> -->
-        <icon-button v-if="proxy.hasPerm('/schedule/orderList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <el-popover
+          v-if="proxy.hasPerm('/schedule/orderList/add')"
+          :visible="showPopover"
+          trigger="click"
+          width="200"
+        >
+          <el-checkbox v-model="measureType">
+            检测委托单
+          </el-checkbox>
+          <el-checkbox v-model="correctType">
+            检定或校准委托单
+          </el-checkbox>
+          <div style="text-align: right; margin: 0;margin-top: 16px;">
+            <el-button size="small" type="info" @click="showPopover = false">
+              取消
+            </el-button>
+            <el-button size="small" type="primary" @click="confirm">
+              确定
+            </el-button>
+          </div>
+          <template #reference>
+            <icon-button v-if="proxy.hasPerm('/schedule/orderList/add')" icon="icon-add" title="新建" type="primary" @click="showPopover = true" />
+          </template>
+        </el-popover>
         <icon-button v-if="proxy.hasPerm('/schedule/orderList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/schedule/orderList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>

diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 841e0cb..d4d60fe 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -47,7 +47,7 @@
         show: true,
         icon: 'circle',
         orient: 'vertile', // 图例方向
-        align: 'left', // 图例标记和文本的对齐，默认自动
+        align: 'center', // 图例标记和文本的对齐，默认自动
         top: 5,
         right: 20,
         itemWidth: 12,
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
index 4e6da78..8ca8f47 100644
--- a/src/views/business/fieldTest/components/selectStaffList.vue
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -1,6 +1,6 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="SelectStaffListDialog">
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import { getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -55,6 +55,7 @@
 }
 // 获取数据列表
 const fetchData = () => {
+  loadingTable.value = true
   select.value = -1
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
@@ -67,6 +68,7 @@
       })
       total.value = parseInt(res.data.total)
     }
+    loadingTable.value = false
   })
 }
 // 搜索
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 43ba781..edf8c48 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -340,6 +340,7 @@
     })
   }
 }
+
 // 打印列表
 function printList() {
   // 打印列
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 729f2b4..bb4d128 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -13,6 +13,7 @@
 import { getUid } from '@/utils/getUid'
 import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
 import { addOrder, getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
@@ -20,10 +21,12 @@
 const visible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const ruleFormRef = ref()
+const orderType = ref('') // 委托书类型 1检测委托单、2检定或校准委托单
 // 表单
 const dataForm: Ref<IOrderDetail> = ref({
   id: '',
   orderCode: '', // 委托书编号
+  postalCode: '', // 委托方邮编
   orderId: '', // 委托书编号
   deliverer: '', // 送检人
   delivererTel: '', // 送样人联系方式
@@ -41,7 +44,17 @@
   certifications: '', // 证书类别
   certificationCompany: '', // 证书单位名称
   certificationCompanyAddress: '', // 证书单位地址
+
+  needContact: '1', // 需联络后再做退件处理1、直接退件处理2
+  receivePersonNo: '', // 收件人工号
+  receivePersonName: '', // 收件人名称
+  receiveDate: '', // 收件日期
+  director: '', // 联系人
+  mobile: '', // 移动电话
+  email: '', // 电子邮件或qq
+  fpdwmc: '', // 发票单位名称
 })
+const checkCertificateList = ref([]) // 对证书要求
 const scanSampleRef = ref() // 标签绑定弹窗ref
 const certificationsMap = ref<dictType[]>([]) // 证书类别
 const powerVoltageMap = ref<dictType[]>([]) // 电源电压
@@ -52,17 +65,31 @@
 const list = ref<ISampleList[]>([])// 表格数据
 // 选中的内容
 const checkoutList = ref([])
+const columns = ref([]) as any
 // 表头
-const columns = ref([
-  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true },
-  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
-  { text: '型号', value: 'sampleModel', align: 'center', required: true },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
-  { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '样品状态', value: 'sampleStatusName', align: 'center' },
-  { text: '附件说明', value: 'appendixDescn', align: 'center', width: '180' },
-  // { text: '备注', value: 'remark', align: 'center' },
-  { text: '校准/检测项目', value: 'measureContent', align: 'center', required: true, width: '180' },
+const columnsMeasure = ref([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { 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: 'powerVoltage', align: 'center', required: true },
+  { text: '外观状态', value: 'wgzt', 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: 'remark', align: 'center', required: false },
+
+])
+// 表头
+const columnsCalibration = ref([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { 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: 'remark', align: 'center', required: false },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -81,7 +108,7 @@
   delivererTel: [{ required: true, message: '要求送样人联系方式必填', trigger: 'blur' }],
   customerNo: [{ required: true, message: '要求委托方代码必填', trigger: 'change' }],
   customerName: [{ required: true, message: '要求委托方名称必填', trigger: 'change' }],
-  phone: [{ required: true, message: '要求委托方电话必填', trigger: 'change' }],
+  // phone: [{ required: true, message: '要求委托方电话必填', trigger: 'change' }],
   customerAddress: [{ required: true, message: '要求委托方地址必填', trigger: 'change' }],
   orderTime: [{ type: 'date', required: true, message: '要求委托日期必填', trigger: 'change' }],
   planDeliverTime: [{ type: 'date', required: true, message: '要求预计送达时间必填', trigger: 'change' }],
@@ -90,6 +117,12 @@
   isUrgent: [{ required: true, message: '要求是否加急必填', trigger: 'change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称必填', trigger: 'blur' }],
   certificationCompanyAddress: [{ required: true, message: '要求证书单位地址必填', trigger: 'blur' }],
+
+  director: [{ required: true, message: '联系人必填', trigger: 'blur' }],
+  mobile: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
+  phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
+  email: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
+  fpdwmc: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
 }) // 表单验证规则
 
 // 从路由中获取页面类型参数
@@ -201,6 +234,13 @@
     dataForm.value.customerName = val[0].customerName // 委托方名称
     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.email = val[0].email // 电子邮件或qq
+    dataForm.value.postalCode = val[0].postalCode // 邮编
+    dataForm.value.certificationCompany = val[0].customerName // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].fullAddress // 证书单位地址
   }
 }
 
@@ -237,7 +277,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.powerVoltage || !item.measureContent)
+  const index = list.value.findIndex(item => !item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.wgzt)
   if (index !== -1) {
     return index + 1
   }
@@ -440,10 +480,31 @@
   })
 }
 
+// ---------------------------------------收件人-------------------------------------------------
+const merterPersonRef = ref() // 计量人员Ref
+// 点击选择
+const selectReceivePerson = () => {
+  merterPersonRef.value.initDialog()
+}
+// 选完计量人员
+const confirmSelectPerson = (val: any) => {
+  dataForm.value.receivePersonNo = val[0].staffNo// 收件人工号
+  dataForm.value.receivePersonName = val[0].name// 收件人名称
+}
+// -----------------------------------------------------------------------------------------------
+watch(() => orderType.value, (newValue) => {
+  if (newValue === 'measure') {
+    columns.value = columnsMeasure.value
+  }
+  else {
+    columns.value = columnsCalibration.value
+  }
+}, { immediate: true })
 onMounted(async () => {
   await getDict()
   // 非添加页面获取详情
   if (pageType.value !== 'add') {
+    orderType.value = $route.query.orderType as string // 委托书类型 1检测委托单、2检定或校准委托单
     getInfo()
   }
 })
@@ -483,78 +544,17 @@
                 <el-form-item label="委托书编号:" prop="orderCode">
                   <el-input
                     v-model="dataForm.orderCode"
-                    :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                    :placeholder="pageType === 'detail' ? ' ' : '系统自动生成'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="送样人:" prop="deliverer">
-                  <el-input
-                    v-model="dataForm.deliverer"
-                    :placeholder="pageType === 'detail' ? '' : '请输入送样人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail' || isReceived"
-                  />
-                </el-form-item>
-              </el-col><el-col :span="8">
-                <el-form-item label="联系方式:" prop="delivererTel">
-                  <el-input
-                    v-model="dataForm.delivererTel"
-                    :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail' || isReceived"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="委托日期:" prop="orderTime">
-                  <el-date-picker
-                    v-model="dataForm.orderTime"
-                    type="date"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail' || isReceived"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="预计送达时间:" prop="planDeliverTime">
-                  <el-date-picker
-                    v-model="dataForm.planDeliverTime"
-                    type="datetime"
-                    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"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="要求检完时间:" prop="requireOverTime">
-                  <el-date-picker
-                    v-model="dataForm.requireOverTime"
-                    type="datetime"
-                    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"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
                 <el-form-item label="委托方代码" prop="customerNo">
                   <el-input
                     v-model="dataForm.customerNo"
-                    :placeholder="pageType === 'detail' ? '' : '请选择'"
+                    :placeholder="pageType === 'detail' ? ' ' : '请选择'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   >
@@ -570,17 +570,17 @@
                 <el-form-item label="委托方名称" prop="customerName">
                   <el-input
                     v-model="dataForm.customerName"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                    :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="委托方电话">
+                <el-form-item label="邮政编码" prop="postalCode">
                   <el-input
-                    v-model="dataForm.phone"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                    v-model="dataForm.postalCode"
+                    :placeholder="pageType === 'detail' ? ' ' : '邮政编码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
@@ -598,8 +598,84 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="联系人:" prop="director">
+                  <el-input
+                    v-model="dataForm.director"
+                    :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="固定电话:" prop="phone">
+                  <el-input
+                    v-model="dataForm.phone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入固定电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="移动电话:" prop="mobile">
+                  <el-input
+                    v-model="dataForm.mobile"
+                    :placeholder="pageType === 'detail' ? '' : '请输入移动电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="电子邮件/QQ:" prop="email">
+                  <el-input
+                    v-model="dataForm.email"
+                    :placeholder="pageType === 'detail' ? '' : '请输入电子邮件/QQ'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="预约送达时间:" prop="planDeliverTime">
+                  <el-date-picker
+                    v-model="dataForm.planDeliverTime"
+                    type="datetime"
+                    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"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="预约取样时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    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"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="发票单位名称:" prop="fpdwmc">
+                  <el-input
+                    v-model="dataForm.fpdwmc"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                    :placeholder="pageType === 'detail' ? '' : '请输入发票单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="8">
                 <el-form-item label="证书单位名称:" prop="certificationCompany">
                   <el-input
@@ -610,18 +686,6 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="证书类别:" prop="certifications">
-                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail' || isReceived" class="full-width-input">
-                    <el-option
-                      v-for="i in certificationsMap"
-                      :key="i.value"
-                      :label="i.name"
-                      :value="i.value"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
               <el-col :span="16">
                 <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
                   <el-input
@@ -634,6 +698,130 @@
                   />
                 </el-form-item>
               </el-col>
+              <!-- <el-col :span="8">
+                <el-form-item label="送样人:" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送样人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col> -->
+              <!-- <el-col :span="8">
+                <el-form-item label="联系方式:" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col> -->
+
+              <!-- <el-col :span="8">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col> -->
+            </el-row>
+            <el-row :gutter="24">
+              <el-form-item label="说明:">
+                <el-col :span="24" style="display: flex;align-items: center;">
+                  <!-- <span style="font-weight: 600;font-size: 13px;">说明</span> -->
+                  <span style="font-size: 13px;margin-right: 60px;">1.如仪器出现故障或不合格</span>
+                  <el-radio-group v-model="dataForm.needContact" :disabled="pageType === 'detail' || isReceived">
+                    <el-radio label="1">
+                      需联络后再做退件处理
+                    </el-radio>
+                    <el-radio label="2">
+                      直接退件处理
+                    </el-radio>
+                  </el-radio-group>
+                </el-col>
+              </el-form-item>
+            </el-row>
+            <el-row :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 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-input
+                    v-model.trim="dataForm.receivePersonNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择收件人工号'"
+                    disabled
+                    class="full-width-input"
+                    clearable
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button
+                        size="small"
+                        @click="selectReceivePerson"
+                      >
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="收件人姓名:" prop="receivePersonName">
+                  <el-input
+                    v-model.trim="dataForm.receivePersonName"
+                    :placeholder="pageType === 'detail' ? '' : '请输入收件人姓名'"
+                    disabled
+                    class="full-width-input"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="收件日期:" prop="receiveDate">
+                  <el-date-picker
+                    v-model="dataForm.receiveDate"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择收件日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <!-- <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="证书类别:" prop="certifications">
+                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail' || isReceived" class="full-width-input">
+                    <el-option
+                      v-for="i in certificationsMap"
+                      :key="i.value"
+                      :label="i.name"
+                      :value="i.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
 
               <el-col :span="8">
                 <el-form-item label="是否加急:" prop="isUrgent">
@@ -647,8 +835,8 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24" class="marg">
+            </el-row> -->
+            <!-- <el-row :gutter="24" class="marg">
               <el-col :span="16">
                 <el-form-item label="备注:">
                   <el-input
@@ -661,9 +849,9 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
 
-            <el-row :gutter="24" class="marg">
+            <!-- <el-row :gutter="24" class="marg">
               <el-col :span="16">
                 <el-form-item label="附件:">
                   <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
@@ -674,7 +862,7 @@
                   </el-button>
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
           </el-form>
           <div style="color: red;font-size: 13px;">
             *本委托单一式两份 双方各执一份
@@ -730,7 +918,7 @@
               />
               <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
               <el-input
-                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark')"
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark' || item.value === 'wgzt' || item.value === 'zsyq' || item.value === 'khtsyq')"
                 v-model="scope.row[item.value]"
                 type="textarea"
                 autosize
@@ -782,6 +970,8 @@
     <!-- 选择样品组件 -->
     <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" :customer-id="dataForm.customerId" :order-id="infoId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <scan-sample-dialog ref="scanSampleRef" title="扫描添加样品" @confirm="scanOver" />
+    <!-- 选择计量人员组件列表 -->
+    <select-staff-list ref="merterPersonRef" :is-multi-merter-person="false" @add="confirmSelectPerson" />
   </app-container>
 </template>
 
@@ -886,3 +1076,9 @@
 }
 </style>
 
+<style lang="scss">
+.el-radio__label {
+  display: block !important;
+}
+</style>
+
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 2294b88..570b074 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -34,15 +34,21 @@
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const statusMap = ref<dictType[]>([]) // 接收状态
 const backReasonDialogRef = ref() // 退回弹出框ref
+// const orderType = ref(false) // 委托书类型 1检测委托单、2检定或校准委托单
+const measureType = ref(true) // 委托书类型 1检测委托单
+const correctType = ref(false) // 委托书类型 检定或校准委托单
+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: 'customerNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '送样人', value: 'deliverer', align: 'center' },
-  { text: '联系方式', value: 'customerPhone', align: 'center' },
+  // { text: '送样人', value: 'deliverer', align: 'center' },
+  { text: '联系人', value: 'deliverer', align: 'center' },
+  // { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100px', styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
+  // { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100px', styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '100px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   // { text: '备注', value: 'remark', align: 'center' },
@@ -281,6 +287,23 @@
   })
 }
 
+// ----------------------------------------popover-------------------------------------------
+// 点击确定
+const confirm = () => {
+  $router.push({
+    path: '/schedule/order/add',
+    query: {
+      orderType: measureType.value ? 'measure' : 'calibration', // 委托书类型 1检测委托单、2检定或校准委托单
+    },
+  })
+}
+// ------------------------------------------------------------------------------------------
+watch(() => measureType.value, (newValue) => {
+  correctType.value = !newValue
+})
+watch(() => correctType.value, (newValue) => {
+  measureType.value = !newValue
+})
 fetchData(true)
 </script>
 
@@ -301,7 +324,7 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.customerNo"
-          placeholder="委托方代码"
+          placeholder="委托方代码/名称"
           class="short-input"
           clearable
         />
@@ -339,7 +362,30 @@
       <template #btns-right>
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/orderList/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" /> -->
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/orderList/import')" icon="icon-template" title="模板下载" type="primary" @click="templateDownload" /> -->
-        <icon-button v-if="proxy.hasPerm('/schedule/orderList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <el-popover
+          v-if="proxy.hasPerm('/schedule/orderList/add')"
+          :visible="showPopover"
+          trigger="click"
+          width="200"
+        >
+          <el-checkbox v-model="measureType">
+            检测委托单
+          </el-checkbox>
+          <el-checkbox v-model="correctType">
+            检定或校准委托单
+          </el-checkbox>
+          <div style="text-align: right; margin: 0;margin-top: 16px;">
+            <el-button size="small" type="info" @click="showPopover = false">
+              取消
+            </el-button>
+            <el-button size="small" type="primary" @click="confirm">
+              确定
+            </el-button>
+          </div>
+          <template #reference>
+            <icon-button v-if="proxy.hasPerm('/schedule/orderList/add')" icon="icon-add" title="新建" type="primary" @click="showPopover = true" />
+          </template>
+        </el-popover>
         <icon-button v-if="proxy.hasPerm('/schedule/orderList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/schedule/orderList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 67b80ae..fdc089d 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -38,6 +38,7 @@
 export interface IOrderDetail {
   id?: string
   orderCode: string // 委托书编号
+  postalCode: string // 委托方邮编
   orderId?: string // 委托书id
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
@@ -55,6 +56,15 @@
   certifications: string // 证书类别
   certificationCompany: string // 证书单位名称
   certificationCompanyAddress: string // 证书单位地址
+
+  needContact: string // 需联络后再做退件处理1、直接退件处理2
+  receivePersonNo: string // 收件人工号
+  receivePersonName: string // 收件人名称
+  receiveDate: string // 收件日期
+  director: string // 联系人
+  mobile: string // 移动电话
+  email: string // 电子邮件或qq
+  fpdwmc: string // 发票单位名称
 }
 
 // 样品清单

diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 841e0cb..d4d60fe 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -47,7 +47,7 @@
         show: true,
         icon: 'circle',
         orient: 'vertile', // 图例方向
-        align: 'left', // 图例标记和文本的对齐，默认自动
+        align: 'center', // 图例标记和文本的对齐，默认自动
         top: 5,
         right: 20,
         itemWidth: 12,
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
index 4e6da78..8ca8f47 100644
--- a/src/views/business/fieldTest/components/selectStaffList.vue
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -1,6 +1,6 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="SelectStaffListDialog">
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import { getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -55,6 +55,7 @@
 }
 // 获取数据列表
 const fetchData = () => {
+  loadingTable.value = true
   select.value = -1
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
@@ -67,6 +68,7 @@
       })
       total.value = parseInt(res.data.total)
     }
+    loadingTable.value = false
   })
 }
 // 搜索
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 43ba781..edf8c48 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -340,6 +340,7 @@
     })
   }
 }
+
 // 打印列表
 function printList() {
   // 打印列
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 729f2b4..bb4d128 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -13,6 +13,7 @@
 import { getUid } from '@/utils/getUid'
 import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
 import { addOrder, getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
@@ -20,10 +21,12 @@
 const visible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const ruleFormRef = ref()
+const orderType = ref('') // 委托书类型 1检测委托单、2检定或校准委托单
 // 表单
 const dataForm: Ref<IOrderDetail> = ref({
   id: '',
   orderCode: '', // 委托书编号
+  postalCode: '', // 委托方邮编
   orderId: '', // 委托书编号
   deliverer: '', // 送检人
   delivererTel: '', // 送样人联系方式
@@ -41,7 +44,17 @@
   certifications: '', // 证书类别
   certificationCompany: '', // 证书单位名称
   certificationCompanyAddress: '', // 证书单位地址
+
+  needContact: '1', // 需联络后再做退件处理1、直接退件处理2
+  receivePersonNo: '', // 收件人工号
+  receivePersonName: '', // 收件人名称
+  receiveDate: '', // 收件日期
+  director: '', // 联系人
+  mobile: '', // 移动电话
+  email: '', // 电子邮件或qq
+  fpdwmc: '', // 发票单位名称
 })
+const checkCertificateList = ref([]) // 对证书要求
 const scanSampleRef = ref() // 标签绑定弹窗ref
 const certificationsMap = ref<dictType[]>([]) // 证书类别
 const powerVoltageMap = ref<dictType[]>([]) // 电源电压
@@ -52,17 +65,31 @@
 const list = ref<ISampleList[]>([])// 表格数据
 // 选中的内容
 const checkoutList = ref([])
+const columns = ref([]) as any
 // 表头
-const columns = ref([
-  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true },
-  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
-  { text: '型号', value: 'sampleModel', align: 'center', required: true },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
-  { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '样品状态', value: 'sampleStatusName', align: 'center' },
-  { text: '附件说明', value: 'appendixDescn', align: 'center', width: '180' },
-  // { text: '备注', value: 'remark', align: 'center' },
-  { text: '校准/检测项目', value: 'measureContent', align: 'center', required: true, width: '180' },
+const columnsMeasure = ref([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { 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: 'powerVoltage', align: 'center', required: true },
+  { text: '外观状态', value: 'wgzt', 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: 'remark', align: 'center', required: false },
+
+])
+// 表头
+const columnsCalibration = ref([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { 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: 'remark', align: 'center', required: false },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -81,7 +108,7 @@
   delivererTel: [{ required: true, message: '要求送样人联系方式必填', trigger: 'blur' }],
   customerNo: [{ required: true, message: '要求委托方代码必填', trigger: 'change' }],
   customerName: [{ required: true, message: '要求委托方名称必填', trigger: 'change' }],
-  phone: [{ required: true, message: '要求委托方电话必填', trigger: 'change' }],
+  // phone: [{ required: true, message: '要求委托方电话必填', trigger: 'change' }],
   customerAddress: [{ required: true, message: '要求委托方地址必填', trigger: 'change' }],
   orderTime: [{ type: 'date', required: true, message: '要求委托日期必填', trigger: 'change' }],
   planDeliverTime: [{ type: 'date', required: true, message: '要求预计送达时间必填', trigger: 'change' }],
@@ -90,6 +117,12 @@
   isUrgent: [{ required: true, message: '要求是否加急必填', trigger: 'change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称必填', trigger: 'blur' }],
   certificationCompanyAddress: [{ required: true, message: '要求证书单位地址必填', trigger: 'blur' }],
+
+  director: [{ required: true, message: '联系人必填', trigger: 'blur' }],
+  mobile: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
+  phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
+  email: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
+  fpdwmc: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
 }) // 表单验证规则
 
 // 从路由中获取页面类型参数
@@ -201,6 +234,13 @@
     dataForm.value.customerName = val[0].customerName // 委托方名称
     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.email = val[0].email // 电子邮件或qq
+    dataForm.value.postalCode = val[0].postalCode // 邮编
+    dataForm.value.certificationCompany = val[0].customerName // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].fullAddress // 证书单位地址
   }
 }
 
@@ -237,7 +277,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.powerVoltage || !item.measureContent)
+  const index = list.value.findIndex(item => !item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.wgzt)
   if (index !== -1) {
     return index + 1
   }
@@ -440,10 +480,31 @@
   })
 }
 
+// ---------------------------------------收件人-------------------------------------------------
+const merterPersonRef = ref() // 计量人员Ref
+// 点击选择
+const selectReceivePerson = () => {
+  merterPersonRef.value.initDialog()
+}
+// 选完计量人员
+const confirmSelectPerson = (val: any) => {
+  dataForm.value.receivePersonNo = val[0].staffNo// 收件人工号
+  dataForm.value.receivePersonName = val[0].name// 收件人名称
+}
+// -----------------------------------------------------------------------------------------------
+watch(() => orderType.value, (newValue) => {
+  if (newValue === 'measure') {
+    columns.value = columnsMeasure.value
+  }
+  else {
+    columns.value = columnsCalibration.value
+  }
+}, { immediate: true })
 onMounted(async () => {
   await getDict()
   // 非添加页面获取详情
   if (pageType.value !== 'add') {
+    orderType.value = $route.query.orderType as string // 委托书类型 1检测委托单、2检定或校准委托单
     getInfo()
   }
 })
@@ -483,78 +544,17 @@
                 <el-form-item label="委托书编号:" prop="orderCode">
                   <el-input
                     v-model="dataForm.orderCode"
-                    :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                    :placeholder="pageType === 'detail' ? ' ' : '系统自动生成'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="送样人:" prop="deliverer">
-                  <el-input
-                    v-model="dataForm.deliverer"
-                    :placeholder="pageType === 'detail' ? '' : '请输入送样人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail' || isReceived"
-                  />
-                </el-form-item>
-              </el-col><el-col :span="8">
-                <el-form-item label="联系方式:" prop="delivererTel">
-                  <el-input
-                    v-model="dataForm.delivererTel"
-                    :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail' || isReceived"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="委托日期:" prop="orderTime">
-                  <el-date-picker
-                    v-model="dataForm.orderTime"
-                    type="date"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail' || isReceived"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="预计送达时间:" prop="planDeliverTime">
-                  <el-date-picker
-                    v-model="dataForm.planDeliverTime"
-                    type="datetime"
-                    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"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="要求检完时间:" prop="requireOverTime">
-                  <el-date-picker
-                    v-model="dataForm.requireOverTime"
-                    type="datetime"
-                    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"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
                 <el-form-item label="委托方代码" prop="customerNo">
                   <el-input
                     v-model="dataForm.customerNo"
-                    :placeholder="pageType === 'detail' ? '' : '请选择'"
+                    :placeholder="pageType === 'detail' ? ' ' : '请选择'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   >
@@ -570,17 +570,17 @@
                 <el-form-item label="委托方名称" prop="customerName">
                   <el-input
                     v-model="dataForm.customerName"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                    :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="委托方电话">
+                <el-form-item label="邮政编码" prop="postalCode">
                   <el-input
-                    v-model="dataForm.phone"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                    v-model="dataForm.postalCode"
+                    :placeholder="pageType === 'detail' ? ' ' : '邮政编码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
@@ -598,8 +598,84 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="联系人:" prop="director">
+                  <el-input
+                    v-model="dataForm.director"
+                    :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="固定电话:" prop="phone">
+                  <el-input
+                    v-model="dataForm.phone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入固定电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="移动电话:" prop="mobile">
+                  <el-input
+                    v-model="dataForm.mobile"
+                    :placeholder="pageType === 'detail' ? '' : '请输入移动电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="电子邮件/QQ:" prop="email">
+                  <el-input
+                    v-model="dataForm.email"
+                    :placeholder="pageType === 'detail' ? '' : '请输入电子邮件/QQ'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="预约送达时间:" prop="planDeliverTime">
+                  <el-date-picker
+                    v-model="dataForm.planDeliverTime"
+                    type="datetime"
+                    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"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="预约取样时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    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"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="发票单位名称:" prop="fpdwmc">
+                  <el-input
+                    v-model="dataForm.fpdwmc"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                    :placeholder="pageType === 'detail' ? '' : '请输入发票单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="8">
                 <el-form-item label="证书单位名称:" prop="certificationCompany">
                   <el-input
@@ -610,18 +686,6 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="证书类别:" prop="certifications">
-                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail' || isReceived" class="full-width-input">
-                    <el-option
-                      v-for="i in certificationsMap"
-                      :key="i.value"
-                      :label="i.name"
-                      :value="i.value"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
               <el-col :span="16">
                 <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
                   <el-input
@@ -634,6 +698,130 @@
                   />
                 </el-form-item>
               </el-col>
+              <!-- <el-col :span="8">
+                <el-form-item label="送样人:" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送样人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col> -->
+              <!-- <el-col :span="8">
+                <el-form-item label="联系方式:" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col> -->
+
+              <!-- <el-col :span="8">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col> -->
+            </el-row>
+            <el-row :gutter="24">
+              <el-form-item label="说明:">
+                <el-col :span="24" style="display: flex;align-items: center;">
+                  <!-- <span style="font-weight: 600;font-size: 13px;">说明</span> -->
+                  <span style="font-size: 13px;margin-right: 60px;">1.如仪器出现故障或不合格</span>
+                  <el-radio-group v-model="dataForm.needContact" :disabled="pageType === 'detail' || isReceived">
+                    <el-radio label="1">
+                      需联络后再做退件处理
+                    </el-radio>
+                    <el-radio label="2">
+                      直接退件处理
+                    </el-radio>
+                  </el-radio-group>
+                </el-col>
+              </el-form-item>
+            </el-row>
+            <el-row :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 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-input
+                    v-model.trim="dataForm.receivePersonNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择收件人工号'"
+                    disabled
+                    class="full-width-input"
+                    clearable
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button
+                        size="small"
+                        @click="selectReceivePerson"
+                      >
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="收件人姓名:" prop="receivePersonName">
+                  <el-input
+                    v-model.trim="dataForm.receivePersonName"
+                    :placeholder="pageType === 'detail' ? '' : '请输入收件人姓名'"
+                    disabled
+                    class="full-width-input"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="收件日期:" prop="receiveDate">
+                  <el-date-picker
+                    v-model="dataForm.receiveDate"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择收件日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <!-- <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="证书类别:" prop="certifications">
+                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail' || isReceived" class="full-width-input">
+                    <el-option
+                      v-for="i in certificationsMap"
+                      :key="i.value"
+                      :label="i.name"
+                      :value="i.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
 
               <el-col :span="8">
                 <el-form-item label="是否加急:" prop="isUrgent">
@@ -647,8 +835,8 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24" class="marg">
+            </el-row> -->
+            <!-- <el-row :gutter="24" class="marg">
               <el-col :span="16">
                 <el-form-item label="备注:">
                   <el-input
@@ -661,9 +849,9 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
 
-            <el-row :gutter="24" class="marg">
+            <!-- <el-row :gutter="24" class="marg">
               <el-col :span="16">
                 <el-form-item label="附件:">
                   <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
@@ -674,7 +862,7 @@
                   </el-button>
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
           </el-form>
           <div style="color: red;font-size: 13px;">
             *本委托单一式两份 双方各执一份
@@ -730,7 +918,7 @@
               />
               <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
               <el-input
-                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark')"
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark' || item.value === 'wgzt' || item.value === 'zsyq' || item.value === 'khtsyq')"
                 v-model="scope.row[item.value]"
                 type="textarea"
                 autosize
@@ -782,6 +970,8 @@
     <!-- 选择样品组件 -->
     <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" :customer-id="dataForm.customerId" :order-id="infoId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <scan-sample-dialog ref="scanSampleRef" title="扫描添加样品" @confirm="scanOver" />
+    <!-- 选择计量人员组件列表 -->
+    <select-staff-list ref="merterPersonRef" :is-multi-merter-person="false" @add="confirmSelectPerson" />
   </app-container>
 </template>
 
@@ -886,3 +1076,9 @@
 }
 </style>
 
+<style lang="scss">
+.el-radio__label {
+  display: block !important;
+}
+</style>
+
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 2294b88..570b074 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -34,15 +34,21 @@
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const statusMap = ref<dictType[]>([]) // 接收状态
 const backReasonDialogRef = ref() // 退回弹出框ref
+// const orderType = ref(false) // 委托书类型 1检测委托单、2检定或校准委托单
+const measureType = ref(true) // 委托书类型 1检测委托单
+const correctType = ref(false) // 委托书类型 检定或校准委托单
+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: 'customerNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '送样人', value: 'deliverer', align: 'center' },
-  { text: '联系方式', value: 'customerPhone', align: 'center' },
+  // { text: '送样人', value: 'deliverer', align: 'center' },
+  { text: '联系人', value: 'deliverer', align: 'center' },
+  // { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100px', styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
+  // { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100px', styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '100px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   // { text: '备注', value: 'remark', align: 'center' },
@@ -281,6 +287,23 @@
   })
 }
 
+// ----------------------------------------popover-------------------------------------------
+// 点击确定
+const confirm = () => {
+  $router.push({
+    path: '/schedule/order/add',
+    query: {
+      orderType: measureType.value ? 'measure' : 'calibration', // 委托书类型 1检测委托单、2检定或校准委托单
+    },
+  })
+}
+// ------------------------------------------------------------------------------------------
+watch(() => measureType.value, (newValue) => {
+  correctType.value = !newValue
+})
+watch(() => correctType.value, (newValue) => {
+  measureType.value = !newValue
+})
 fetchData(true)
 </script>
 
@@ -301,7 +324,7 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.customerNo"
-          placeholder="委托方代码"
+          placeholder="委托方代码/名称"
           class="short-input"
           clearable
         />
@@ -339,7 +362,30 @@
       <template #btns-right>
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/orderList/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" /> -->
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/orderList/import')" icon="icon-template" title="模板下载" type="primary" @click="templateDownload" /> -->
-        <icon-button v-if="proxy.hasPerm('/schedule/orderList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <el-popover
+          v-if="proxy.hasPerm('/schedule/orderList/add')"
+          :visible="showPopover"
+          trigger="click"
+          width="200"
+        >
+          <el-checkbox v-model="measureType">
+            检测委托单
+          </el-checkbox>
+          <el-checkbox v-model="correctType">
+            检定或校准委托单
+          </el-checkbox>
+          <div style="text-align: right; margin: 0;margin-top: 16px;">
+            <el-button size="small" type="info" @click="showPopover = false">
+              取消
+            </el-button>
+            <el-button size="small" type="primary" @click="confirm">
+              确定
+            </el-button>
+          </div>
+          <template #reference>
+            <icon-button v-if="proxy.hasPerm('/schedule/orderList/add')" icon="icon-add" title="新建" type="primary" @click="showPopover = true" />
+          </template>
+        </el-popover>
         <icon-button v-if="proxy.hasPerm('/schedule/orderList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/schedule/orderList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 67b80ae..fdc089d 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -38,6 +38,7 @@
 export interface IOrderDetail {
   id?: string
   orderCode: string // 委托书编号
+  postalCode: string // 委托方邮编
   orderId?: string // 委托书id
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
@@ -55,6 +56,15 @@
   certifications: string // 证书类别
   certificationCompany: string // 证书单位名称
   certificationCompanyAddress: string // 证书单位地址
+
+  needContact: string // 需联络后再做退件处理1、直接退件处理2
+  receivePersonNo: string // 收件人工号
+  receivePersonName: string // 收件人名称
+  receiveDate: string // 收件日期
+  director: string // 联系人
+  mobile: string // 移动电话
+  email: string // 电子邮件或qq
+  fpdwmc: string // 发票单位名称
 }
 
 // 样品清单
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 5586702..dcff286 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -70,8 +70,8 @@
   outsourcerNo: [{ required: true, message: '分包方编号必填', trigger: ['blur', 'change'] }],
   // outsourcerName: [{ required: true, message: '要求公司名称必填', trigger: ['blur', 'change'] }],
   outsourceReason: [{ required: true, message: '分包原因必填', trigger: ['blur', 'change'] }],
-  preCost: [{ required: true, message: '预计费用必填', trigger: ['blur', 'change'] },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '预计费用只能为数字', trigger: ['blur', 'change'] }],
+  // preCost: [{ required: true, message: '预计费用必填', trigger: ['blur', 'change'] },
+  //   { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '预计费用只能为数字', trigger: ['blur', 'change'] }],
   preStartTime: [{ required: true, message: '预计开始时间必填', trigger: ['blur', 'change'] }],
   // preEndTime: [{ required: true, message: '预计结束时间必填', trigger: ['blur', 'change'] }],
   preEndTime: [{ required: true, type: 'date', validator: requireOverTimeValid, trigger: 'change' }],

diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 841e0cb..d4d60fe 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -47,7 +47,7 @@
         show: true,
         icon: 'circle',
         orient: 'vertile', // 图例方向
-        align: 'left', // 图例标记和文本的对齐，默认自动
+        align: 'center', // 图例标记和文本的对齐，默认自动
         top: 5,
         right: 20,
         itemWidth: 12,
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
index 4e6da78..8ca8f47 100644
--- a/src/views/business/fieldTest/components/selectStaffList.vue
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -1,6 +1,6 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="SelectStaffListDialog">
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import { getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -55,6 +55,7 @@
 }
 // 获取数据列表
 const fetchData = () => {
+  loadingTable.value = true
   select.value = -1
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
@@ -67,6 +68,7 @@
       })
       total.value = parseInt(res.data.total)
     }
+    loadingTable.value = false
   })
 }
 // 搜索
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 43ba781..edf8c48 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -340,6 +340,7 @@
     })
   }
 }
+
 // 打印列表
 function printList() {
   // 打印列
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 729f2b4..bb4d128 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -13,6 +13,7 @@
 import { getUid } from '@/utils/getUid'
 import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
 import { addOrder, getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
@@ -20,10 +21,12 @@
 const visible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const ruleFormRef = ref()
+const orderType = ref('') // 委托书类型 1检测委托单、2检定或校准委托单
 // 表单
 const dataForm: Ref<IOrderDetail> = ref({
   id: '',
   orderCode: '', // 委托书编号
+  postalCode: '', // 委托方邮编
   orderId: '', // 委托书编号
   deliverer: '', // 送检人
   delivererTel: '', // 送样人联系方式
@@ -41,7 +44,17 @@
   certifications: '', // 证书类别
   certificationCompany: '', // 证书单位名称
   certificationCompanyAddress: '', // 证书单位地址
+
+  needContact: '1', // 需联络后再做退件处理1、直接退件处理2
+  receivePersonNo: '', // 收件人工号
+  receivePersonName: '', // 收件人名称
+  receiveDate: '', // 收件日期
+  director: '', // 联系人
+  mobile: '', // 移动电话
+  email: '', // 电子邮件或qq
+  fpdwmc: '', // 发票单位名称
 })
+const checkCertificateList = ref([]) // 对证书要求
 const scanSampleRef = ref() // 标签绑定弹窗ref
 const certificationsMap = ref<dictType[]>([]) // 证书类别
 const powerVoltageMap = ref<dictType[]>([]) // 电源电压
@@ -52,17 +65,31 @@
 const list = ref<ISampleList[]>([])// 表格数据
 // 选中的内容
 const checkoutList = ref([])
+const columns = ref([]) as any
 // 表头
-const columns = ref([
-  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true },
-  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
-  { text: '型号', value: 'sampleModel', align: 'center', required: true },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
-  { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '样品状态', value: 'sampleStatusName', align: 'center' },
-  { text: '附件说明', value: 'appendixDescn', align: 'center', width: '180' },
-  // { text: '备注', value: 'remark', align: 'center' },
-  { text: '校准/检测项目', value: 'measureContent', align: 'center', required: true, width: '180' },
+const columnsMeasure = ref([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { 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: 'powerVoltage', align: 'center', required: true },
+  { text: '外观状态', value: 'wgzt', 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: 'remark', align: 'center', required: false },
+
+])
+// 表头
+const columnsCalibration = ref([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { 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: 'remark', align: 'center', required: false },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -81,7 +108,7 @@
   delivererTel: [{ required: true, message: '要求送样人联系方式必填', trigger: 'blur' }],
   customerNo: [{ required: true, message: '要求委托方代码必填', trigger: 'change' }],
   customerName: [{ required: true, message: '要求委托方名称必填', trigger: 'change' }],
-  phone: [{ required: true, message: '要求委托方电话必填', trigger: 'change' }],
+  // phone: [{ required: true, message: '要求委托方电话必填', trigger: 'change' }],
   customerAddress: [{ required: true, message: '要求委托方地址必填', trigger: 'change' }],
   orderTime: [{ type: 'date', required: true, message: '要求委托日期必填', trigger: 'change' }],
   planDeliverTime: [{ type: 'date', required: true, message: '要求预计送达时间必填', trigger: 'change' }],
@@ -90,6 +117,12 @@
   isUrgent: [{ required: true, message: '要求是否加急必填', trigger: 'change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称必填', trigger: 'blur' }],
   certificationCompanyAddress: [{ required: true, message: '要求证书单位地址必填', trigger: 'blur' }],
+
+  director: [{ required: true, message: '联系人必填', trigger: 'blur' }],
+  mobile: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
+  phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
+  email: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
+  fpdwmc: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
 }) // 表单验证规则
 
 // 从路由中获取页面类型参数
@@ -201,6 +234,13 @@
     dataForm.value.customerName = val[0].customerName // 委托方名称
     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.email = val[0].email // 电子邮件或qq
+    dataForm.value.postalCode = val[0].postalCode // 邮编
+    dataForm.value.certificationCompany = val[0].customerName // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].fullAddress // 证书单位地址
   }
 }
 
@@ -237,7 +277,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.powerVoltage || !item.measureContent)
+  const index = list.value.findIndex(item => !item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.wgzt)
   if (index !== -1) {
     return index + 1
   }
@@ -440,10 +480,31 @@
   })
 }
 
+// ---------------------------------------收件人-------------------------------------------------
+const merterPersonRef = ref() // 计量人员Ref
+// 点击选择
+const selectReceivePerson = () => {
+  merterPersonRef.value.initDialog()
+}
+// 选完计量人员
+const confirmSelectPerson = (val: any) => {
+  dataForm.value.receivePersonNo = val[0].staffNo// 收件人工号
+  dataForm.value.receivePersonName = val[0].name// 收件人名称
+}
+// -----------------------------------------------------------------------------------------------
+watch(() => orderType.value, (newValue) => {
+  if (newValue === 'measure') {
+    columns.value = columnsMeasure.value
+  }
+  else {
+    columns.value = columnsCalibration.value
+  }
+}, { immediate: true })
 onMounted(async () => {
   await getDict()
   // 非添加页面获取详情
   if (pageType.value !== 'add') {
+    orderType.value = $route.query.orderType as string // 委托书类型 1检测委托单、2检定或校准委托单
     getInfo()
   }
 })
@@ -483,78 +544,17 @@
                 <el-form-item label="委托书编号:" prop="orderCode">
                   <el-input
                     v-model="dataForm.orderCode"
-                    :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                    :placeholder="pageType === 'detail' ? ' ' : '系统自动生成'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="送样人:" prop="deliverer">
-                  <el-input
-                    v-model="dataForm.deliverer"
-                    :placeholder="pageType === 'detail' ? '' : '请输入送样人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail' || isReceived"
-                  />
-                </el-form-item>
-              </el-col><el-col :span="8">
-                <el-form-item label="联系方式:" prop="delivererTel">
-                  <el-input
-                    v-model="dataForm.delivererTel"
-                    :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail' || isReceived"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="委托日期:" prop="orderTime">
-                  <el-date-picker
-                    v-model="dataForm.orderTime"
-                    type="date"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail' || isReceived"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="预计送达时间:" prop="planDeliverTime">
-                  <el-date-picker
-                    v-model="dataForm.planDeliverTime"
-                    type="datetime"
-                    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"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="要求检完时间:" prop="requireOverTime">
-                  <el-date-picker
-                    v-model="dataForm.requireOverTime"
-                    type="datetime"
-                    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"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
                 <el-form-item label="委托方代码" prop="customerNo">
                   <el-input
                     v-model="dataForm.customerNo"
-                    :placeholder="pageType === 'detail' ? '' : '请选择'"
+                    :placeholder="pageType === 'detail' ? ' ' : '请选择'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   >
@@ -570,17 +570,17 @@
                 <el-form-item label="委托方名称" prop="customerName">
                   <el-input
                     v-model="dataForm.customerName"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                    :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="委托方电话">
+                <el-form-item label="邮政编码" prop="postalCode">
                   <el-input
-                    v-model="dataForm.phone"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                    v-model="dataForm.postalCode"
+                    :placeholder="pageType === 'detail' ? ' ' : '邮政编码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   />
@@ -598,8 +598,84 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="联系人:" prop="director">
+                  <el-input
+                    v-model="dataForm.director"
+                    :placeholder="pageType === 'detail' ? '' : '请输入联系人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="固定电话:" prop="phone">
+                  <el-input
+                    v-model="dataForm.phone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入固定电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="移动电话:" prop="mobile">
+                  <el-input
+                    v-model="dataForm.mobile"
+                    :placeholder="pageType === 'detail' ? '' : '请输入移动电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="电子邮件/QQ:" prop="email">
+                  <el-input
+                    v-model="dataForm.email"
+                    :placeholder="pageType === 'detail' ? '' : '请输入电子邮件/QQ'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="预约送达时间:" prop="planDeliverTime">
+                  <el-date-picker
+                    v-model="dataForm.planDeliverTime"
+                    type="datetime"
+                    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"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="预约取样时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    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"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="发票单位名称:" prop="fpdwmc">
+                  <el-input
+                    v-model="dataForm.fpdwmc"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                    :placeholder="pageType === 'detail' ? '' : '请输入发票单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="8">
                 <el-form-item label="证书单位名称:" prop="certificationCompany">
                   <el-input
@@ -610,18 +686,6 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="证书类别:" prop="certifications">
-                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail' || isReceived" class="full-width-input">
-                    <el-option
-                      v-for="i in certificationsMap"
-                      :key="i.value"
-                      :label="i.name"
-                      :value="i.value"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
               <el-col :span="16">
                 <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
                   <el-input
@@ -634,6 +698,130 @@
                   />
                 </el-form-item>
               </el-col>
+              <!-- <el-col :span="8">
+                <el-form-item label="送样人:" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送样人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col> -->
+              <!-- <el-col :span="8">
+                <el-form-item label="联系方式:" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col> -->
+
+              <!-- <el-col :span="8">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col> -->
+            </el-row>
+            <el-row :gutter="24">
+              <el-form-item label="说明:">
+                <el-col :span="24" style="display: flex;align-items: center;">
+                  <!-- <span style="font-weight: 600;font-size: 13px;">说明</span> -->
+                  <span style="font-size: 13px;margin-right: 60px;">1.如仪器出现故障或不合格</span>
+                  <el-radio-group v-model="dataForm.needContact" :disabled="pageType === 'detail' || isReceived">
+                    <el-radio label="1">
+                      需联络后再做退件处理
+                    </el-radio>
+                    <el-radio label="2">
+                      直接退件处理
+                    </el-radio>
+                  </el-radio-group>
+                </el-col>
+              </el-form-item>
+            </el-row>
+            <el-row :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 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-input
+                    v-model.trim="dataForm.receivePersonNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择收件人工号'"
+                    disabled
+                    class="full-width-input"
+                    clearable
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button
+                        size="small"
+                        @click="selectReceivePerson"
+                      >
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="收件人姓名:" prop="receivePersonName">
+                  <el-input
+                    v-model.trim="dataForm.receivePersonName"
+                    :placeholder="pageType === 'detail' ? '' : '请输入收件人姓名'"
+                    disabled
+                    class="full-width-input"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="收件日期:" prop="receiveDate">
+                  <el-date-picker
+                    v-model="dataForm.receiveDate"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择收件日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail' || isReceived"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <!-- <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="证书类别:" prop="certifications">
+                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail' || isReceived" class="full-width-input">
+                    <el-option
+                      v-for="i in certificationsMap"
+                      :key="i.value"
+                      :label="i.name"
+                      :value="i.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
 
               <el-col :span="8">
                 <el-form-item label="是否加急:" prop="isUrgent">
@@ -647,8 +835,8 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24" class="marg">
+            </el-row> -->
+            <!-- <el-row :gutter="24" class="marg">
               <el-col :span="16">
                 <el-form-item label="备注:">
                   <el-input
@@ -661,9 +849,9 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
 
-            <el-row :gutter="24" class="marg">
+            <!-- <el-row :gutter="24" class="marg">
               <el-col :span="16">
                 <el-form-item label="附件:">
                   <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
@@ -674,7 +862,7 @@
                   </el-button>
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
           </el-form>
           <div style="color: red;font-size: 13px;">
             *本委托单一式两份 双方各执一份
@@ -730,7 +918,7 @@
               />
               <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
               <el-input
-                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark')"
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark' || item.value === 'wgzt' || item.value === 'zsyq' || item.value === 'khtsyq')"
                 v-model="scope.row[item.value]"
                 type="textarea"
                 autosize
@@ -782,6 +970,8 @@
     <!-- 选择样品组件 -->
     <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" :customer-id="dataForm.customerId" :order-id="infoId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <scan-sample-dialog ref="scanSampleRef" title="扫描添加样品" @confirm="scanOver" />
+    <!-- 选择计量人员组件列表 -->
+    <select-staff-list ref="merterPersonRef" :is-multi-merter-person="false" @add="confirmSelectPerson" />
   </app-container>
 </template>
 
@@ -886,3 +1076,9 @@
 }
 </style>
 
+<style lang="scss">
+.el-radio__label {
+  display: block !important;
+}
+</style>
+
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 2294b88..570b074 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -34,15 +34,21 @@
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const statusMap = ref<dictType[]>([]) // 接收状态
 const backReasonDialogRef = ref() // 退回弹出框ref
+// const orderType = ref(false) // 委托书类型 1检测委托单、2检定或校准委托单
+const measureType = ref(true) // 委托书类型 1检测委托单
+const correctType = ref(false) // 委托书类型 检定或校准委托单
+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: 'customerNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '送样人', value: 'deliverer', align: 'center' },
-  { text: '联系方式', value: 'customerPhone', align: 'center' },
+  // { text: '送样人', value: 'deliverer', align: 'center' },
+  { text: '联系人', value: 'deliverer', align: 'center' },
+  // { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100px', styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
+  // { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100px', styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '100px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   // { text: '备注', value: 'remark', align: 'center' },
@@ -281,6 +287,23 @@
   })
 }
 
+// ----------------------------------------popover-------------------------------------------
+// 点击确定
+const confirm = () => {
+  $router.push({
+    path: '/schedule/order/add',
+    query: {
+      orderType: measureType.value ? 'measure' : 'calibration', // 委托书类型 1检测委托单、2检定或校准委托单
+    },
+  })
+}
+// ------------------------------------------------------------------------------------------
+watch(() => measureType.value, (newValue) => {
+  correctType.value = !newValue
+})
+watch(() => correctType.value, (newValue) => {
+  measureType.value = !newValue
+})
 fetchData(true)
 </script>
 
@@ -301,7 +324,7 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.customerNo"
-          placeholder="委托方代码"
+          placeholder="委托方代码/名称"
           class="short-input"
           clearable
         />
@@ -339,7 +362,30 @@
       <template #btns-right>
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/orderList/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" /> -->
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/orderList/import')" icon="icon-template" title="模板下载" type="primary" @click="templateDownload" /> -->
-        <icon-button v-if="proxy.hasPerm('/schedule/orderList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <el-popover
+          v-if="proxy.hasPerm('/schedule/orderList/add')"
+          :visible="showPopover"
+          trigger="click"
+          width="200"
+        >
+          <el-checkbox v-model="measureType">
+            检测委托单
+          </el-checkbox>
+          <el-checkbox v-model="correctType">
+            检定或校准委托单
+          </el-checkbox>
+          <div style="text-align: right; margin: 0;margin-top: 16px;">
+            <el-button size="small" type="info" @click="showPopover = false">
+              取消
+            </el-button>
+            <el-button size="small" type="primary" @click="confirm">
+              确定
+            </el-button>
+          </div>
+          <template #reference>
+            <icon-button v-if="proxy.hasPerm('/schedule/orderList/add')" icon="icon-add" title="新建" type="primary" @click="showPopover = true" />
+          </template>
+        </el-popover>
         <icon-button v-if="proxy.hasPerm('/schedule/orderList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/schedule/orderList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 67b80ae..fdc089d 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -38,6 +38,7 @@
 export interface IOrderDetail {
   id?: string
   orderCode: string // 委托书编号
+  postalCode: string // 委托方邮编
   orderId?: string // 委托书id
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
@@ -55,6 +56,15 @@
   certifications: string // 证书类别
   certificationCompany: string // 证书单位名称
   certificationCompanyAddress: string // 证书单位地址
+
+  needContact: string // 需联络后再做退件处理1、直接退件处理2
+  receivePersonNo: string // 收件人工号
+  receivePersonName: string // 收件人名称
+  receiveDate: string // 收件日期
+  director: string // 联系人
+  mobile: string // 移动电话
+  email: string // 电子邮件或qq
+  fpdwmc: string // 发票单位名称
 }
 
 // 样品清单
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 5586702..dcff286 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -70,8 +70,8 @@
   outsourcerNo: [{ required: true, message: '分包方编号必填', trigger: ['blur', 'change'] }],
   // outsourcerName: [{ required: true, message: '要求公司名称必填', trigger: ['blur', 'change'] }],
   outsourceReason: [{ required: true, message: '分包原因必填', trigger: ['blur', 'change'] }],
-  preCost: [{ required: true, message: '预计费用必填', trigger: ['blur', 'change'] },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '预计费用只能为数字', trigger: ['blur', 'change'] }],
+  // preCost: [{ required: true, message: '预计费用必填', trigger: ['blur', 'change'] },
+  //   { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '预计费用只能为数字', trigger: ['blur', 'change'] }],
   preStartTime: [{ required: true, message: '预计开始时间必填', trigger: ['blur', 'change'] }],
   // preEndTime: [{ required: true, message: '预计结束时间必填', trigger: ['blur', 'change'] }],
   preEndTime: [{ required: true, type: 'date', validator: requireOverTimeValid, trigger: 'change' }],
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index e12d03b..9573ffa 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -10,7 +10,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getPhotoUrl } from '@/api/system/tool'
-
+import filePreviewDialog from '@/views/business/schedule/certPrint/components/filePreviewDialog.vue'
 import { exportcertificateList, getcertificateList } from '@/api/business/subpackage/certificate'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
@@ -22,9 +22,11 @@
   printStatus: '', // 打印状态（1已打印、0未打印，不传为查询全部）
   sampleName: '', // 样品名称
   sampleNo: '', // 样品编号
+  manufacturingNo: '', // 出厂编号
   offset: 1,
   limit: 20,
 })
+const printFileName = ref('') // 文件名称
 const printStatusList = [
   {
     name: '未打印',
@@ -46,7 +48,7 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '检测单位', value: 'outsourcerName', align: 'center' },
-  { text: '打印状态', value: 'printStatusName', align: 'center' },
+  // { text: '打印状态', value: 'printStatusName', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
 ])
 const list = ref<IList[]>([]) // 表格数据
@@ -192,6 +194,12 @@
     printPdf(url)
   })
 }
+const filePreviewDialogRef = ref() // 预览弹窗ref
+
+// 查看证书
+const checkCertificate = () => {
+  filePreviewDialogRef.value.initDialog(printFileName.value)
+}
 
 onMounted(async () => {
   fetchData()
@@ -209,8 +217,11 @@
         <search-item>
           <el-input v-model.trim="listQuery.certificateName" placeholder="证书名称" class="short-input" clearable />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-input v-model.trim="listQuery.sampleNo" placeholder="样品编号" class="short-input" clearable />
+        </search-item> -->
+        <search-item>
+          <el-input v-model.trim="listQuery.manufacturingNo" placeholder="出厂编号" class="short-input" clearable />
         </search-item>
         <search-item>
           <el-input v-model.trim="listQuery.sampleName" placeholder="样品名称" class="short-input" clearable />
@@ -249,7 +260,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" fixed="right" width="120">
+            <el-table-column label="操作" align="center" fixed="right" width="160">
               <template #default="{ row }">
                 <el-button size="small" link type="primary" @click="handleDetail(row, 'edit')">
                   编辑
@@ -257,6 +268,9 @@
                 <el-button size="small" link type="primary" @click="handleDetail(row, 'detail')">
                   详情
                 </el-button>
+                <el-button size="small" link type="primary" @click="checkCertificate">
+                  查看证书
+                </el-button>
                 <!-- <el-button size="small" link type="primary" @click="print(row)">
                   打印
                 </el-button> -->
@@ -266,5 +280,6 @@
         </normal-table>
       </table-container>
     </app-container>
+    <file-preview-dialog ref="filePreviewDialogRef" />
   </div>
 </template>