diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index ead208d..cb0fbc2 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
     >
       <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
       <slot name="preColumns" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true">
+      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index ead208d..cb0fbc2 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
     >
       <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
       <slot name="preColumns" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true">
+      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index 1031936..e080e57 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -7,4 +7,5 @@
   showOverflow?: boolean // 是否溢出为省略号
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
+  fixed?: boolean // 固定列
 }

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index ead208d..cb0fbc2 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
     >
       <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
       <slot name="preColumns" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true">
+      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index 1031936..e080e57 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -7,4 +7,5 @@
   showOverflow?: boolean // 是否溢出为省略号
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
+  fixed?: boolean // 固定列
 }
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index be7f8bd..7aea767 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -2,18 +2,17 @@
 <script lang="ts" setup name="InterchangeEdit">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
-import { Calendar, Search } from '@element-plus/icons-vue'
+import { Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
-import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
+import sampleDialog from '@/views/customer/sample/list/selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -151,7 +150,7 @@
 }
 
 // 校验规则
-const rules = ref({
+const rules = reactive<FormRules>({
   sampleName: [{ required: true, message: '样品名称不能为空', trigger: 'blur' }],
   sampleModel: [{ required: true, message: '样品型号不能为空', trigger: 'blur' }],
   manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
@@ -266,7 +265,6 @@
 // 委托方代码获取焦点
 const customerNoFocus = () => {
   visible.value = true
-  console.log(visible.value)
 }
 
 // 选好委托方

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index ead208d..cb0fbc2 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
     >
       <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
       <slot name="preColumns" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true">
+      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index 1031936..e080e57 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -7,4 +7,5 @@
   showOverflow?: boolean // 是否溢出为省略号
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
+  fixed?: boolean // 固定列
 }
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index be7f8bd..7aea767 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -2,18 +2,17 @@
 <script lang="ts" setup name="InterchangeEdit">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
-import { Calendar, Search } from '@element-plus/icons-vue'
+import { Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
-import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
+import sampleDialog from '@/views/customer/sample/list/selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -151,7 +150,7 @@
 }
 
 // 校验规则
-const rules = ref({
+const rules = reactive<FormRules>({
   sampleName: [{ required: true, message: '样品名称不能为空', trigger: 'blur' }],
   sampleModel: [{ required: true, message: '样品型号不能为空', trigger: 'blur' }],
   manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
@@ -266,7 +265,6 @@
 // 委托方代码获取焦点
 const customerNoFocus = () => {
   visible.value = true
-  console.log(visible.value)
 }
 
 // 选好委托方
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index fd09c75..30b2bf4 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -148,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        orderListReceive({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
-            fetchData(true)
-          }
-        })
+        // orderListReceive({ id: row.id }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
       }
       else if (type === 'back') { // 退回
-        orderListBack({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
-            fetchData(true)
-          }
-        })
+        // orderListBack({ id: row.id }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
       }
     })
 }

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index ead208d..cb0fbc2 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
     >
       <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
       <slot name="preColumns" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true">
+      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index 1031936..e080e57 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -7,4 +7,5 @@
   showOverflow?: boolean // 是否溢出为省略号
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
+  fixed?: boolean // 固定列
 }
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index be7f8bd..7aea767 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -2,18 +2,17 @@
 <script lang="ts" setup name="InterchangeEdit">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
-import { Calendar, Search } from '@element-plus/icons-vue'
+import { Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
-import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
+import sampleDialog from '@/views/customer/sample/list/selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -151,7 +150,7 @@
 }
 
 // 校验规则
-const rules = ref({
+const rules = reactive<FormRules>({
   sampleName: [{ required: true, message: '样品名称不能为空', trigger: 'blur' }],
   sampleModel: [{ required: true, message: '样品型号不能为空', trigger: 'blur' }],
   manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
@@ -266,7 +265,6 @@
 // 委托方代码获取焦点
 const customerNoFocus = () => {
   visible.value = true
-  console.log(visible.value)
 }
 
 // 选好委托方
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index fd09c75..30b2bf4 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -148,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        orderListReceive({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
-            fetchData(true)
-          }
-        })
+        // orderListReceive({ id: row.id }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
       }
       else if (type === 'back') { // 退回
-        orderListBack({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
-            fetchData(true)
-          }
-        })
+        // orderListBack({ id: row.id }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
       }
     })
 }
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
index 2e49511..8f13ac5 100644
--- a/src/views/business/schedule/order/orderListEdit.vue
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -1,5 +1,433 @@
 <!-- 委托书详情 -->
 <script lang="ts" setup name="OrderListEdit">
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import type { IOrderDetail, ISampleList } from './orderList_interface'
+import selectSample from './selectSample.vue'
+import { UploadFile } from '@/api/measure/file'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const visible = ref(false) // 控制选择委托方对话框显隐
+const sampleVisible = ref(false) // 控制选择样品对话框显隐
+// 表单
+const dataForm: Ref<IOrderDetail> = ref({
+  id: '',
+  orderCode: '', // 委托书编号
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  planDeliverTime: '', // 预计送达时间
+  requireOverTime: '', // 要求检完时间
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  companyAddress: '', // 委托方地址
+  remark: '', // 备注
+  minioFileName: '', // 附件
+})
+const list = ref<ISampleList[]>([])// 表格数据
+// 电源电压
+const powerVoltageMap = [
+  {
+    label: '220V',
+    value: '220',
+  },
+  {
+    label: '110V',
+    value: '110',
+  },
+]
+// 选中的内容
+const checkoutList = ref([])
+// 表头
+const columns = ref([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true },
+  { text: '样品名称', value: 'sampleName', align: 'center', disabled: false },
+  { text: '型号', value: 'sampleModel', align: 'center', disabled: false },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center', disabled: false },
+  { text: '电源电压', value: 'powerVoltage', align: 'center', disabled: false },
+  { text: '检定项目', value: 'mesureContent', align: 'center', disabled: false },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '附件说明', value: 'appendixState', align: 'center', disabled: false },
+])
+// 校验规则
+const rules = reactive<FormRules>({
+  deliverer: [{ required: true, message: '送样人不能为空', trigger: 'blur' }],
+  delivererTel: [{ required: true, message: '送样人联系方式不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
+  phone: [{ required: true, message: '委托方电话不能为空', trigger: 'blur' }],
+  companyAddress: [{ required: true, message: '委托方地址不能为空', trigger: 'blur' }],
+  orderTime: [{ type: 'date', required: true, message: '委托日期不能为空', trigger: 'change' }],
+  planDeliverTime: [{ type: 'date', required: true, message: '预计送达时间不能为空', trigger: 'change' }],
+  requireOverTime: [{ type: 'date', required: true, message: '要求检完时间不能为空', trigger: 'change' }],
+}) // 表单验证规则
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+
+// 委托方代码获取焦点
+const customerNoFocus = () => {
+  visible.value = true
+}
+
+// 点击从样品库添加
+const multiAdd = () => {
+  sampleVisible.value = true
+}
+
+// 选好委托方
+const confirmCheckout = (val: Array<ICustomer>) => {
+  if (val && val.length) {
+    const getValue = val[0]
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 委托方电话
+    dataForm.value.companyAddress = getValue.briefName // 委托方地址
+  }
+}
+
+// 选择好样品
+const clickConfirmSample = (val: Array<ISampleList>) => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      list.value.push(item)
+    }
+  })
+}
+
+// 控制选择委托方对话框显隐
+const changeVisible = (val: boolean) => {
+  visible.value = val
+}
+
+// 控制选择样品对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+  console.log(e)
+}
+
+// 增加行
+const addRow = () => {
+  list.value.push({
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 样品型号
+    manufacturingNo: '', // 出厂编号
+    powerVoltage: '', // 电源电压
+    appendixState: '', // 附件说明
+    mesureContent: '', // 检定项目
+    remark: '', // 备注
+    isEdit: true, // 是否可编辑
+  })
+}
+
+// 删除行
+const delRow = () => {
+  if (checkoutList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    // --------------------------删除有问题----------------------------
+    checkoutList.value.forEach((item: ISampleList) => {
+      list.value.forEach((element, index) => {
+        if (element.sampleNo === item.sampleNo || !item.sampleNo) {
+          list.value.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
 </script>
 
+<template>
+  <app-container>
+    <detail-page title="检测/校准委托单">
+      <template #btns>
+        <!-- <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button> -->
+        <!-- <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="委托书编号:" prop="orderCode">
+                <el-input
+                  v-model="dataForm.orderCode"
+                  :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'"
+                />
+              </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'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="委托日期:" prop="orderTime">
+                <el-date-picker
+                  v-model="dataForm.orderTime"
+                  type="month"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </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'"
+                  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'"
+                  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' ? '' : '请输入委托方代码'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                  @focus="customerNoFocus"
+                >
+                  <template #suffix>
+                    <el-icon v-if="pageType !== 'detail'" class="el-input__icon">
+                      <search />
+                    </el-icon>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="dataForm.customerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </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
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item label="委托方地址:" prop="companyAddress">
+                <el-input
+                  v-model="dataForm.companyAddress"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="16">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <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" />
+                <span v-else-if="pageType === 'detail'">无</span>
+                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+    <!-- 表格 -->
+    <detail-block title="样品清单">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
+          从样品库中添加
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="list"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        >
+          <template v-if="item.value !== 'powerVoltage' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+            <el-input
+              v-if="scope.row.isEdit"
+              v-model="scope.row[item.value]"
+              :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+              :disabled="item.disabled"
+              class="input"
+            />
+            <span v-else>{{ scope.row[item.value] }}</span>
+          </template>
+          <!-- <template v-if="item.value === 'powerVoltage' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+            <el-select v-if="scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <el-option
+                v-for="i in powerVoltageMap"
+                :key="i.value"
+                :label="i.label"
+                :value="i.value"
+              />
+            </el-select>
+            <span v-else>{{ scope.row[item.value] }}</span>
+          </template> -->
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <!-- 选择委托方组件 -->
+    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+    <!-- 选择样品组件 -->
+    <select-sample v-model:visible="sampleVisible" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index ead208d..cb0fbc2 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
     >
       <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
       <slot name="preColumns" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true">
+      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index 1031936..e080e57 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -7,4 +7,5 @@
   showOverflow?: boolean // 是否溢出为省略号
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
+  fixed?: boolean // 固定列
 }
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index be7f8bd..7aea767 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -2,18 +2,17 @@
 <script lang="ts" setup name="InterchangeEdit">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
-import { Calendar, Search } from '@element-plus/icons-vue'
+import { Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
-import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
+import sampleDialog from '@/views/customer/sample/list/selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -151,7 +150,7 @@
 }
 
 // 校验规则
-const rules = ref({
+const rules = reactive<FormRules>({
   sampleName: [{ required: true, message: '样品名称不能为空', trigger: 'blur' }],
   sampleModel: [{ required: true, message: '样品型号不能为空', trigger: 'blur' }],
   manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
@@ -266,7 +265,6 @@
 // 委托方代码获取焦点
 const customerNoFocus = () => {
   visible.value = true
-  console.log(visible.value)
 }
 
 // 选好委托方
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index fd09c75..30b2bf4 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -148,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        orderListReceive({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
-            fetchData(true)
-          }
-        })
+        // orderListReceive({ id: row.id }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
       }
       else if (type === 'back') { // 退回
-        orderListBack({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
-            fetchData(true)
-          }
-        })
+        // orderListBack({ id: row.id }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
       }
     })
 }
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
index 2e49511..8f13ac5 100644
--- a/src/views/business/schedule/order/orderListEdit.vue
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -1,5 +1,433 @@
 <!-- 委托书详情 -->
 <script lang="ts" setup name="OrderListEdit">
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import type { IOrderDetail, ISampleList } from './orderList_interface'
+import selectSample from './selectSample.vue'
+import { UploadFile } from '@/api/measure/file'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const visible = ref(false) // 控制选择委托方对话框显隐
+const sampleVisible = ref(false) // 控制选择样品对话框显隐
+// 表单
+const dataForm: Ref<IOrderDetail> = ref({
+  id: '',
+  orderCode: '', // 委托书编号
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  planDeliverTime: '', // 预计送达时间
+  requireOverTime: '', // 要求检完时间
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  companyAddress: '', // 委托方地址
+  remark: '', // 备注
+  minioFileName: '', // 附件
+})
+const list = ref<ISampleList[]>([])// 表格数据
+// 电源电压
+const powerVoltageMap = [
+  {
+    label: '220V',
+    value: '220',
+  },
+  {
+    label: '110V',
+    value: '110',
+  },
+]
+// 选中的内容
+const checkoutList = ref([])
+// 表头
+const columns = ref([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true },
+  { text: '样品名称', value: 'sampleName', align: 'center', disabled: false },
+  { text: '型号', value: 'sampleModel', align: 'center', disabled: false },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center', disabled: false },
+  { text: '电源电压', value: 'powerVoltage', align: 'center', disabled: false },
+  { text: '检定项目', value: 'mesureContent', align: 'center', disabled: false },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '附件说明', value: 'appendixState', align: 'center', disabled: false },
+])
+// 校验规则
+const rules = reactive<FormRules>({
+  deliverer: [{ required: true, message: '送样人不能为空', trigger: 'blur' }],
+  delivererTel: [{ required: true, message: '送样人联系方式不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
+  phone: [{ required: true, message: '委托方电话不能为空', trigger: 'blur' }],
+  companyAddress: [{ required: true, message: '委托方地址不能为空', trigger: 'blur' }],
+  orderTime: [{ type: 'date', required: true, message: '委托日期不能为空', trigger: 'change' }],
+  planDeliverTime: [{ type: 'date', required: true, message: '预计送达时间不能为空', trigger: 'change' }],
+  requireOverTime: [{ type: 'date', required: true, message: '要求检完时间不能为空', trigger: 'change' }],
+}) // 表单验证规则
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+
+// 委托方代码获取焦点
+const customerNoFocus = () => {
+  visible.value = true
+}
+
+// 点击从样品库添加
+const multiAdd = () => {
+  sampleVisible.value = true
+}
+
+// 选好委托方
+const confirmCheckout = (val: Array<ICustomer>) => {
+  if (val && val.length) {
+    const getValue = val[0]
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 委托方电话
+    dataForm.value.companyAddress = getValue.briefName // 委托方地址
+  }
+}
+
+// 选择好样品
+const clickConfirmSample = (val: Array<ISampleList>) => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      list.value.push(item)
+    }
+  })
+}
+
+// 控制选择委托方对话框显隐
+const changeVisible = (val: boolean) => {
+  visible.value = val
+}
+
+// 控制选择样品对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+  console.log(e)
+}
+
+// 增加行
+const addRow = () => {
+  list.value.push({
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 样品型号
+    manufacturingNo: '', // 出厂编号
+    powerVoltage: '', // 电源电压
+    appendixState: '', // 附件说明
+    mesureContent: '', // 检定项目
+    remark: '', // 备注
+    isEdit: true, // 是否可编辑
+  })
+}
+
+// 删除行
+const delRow = () => {
+  if (checkoutList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    // --------------------------删除有问题----------------------------
+    checkoutList.value.forEach((item: ISampleList) => {
+      list.value.forEach((element, index) => {
+        if (element.sampleNo === item.sampleNo || !item.sampleNo) {
+          list.value.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
 </script>
 
+<template>
+  <app-container>
+    <detail-page title="检测/校准委托单">
+      <template #btns>
+        <!-- <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button> -->
+        <!-- <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="委托书编号:" prop="orderCode">
+                <el-input
+                  v-model="dataForm.orderCode"
+                  :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'"
+                />
+              </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'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="委托日期:" prop="orderTime">
+                <el-date-picker
+                  v-model="dataForm.orderTime"
+                  type="month"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </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'"
+                  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'"
+                  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' ? '' : '请输入委托方代码'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                  @focus="customerNoFocus"
+                >
+                  <template #suffix>
+                    <el-icon v-if="pageType !== 'detail'" class="el-input__icon">
+                      <search />
+                    </el-icon>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="dataForm.customerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </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
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item label="委托方地址:" prop="companyAddress">
+                <el-input
+                  v-model="dataForm.companyAddress"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="16">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <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" />
+                <span v-else-if="pageType === 'detail'">无</span>
+                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+    <!-- 表格 -->
+    <detail-block title="样品清单">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
+          从样品库中添加
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="list"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        >
+          <template v-if="item.value !== 'powerVoltage' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+            <el-input
+              v-if="scope.row.isEdit"
+              v-model="scope.row[item.value]"
+              :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+              :disabled="item.disabled"
+              class="input"
+            />
+            <span v-else>{{ scope.row[item.value] }}</span>
+          </template>
+          <!-- <template v-if="item.value === 'powerVoltage' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+            <el-select v-if="scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <el-option
+                v-for="i in powerVoltageMap"
+                :key="i.value"
+                :label="i.label"
+                :value="i.value"
+              />
+            </el-select>
+            <span v-else>{{ scope.row[item.value] }}</span>
+          </template> -->
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <!-- 选择委托方组件 -->
+    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+    <!-- 选择样品组件 -->
+    <select-sample v-model:visible="sampleVisible" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 1d2c1bd..8749da7 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -25,3 +25,35 @@
   createTime: string // 创建时间
   remark: string // 备注
 }
+
+// 详情表单
+export interface IOrderDetail {
+  id?: string
+  orderCode: string // 委托书编号
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  orderTime: string // 委托日期
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 要求检完时间
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  companyAddress: string // 委托方地址
+  remark: string // 备注
+  minioFileName: string // 附件
+}
+
+// 样品清单
+export interface ISampleList {
+  id?: string
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  powerVoltage: string // 电源电压
+  appendixState: string // 附件说明
+  mesureContent: string // 检定项目
+  remark: string // 备注
+  isEdit?: boolean // 是否可编辑
+}
+

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index ead208d..cb0fbc2 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
     >
       <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
       <slot name="preColumns" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true">
+      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index 1031936..e080e57 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -7,4 +7,5 @@
   showOverflow?: boolean // 是否溢出为省略号
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
+  fixed?: boolean // 固定列
 }
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index be7f8bd..7aea767 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -2,18 +2,17 @@
 <script lang="ts" setup name="InterchangeEdit">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
-import { Calendar, Search } from '@element-plus/icons-vue'
+import { Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
-import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
+import sampleDialog from '@/views/customer/sample/list/selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -151,7 +150,7 @@
 }
 
 // 校验规则
-const rules = ref({
+const rules = reactive<FormRules>({
   sampleName: [{ required: true, message: '样品名称不能为空', trigger: 'blur' }],
   sampleModel: [{ required: true, message: '样品型号不能为空', trigger: 'blur' }],
   manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
@@ -266,7 +265,6 @@
 // 委托方代码获取焦点
 const customerNoFocus = () => {
   visible.value = true
-  console.log(visible.value)
 }
 
 // 选好委托方
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index fd09c75..30b2bf4 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -148,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        orderListReceive({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
-            fetchData(true)
-          }
-        })
+        // orderListReceive({ id: row.id }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
       }
       else if (type === 'back') { // 退回
-        orderListBack({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
-            fetchData(true)
-          }
-        })
+        // orderListBack({ id: row.id }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
       }
     })
 }
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
index 2e49511..8f13ac5 100644
--- a/src/views/business/schedule/order/orderListEdit.vue
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -1,5 +1,433 @@
 <!-- 委托书详情 -->
 <script lang="ts" setup name="OrderListEdit">
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import type { IOrderDetail, ISampleList } from './orderList_interface'
+import selectSample from './selectSample.vue'
+import { UploadFile } from '@/api/measure/file'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const visible = ref(false) // 控制选择委托方对话框显隐
+const sampleVisible = ref(false) // 控制选择样品对话框显隐
+// 表单
+const dataForm: Ref<IOrderDetail> = ref({
+  id: '',
+  orderCode: '', // 委托书编号
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  planDeliverTime: '', // 预计送达时间
+  requireOverTime: '', // 要求检完时间
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  companyAddress: '', // 委托方地址
+  remark: '', // 备注
+  minioFileName: '', // 附件
+})
+const list = ref<ISampleList[]>([])// 表格数据
+// 电源电压
+const powerVoltageMap = [
+  {
+    label: '220V',
+    value: '220',
+  },
+  {
+    label: '110V',
+    value: '110',
+  },
+]
+// 选中的内容
+const checkoutList = ref([])
+// 表头
+const columns = ref([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true },
+  { text: '样品名称', value: 'sampleName', align: 'center', disabled: false },
+  { text: '型号', value: 'sampleModel', align: 'center', disabled: false },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center', disabled: false },
+  { text: '电源电压', value: 'powerVoltage', align: 'center', disabled: false },
+  { text: '检定项目', value: 'mesureContent', align: 'center', disabled: false },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '附件说明', value: 'appendixState', align: 'center', disabled: false },
+])
+// 校验规则
+const rules = reactive<FormRules>({
+  deliverer: [{ required: true, message: '送样人不能为空', trigger: 'blur' }],
+  delivererTel: [{ required: true, message: '送样人联系方式不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
+  phone: [{ required: true, message: '委托方电话不能为空', trigger: 'blur' }],
+  companyAddress: [{ required: true, message: '委托方地址不能为空', trigger: 'blur' }],
+  orderTime: [{ type: 'date', required: true, message: '委托日期不能为空', trigger: 'change' }],
+  planDeliverTime: [{ type: 'date', required: true, message: '预计送达时间不能为空', trigger: 'change' }],
+  requireOverTime: [{ type: 'date', required: true, message: '要求检完时间不能为空', trigger: 'change' }],
+}) // 表单验证规则
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+
+// 委托方代码获取焦点
+const customerNoFocus = () => {
+  visible.value = true
+}
+
+// 点击从样品库添加
+const multiAdd = () => {
+  sampleVisible.value = true
+}
+
+// 选好委托方
+const confirmCheckout = (val: Array<ICustomer>) => {
+  if (val && val.length) {
+    const getValue = val[0]
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 委托方电话
+    dataForm.value.companyAddress = getValue.briefName // 委托方地址
+  }
+}
+
+// 选择好样品
+const clickConfirmSample = (val: Array<ISampleList>) => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      list.value.push(item)
+    }
+  })
+}
+
+// 控制选择委托方对话框显隐
+const changeVisible = (val: boolean) => {
+  visible.value = val
+}
+
+// 控制选择样品对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+  console.log(e)
+}
+
+// 增加行
+const addRow = () => {
+  list.value.push({
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 样品型号
+    manufacturingNo: '', // 出厂编号
+    powerVoltage: '', // 电源电压
+    appendixState: '', // 附件说明
+    mesureContent: '', // 检定项目
+    remark: '', // 备注
+    isEdit: true, // 是否可编辑
+  })
+}
+
+// 删除行
+const delRow = () => {
+  if (checkoutList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    // --------------------------删除有问题----------------------------
+    checkoutList.value.forEach((item: ISampleList) => {
+      list.value.forEach((element, index) => {
+        if (element.sampleNo === item.sampleNo || !item.sampleNo) {
+          list.value.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
 </script>
 
+<template>
+  <app-container>
+    <detail-page title="检测/校准委托单">
+      <template #btns>
+        <!-- <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button> -->
+        <!-- <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="委托书编号:" prop="orderCode">
+                <el-input
+                  v-model="dataForm.orderCode"
+                  :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'"
+                />
+              </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'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="委托日期:" prop="orderTime">
+                <el-date-picker
+                  v-model="dataForm.orderTime"
+                  type="month"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </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'"
+                  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'"
+                  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' ? '' : '请输入委托方代码'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                  @focus="customerNoFocus"
+                >
+                  <template #suffix>
+                    <el-icon v-if="pageType !== 'detail'" class="el-input__icon">
+                      <search />
+                    </el-icon>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="dataForm.customerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </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
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item label="委托方地址:" prop="companyAddress">
+                <el-input
+                  v-model="dataForm.companyAddress"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="16">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <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" />
+                <span v-else-if="pageType === 'detail'">无</span>
+                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+    <!-- 表格 -->
+    <detail-block title="样品清单">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
+          从样品库中添加
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="list"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        >
+          <template v-if="item.value !== 'powerVoltage' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+            <el-input
+              v-if="scope.row.isEdit"
+              v-model="scope.row[item.value]"
+              :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+              :disabled="item.disabled"
+              class="input"
+            />
+            <span v-else>{{ scope.row[item.value] }}</span>
+          </template>
+          <!-- <template v-if="item.value === 'powerVoltage' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+            <el-select v-if="scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <el-option
+                v-for="i in powerVoltageMap"
+                :key="i.value"
+                :label="i.label"
+                :value="i.value"
+              />
+            </el-select>
+            <span v-else>{{ scope.row[item.value] }}</span>
+          </template> -->
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <!-- 选择委托方组件 -->
+    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+    <!-- 选择样品组件 -->
+    <select-sample v-model:visible="sampleVisible" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 1d2c1bd..8749da7 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -25,3 +25,35 @@
   createTime: string // 创建时间
   remark: string // 备注
 }
+
+// 详情表单
+export interface IOrderDetail {
+  id?: string
+  orderCode: string // 委托书编号
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  orderTime: string // 委托日期
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 要求检完时间
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  companyAddress: string // 委托方地址
+  remark: string // 备注
+  minioFileName: string // 附件
+}
+
+// 样品清单
+export interface ISampleList {
+  id?: string
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  powerVoltage: string // 电源电压
+  appendixState: string // 附件说明
+  mesureContent: string // 检定项目
+  remark: string // 备注
+  isEdit?: boolean // 是否可编辑
+}
+
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
new file mode 100644
index 0000000..d9e39fc
--- /dev/null
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -0,0 +1,179 @@
+<!-- 选择样品dialog -->
+<script setup lang="ts" name="SelectSample">
+import { computed, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleList, ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+const visibleDialog = computed({
+  get() {
+    return props.visible
+  },
+  set(val) {
+    emits('changeVisible', val)
+  },
+})
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center', fixed: false },
+  { text: '出厂编号', value: 'evaluationName', align: 'center', fixed: false },
+  { text: '委托方代码', value: 'customerNo', align: 'center', fixed: false },
+  { text: '委托方名称', value: 'customerName', align: 'center', fixed: false },
+  { text: '检定周期', value: 'mesurePeriod', align: 'center', fixed: false },
+  { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px', fixed: false },
+  { text: '备注', value: 'remark', align: 'center', width: '180px', fixed: false },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+fetchData(true)
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index ead208d..cb0fbc2 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
     >
       <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
       <slot name="preColumns" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true">
+      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index 1031936..e080e57 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -7,4 +7,5 @@
   showOverflow?: boolean // 是否溢出为省略号
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
+  fixed?: boolean // 固定列
 }
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index be7f8bd..7aea767 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -2,18 +2,17 @@
 <script lang="ts" setup name="InterchangeEdit">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
-import { Calendar, Search } from '@element-plus/icons-vue'
+import { Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
-import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
+import sampleDialog from '@/views/customer/sample/list/selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -151,7 +150,7 @@
 }
 
 // 校验规则
-const rules = ref({
+const rules = reactive<FormRules>({
   sampleName: [{ required: true, message: '样品名称不能为空', trigger: 'blur' }],
   sampleModel: [{ required: true, message: '样品型号不能为空', trigger: 'blur' }],
   manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
@@ -266,7 +265,6 @@
 // 委托方代码获取焦点
 const customerNoFocus = () => {
   visible.value = true
-  console.log(visible.value)
 }
 
 // 选好委托方
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index fd09c75..30b2bf4 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -148,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        orderListReceive({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
-            fetchData(true)
-          }
-        })
+        // orderListReceive({ id: row.id }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
       }
       else if (type === 'back') { // 退回
-        orderListBack({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
-            fetchData(true)
-          }
-        })
+        // orderListBack({ id: row.id }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
       }
     })
 }
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
index 2e49511..8f13ac5 100644
--- a/src/views/business/schedule/order/orderListEdit.vue
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -1,5 +1,433 @@
 <!-- 委托书详情 -->
 <script lang="ts" setup name="OrderListEdit">
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import type { IOrderDetail, ISampleList } from './orderList_interface'
+import selectSample from './selectSample.vue'
+import { UploadFile } from '@/api/measure/file'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const visible = ref(false) // 控制选择委托方对话框显隐
+const sampleVisible = ref(false) // 控制选择样品对话框显隐
+// 表单
+const dataForm: Ref<IOrderDetail> = ref({
+  id: '',
+  orderCode: '', // 委托书编号
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  planDeliverTime: '', // 预计送达时间
+  requireOverTime: '', // 要求检完时间
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  companyAddress: '', // 委托方地址
+  remark: '', // 备注
+  minioFileName: '', // 附件
+})
+const list = ref<ISampleList[]>([])// 表格数据
+// 电源电压
+const powerVoltageMap = [
+  {
+    label: '220V',
+    value: '220',
+  },
+  {
+    label: '110V',
+    value: '110',
+  },
+]
+// 选中的内容
+const checkoutList = ref([])
+// 表头
+const columns = ref([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true },
+  { text: '样品名称', value: 'sampleName', align: 'center', disabled: false },
+  { text: '型号', value: 'sampleModel', align: 'center', disabled: false },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center', disabled: false },
+  { text: '电源电压', value: 'powerVoltage', align: 'center', disabled: false },
+  { text: '检定项目', value: 'mesureContent', align: 'center', disabled: false },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '附件说明', value: 'appendixState', align: 'center', disabled: false },
+])
+// 校验规则
+const rules = reactive<FormRules>({
+  deliverer: [{ required: true, message: '送样人不能为空', trigger: 'blur' }],
+  delivererTel: [{ required: true, message: '送样人联系方式不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
+  phone: [{ required: true, message: '委托方电话不能为空', trigger: 'blur' }],
+  companyAddress: [{ required: true, message: '委托方地址不能为空', trigger: 'blur' }],
+  orderTime: [{ type: 'date', required: true, message: '委托日期不能为空', trigger: 'change' }],
+  planDeliverTime: [{ type: 'date', required: true, message: '预计送达时间不能为空', trigger: 'change' }],
+  requireOverTime: [{ type: 'date', required: true, message: '要求检完时间不能为空', trigger: 'change' }],
+}) // 表单验证规则
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+
+// 委托方代码获取焦点
+const customerNoFocus = () => {
+  visible.value = true
+}
+
+// 点击从样品库添加
+const multiAdd = () => {
+  sampleVisible.value = true
+}
+
+// 选好委托方
+const confirmCheckout = (val: Array<ICustomer>) => {
+  if (val && val.length) {
+    const getValue = val[0]
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 委托方电话
+    dataForm.value.companyAddress = getValue.briefName // 委托方地址
+  }
+}
+
+// 选择好样品
+const clickConfirmSample = (val: Array<ISampleList>) => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      list.value.push(item)
+    }
+  })
+}
+
+// 控制选择委托方对话框显隐
+const changeVisible = (val: boolean) => {
+  visible.value = val
+}
+
+// 控制选择样品对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+  console.log(e)
+}
+
+// 增加行
+const addRow = () => {
+  list.value.push({
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 样品型号
+    manufacturingNo: '', // 出厂编号
+    powerVoltage: '', // 电源电压
+    appendixState: '', // 附件说明
+    mesureContent: '', // 检定项目
+    remark: '', // 备注
+    isEdit: true, // 是否可编辑
+  })
+}
+
+// 删除行
+const delRow = () => {
+  if (checkoutList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    // --------------------------删除有问题----------------------------
+    checkoutList.value.forEach((item: ISampleList) => {
+      list.value.forEach((element, index) => {
+        if (element.sampleNo === item.sampleNo || !item.sampleNo) {
+          list.value.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
 </script>
 
+<template>
+  <app-container>
+    <detail-page title="检测/校准委托单">
+      <template #btns>
+        <!-- <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button> -->
+        <!-- <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="委托书编号:" prop="orderCode">
+                <el-input
+                  v-model="dataForm.orderCode"
+                  :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'"
+                />
+              </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'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="委托日期:" prop="orderTime">
+                <el-date-picker
+                  v-model="dataForm.orderTime"
+                  type="month"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </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'"
+                  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'"
+                  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' ? '' : '请输入委托方代码'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                  @focus="customerNoFocus"
+                >
+                  <template #suffix>
+                    <el-icon v-if="pageType !== 'detail'" class="el-input__icon">
+                      <search />
+                    </el-icon>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="dataForm.customerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </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
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item label="委托方地址:" prop="companyAddress">
+                <el-input
+                  v-model="dataForm.companyAddress"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="16">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <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" />
+                <span v-else-if="pageType === 'detail'">无</span>
+                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+    <!-- 表格 -->
+    <detail-block title="样品清单">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
+          从样品库中添加
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="list"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        >
+          <template v-if="item.value !== 'powerVoltage' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+            <el-input
+              v-if="scope.row.isEdit"
+              v-model="scope.row[item.value]"
+              :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+              :disabled="item.disabled"
+              class="input"
+            />
+            <span v-else>{{ scope.row[item.value] }}</span>
+          </template>
+          <!-- <template v-if="item.value === 'powerVoltage' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+            <el-select v-if="scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <el-option
+                v-for="i in powerVoltageMap"
+                :key="i.value"
+                :label="i.label"
+                :value="i.value"
+              />
+            </el-select>
+            <span v-else>{{ scope.row[item.value] }}</span>
+          </template> -->
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <!-- 选择委托方组件 -->
+    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+    <!-- 选择样品组件 -->
+    <select-sample v-model:visible="sampleVisible" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 1d2c1bd..8749da7 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -25,3 +25,35 @@
   createTime: string // 创建时间
   remark: string // 备注
 }
+
+// 详情表单
+export interface IOrderDetail {
+  id?: string
+  orderCode: string // 委托书编号
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  orderTime: string // 委托日期
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 要求检完时间
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  companyAddress: string // 委托方地址
+  remark: string // 备注
+  minioFileName: string // 附件
+}
+
+// 样品清单
+export interface ISampleList {
+  id?: string
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  powerVoltage: string // 电源电压
+  appendixState: string // 附件说明
+  mesureContent: string // 检定项目
+  remark: string // 备注
+  isEdit?: boolean // 是否可编辑
+}
+
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
new file mode 100644
index 0000000..d9e39fc
--- /dev/null
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -0,0 +1,179 @@
+<!-- 选择样品dialog -->
+<script setup lang="ts" name="SelectSample">
+import { computed, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleList, ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+const visibleDialog = computed({
+  get() {
+    return props.visible
+  },
+  set(val) {
+    emits('changeVisible', val)
+  },
+})
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center', fixed: false },
+  { text: '出厂编号', value: 'evaluationName', align: 'center', fixed: false },
+  { text: '委托方代码', value: 'customerNo', align: 'center', fixed: false },
+  { text: '委托方名称', value: 'customerName', align: 'center', fixed: false },
+  { text: '检定周期', value: 'mesurePeriod', align: 'center', fixed: false },
+  { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px', fixed: false },
+  { text: '备注', value: 'remark', align: 'center', width: '180px', fixed: false },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+fetchData(true)
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 153b66e..8e58690 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -6,7 +6,7 @@
 import { ref } from 'vue'
 import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleEdit, Menu, SimpleCertification, SimpleMeasureRecord } from './sample_list_interface'
-import sampleDialog from './sampleDialog.vue'
+import selectCustomer from './selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
@@ -702,7 +702,7 @@
     </detail-block-switch>
 
     <!-- 选择委托方组件 -->
-    <sample-dialog v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
   </app-container>
 </template>
 

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index ead208d..cb0fbc2 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
     >
       <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
       <slot name="preColumns" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true">
+      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index 1031936..e080e57 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -7,4 +7,5 @@
   showOverflow?: boolean // 是否溢出为省略号
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
+  fixed?: boolean // 固定列
 }
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index be7f8bd..7aea767 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -2,18 +2,17 @@
 <script lang="ts" setup name="InterchangeEdit">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
-import { Calendar, Search } from '@element-plus/icons-vue'
+import { Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
-import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
+import sampleDialog from '@/views/customer/sample/list/selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -151,7 +150,7 @@
 }
 
 // 校验规则
-const rules = ref({
+const rules = reactive<FormRules>({
   sampleName: [{ required: true, message: '样品名称不能为空', trigger: 'blur' }],
   sampleModel: [{ required: true, message: '样品型号不能为空', trigger: 'blur' }],
   manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
@@ -266,7 +265,6 @@
 // 委托方代码获取焦点
 const customerNoFocus = () => {
   visible.value = true
-  console.log(visible.value)
 }
 
 // 选好委托方
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index fd09c75..30b2bf4 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -148,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        orderListReceive({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
-            fetchData(true)
-          }
-        })
+        // orderListReceive({ id: row.id }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
       }
       else if (type === 'back') { // 退回
-        orderListBack({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
-            fetchData(true)
-          }
-        })
+        // orderListBack({ id: row.id }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
       }
     })
 }
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
index 2e49511..8f13ac5 100644
--- a/src/views/business/schedule/order/orderListEdit.vue
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -1,5 +1,433 @@
 <!-- 委托书详情 -->
 <script lang="ts" setup name="OrderListEdit">
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import type { IOrderDetail, ISampleList } from './orderList_interface'
+import selectSample from './selectSample.vue'
+import { UploadFile } from '@/api/measure/file'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const visible = ref(false) // 控制选择委托方对话框显隐
+const sampleVisible = ref(false) // 控制选择样品对话框显隐
+// 表单
+const dataForm: Ref<IOrderDetail> = ref({
+  id: '',
+  orderCode: '', // 委托书编号
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  planDeliverTime: '', // 预计送达时间
+  requireOverTime: '', // 要求检完时间
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  companyAddress: '', // 委托方地址
+  remark: '', // 备注
+  minioFileName: '', // 附件
+})
+const list = ref<ISampleList[]>([])// 表格数据
+// 电源电压
+const powerVoltageMap = [
+  {
+    label: '220V',
+    value: '220',
+  },
+  {
+    label: '110V',
+    value: '110',
+  },
+]
+// 选中的内容
+const checkoutList = ref([])
+// 表头
+const columns = ref([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true },
+  { text: '样品名称', value: 'sampleName', align: 'center', disabled: false },
+  { text: '型号', value: 'sampleModel', align: 'center', disabled: false },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center', disabled: false },
+  { text: '电源电压', value: 'powerVoltage', align: 'center', disabled: false },
+  { text: '检定项目', value: 'mesureContent', align: 'center', disabled: false },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '附件说明', value: 'appendixState', align: 'center', disabled: false },
+])
+// 校验规则
+const rules = reactive<FormRules>({
+  deliverer: [{ required: true, message: '送样人不能为空', trigger: 'blur' }],
+  delivererTel: [{ required: true, message: '送样人联系方式不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
+  phone: [{ required: true, message: '委托方电话不能为空', trigger: 'blur' }],
+  companyAddress: [{ required: true, message: '委托方地址不能为空', trigger: 'blur' }],
+  orderTime: [{ type: 'date', required: true, message: '委托日期不能为空', trigger: 'change' }],
+  planDeliverTime: [{ type: 'date', required: true, message: '预计送达时间不能为空', trigger: 'change' }],
+  requireOverTime: [{ type: 'date', required: true, message: '要求检完时间不能为空', trigger: 'change' }],
+}) // 表单验证规则
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+
+// 委托方代码获取焦点
+const customerNoFocus = () => {
+  visible.value = true
+}
+
+// 点击从样品库添加
+const multiAdd = () => {
+  sampleVisible.value = true
+}
+
+// 选好委托方
+const confirmCheckout = (val: Array<ICustomer>) => {
+  if (val && val.length) {
+    const getValue = val[0]
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 委托方电话
+    dataForm.value.companyAddress = getValue.briefName // 委托方地址
+  }
+}
+
+// 选择好样品
+const clickConfirmSample = (val: Array<ISampleList>) => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      list.value.push(item)
+    }
+  })
+}
+
+// 控制选择委托方对话框显隐
+const changeVisible = (val: boolean) => {
+  visible.value = val
+}
+
+// 控制选择样品对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+  console.log(e)
+}
+
+// 增加行
+const addRow = () => {
+  list.value.push({
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 样品型号
+    manufacturingNo: '', // 出厂编号
+    powerVoltage: '', // 电源电压
+    appendixState: '', // 附件说明
+    mesureContent: '', // 检定项目
+    remark: '', // 备注
+    isEdit: true, // 是否可编辑
+  })
+}
+
+// 删除行
+const delRow = () => {
+  if (checkoutList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    // --------------------------删除有问题----------------------------
+    checkoutList.value.forEach((item: ISampleList) => {
+      list.value.forEach((element, index) => {
+        if (element.sampleNo === item.sampleNo || !item.sampleNo) {
+          list.value.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
 </script>
 
+<template>
+  <app-container>
+    <detail-page title="检测/校准委托单">
+      <template #btns>
+        <!-- <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button> -->
+        <!-- <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="委托书编号:" prop="orderCode">
+                <el-input
+                  v-model="dataForm.orderCode"
+                  :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'"
+                />
+              </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'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="委托日期:" prop="orderTime">
+                <el-date-picker
+                  v-model="dataForm.orderTime"
+                  type="month"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </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'"
+                  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'"
+                  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' ? '' : '请输入委托方代码'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                  @focus="customerNoFocus"
+                >
+                  <template #suffix>
+                    <el-icon v-if="pageType !== 'detail'" class="el-input__icon">
+                      <search />
+                    </el-icon>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="dataForm.customerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </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
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item label="委托方地址:" prop="companyAddress">
+                <el-input
+                  v-model="dataForm.companyAddress"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="16">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <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" />
+                <span v-else-if="pageType === 'detail'">无</span>
+                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+    <!-- 表格 -->
+    <detail-block title="样品清单">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
+          从样品库中添加
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="list"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        >
+          <template v-if="item.value !== 'powerVoltage' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+            <el-input
+              v-if="scope.row.isEdit"
+              v-model="scope.row[item.value]"
+              :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+              :disabled="item.disabled"
+              class="input"
+            />
+            <span v-else>{{ scope.row[item.value] }}</span>
+          </template>
+          <!-- <template v-if="item.value === 'powerVoltage' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+            <el-select v-if="scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <el-option
+                v-for="i in powerVoltageMap"
+                :key="i.value"
+                :label="i.label"
+                :value="i.value"
+              />
+            </el-select>
+            <span v-else>{{ scope.row[item.value] }}</span>
+          </template> -->
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <!-- 选择委托方组件 -->
+    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+    <!-- 选择样品组件 -->
+    <select-sample v-model:visible="sampleVisible" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 1d2c1bd..8749da7 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -25,3 +25,35 @@
   createTime: string // 创建时间
   remark: string // 备注
 }
+
+// 详情表单
+export interface IOrderDetail {
+  id?: string
+  orderCode: string // 委托书编号
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  orderTime: string // 委托日期
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 要求检完时间
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  companyAddress: string // 委托方地址
+  remark: string // 备注
+  minioFileName: string // 附件
+}
+
+// 样品清单
+export interface ISampleList {
+  id?: string
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  powerVoltage: string // 电源电压
+  appendixState: string // 附件说明
+  mesureContent: string // 检定项目
+  remark: string // 备注
+  isEdit?: boolean // 是否可编辑
+}
+
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
new file mode 100644
index 0000000..d9e39fc
--- /dev/null
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -0,0 +1,179 @@
+<!-- 选择样品dialog -->
+<script setup lang="ts" name="SelectSample">
+import { computed, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleList, ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+const visibleDialog = computed({
+  get() {
+    return props.visible
+  },
+  set(val) {
+    emits('changeVisible', val)
+  },
+})
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center', fixed: false },
+  { text: '出厂编号', value: 'evaluationName', align: 'center', fixed: false },
+  { text: '委托方代码', value: 'customerNo', align: 'center', fixed: false },
+  { text: '委托方名称', value: 'customerName', align: 'center', fixed: false },
+  { text: '检定周期', value: 'mesurePeriod', align: 'center', fixed: false },
+  { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px', fixed: false },
+  { text: '备注', value: 'remark', align: 'center', width: '180px', fixed: false },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+fetchData(true)
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 153b66e..8e58690 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -6,7 +6,7 @@
 import { ref } from 'vue'
 import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleEdit, Menu, SimpleCertification, SimpleMeasureRecord } from './sample_list_interface'
-import sampleDialog from './sampleDialog.vue'
+import selectCustomer from './selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
@@ -702,7 +702,7 @@
     </detail-block-switch>
 
     <!-- 选择委托方组件 -->
-    <sample-dialog v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
   </app-container>
 </template>
 
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index d4a4c0f..89a05a6 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -17,8 +17,8 @@
   sampleModel: '', // 型号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
-  startTime: '1', // 检定开始时间
-  endTime: '1', // 检定结束时间
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
   offset: 1,
   limit: 20,
 })

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index ead208d..cb0fbc2 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
     >
       <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
       <slot name="preColumns" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true">
+      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index 1031936..e080e57 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -7,4 +7,5 @@
   showOverflow?: boolean // 是否溢出为省略号
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
+  fixed?: boolean // 固定列
 }
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index be7f8bd..7aea767 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -2,18 +2,17 @@
 <script lang="ts" setup name="InterchangeEdit">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
-import { Calendar, Search } from '@element-plus/icons-vue'
+import { Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
-import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
+import sampleDialog from '@/views/customer/sample/list/selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -151,7 +150,7 @@
 }
 
 // 校验规则
-const rules = ref({
+const rules = reactive<FormRules>({
   sampleName: [{ required: true, message: '样品名称不能为空', trigger: 'blur' }],
   sampleModel: [{ required: true, message: '样品型号不能为空', trigger: 'blur' }],
   manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
@@ -266,7 +265,6 @@
 // 委托方代码获取焦点
 const customerNoFocus = () => {
   visible.value = true
-  console.log(visible.value)
 }
 
 // 选好委托方
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index fd09c75..30b2bf4 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -148,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        orderListReceive({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
-            fetchData(true)
-          }
-        })
+        // orderListReceive({ id: row.id }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
       }
       else if (type === 'back') { // 退回
-        orderListBack({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
-            fetchData(true)
-          }
-        })
+        // orderListBack({ id: row.id }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
       }
     })
 }
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
index 2e49511..8f13ac5 100644
--- a/src/views/business/schedule/order/orderListEdit.vue
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -1,5 +1,433 @@
 <!-- 委托书详情 -->
 <script lang="ts" setup name="OrderListEdit">
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import type { IOrderDetail, ISampleList } from './orderList_interface'
+import selectSample from './selectSample.vue'
+import { UploadFile } from '@/api/measure/file'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const visible = ref(false) // 控制选择委托方对话框显隐
+const sampleVisible = ref(false) // 控制选择样品对话框显隐
+// 表单
+const dataForm: Ref<IOrderDetail> = ref({
+  id: '',
+  orderCode: '', // 委托书编号
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  planDeliverTime: '', // 预计送达时间
+  requireOverTime: '', // 要求检完时间
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  companyAddress: '', // 委托方地址
+  remark: '', // 备注
+  minioFileName: '', // 附件
+})
+const list = ref<ISampleList[]>([])// 表格数据
+// 电源电压
+const powerVoltageMap = [
+  {
+    label: '220V',
+    value: '220',
+  },
+  {
+    label: '110V',
+    value: '110',
+  },
+]
+// 选中的内容
+const checkoutList = ref([])
+// 表头
+const columns = ref([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true },
+  { text: '样品名称', value: 'sampleName', align: 'center', disabled: false },
+  { text: '型号', value: 'sampleModel', align: 'center', disabled: false },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center', disabled: false },
+  { text: '电源电压', value: 'powerVoltage', align: 'center', disabled: false },
+  { text: '检定项目', value: 'mesureContent', align: 'center', disabled: false },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '附件说明', value: 'appendixState', align: 'center', disabled: false },
+])
+// 校验规则
+const rules = reactive<FormRules>({
+  deliverer: [{ required: true, message: '送样人不能为空', trigger: 'blur' }],
+  delivererTel: [{ required: true, message: '送样人联系方式不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
+  phone: [{ required: true, message: '委托方电话不能为空', trigger: 'blur' }],
+  companyAddress: [{ required: true, message: '委托方地址不能为空', trigger: 'blur' }],
+  orderTime: [{ type: 'date', required: true, message: '委托日期不能为空', trigger: 'change' }],
+  planDeliverTime: [{ type: 'date', required: true, message: '预计送达时间不能为空', trigger: 'change' }],
+  requireOverTime: [{ type: 'date', required: true, message: '要求检完时间不能为空', trigger: 'change' }],
+}) // 表单验证规则
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+
+// 委托方代码获取焦点
+const customerNoFocus = () => {
+  visible.value = true
+}
+
+// 点击从样品库添加
+const multiAdd = () => {
+  sampleVisible.value = true
+}
+
+// 选好委托方
+const confirmCheckout = (val: Array<ICustomer>) => {
+  if (val && val.length) {
+    const getValue = val[0]
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 委托方电话
+    dataForm.value.companyAddress = getValue.briefName // 委托方地址
+  }
+}
+
+// 选择好样品
+const clickConfirmSample = (val: Array<ISampleList>) => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      list.value.push(item)
+    }
+  })
+}
+
+// 控制选择委托方对话框显隐
+const changeVisible = (val: boolean) => {
+  visible.value = val
+}
+
+// 控制选择样品对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+  console.log(e)
+}
+
+// 增加行
+const addRow = () => {
+  list.value.push({
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 样品型号
+    manufacturingNo: '', // 出厂编号
+    powerVoltage: '', // 电源电压
+    appendixState: '', // 附件说明
+    mesureContent: '', // 检定项目
+    remark: '', // 备注
+    isEdit: true, // 是否可编辑
+  })
+}
+
+// 删除行
+const delRow = () => {
+  if (checkoutList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    // --------------------------删除有问题----------------------------
+    checkoutList.value.forEach((item: ISampleList) => {
+      list.value.forEach((element, index) => {
+        if (element.sampleNo === item.sampleNo || !item.sampleNo) {
+          list.value.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
 </script>
 
+<template>
+  <app-container>
+    <detail-page title="检测/校准委托单">
+      <template #btns>
+        <!-- <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button> -->
+        <!-- <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="委托书编号:" prop="orderCode">
+                <el-input
+                  v-model="dataForm.orderCode"
+                  :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'"
+                />
+              </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'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="委托日期:" prop="orderTime">
+                <el-date-picker
+                  v-model="dataForm.orderTime"
+                  type="month"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </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'"
+                  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'"
+                  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' ? '' : '请输入委托方代码'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                  @focus="customerNoFocus"
+                >
+                  <template #suffix>
+                    <el-icon v-if="pageType !== 'detail'" class="el-input__icon">
+                      <search />
+                    </el-icon>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="dataForm.customerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </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
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item label="委托方地址:" prop="companyAddress">
+                <el-input
+                  v-model="dataForm.companyAddress"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="16">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <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" />
+                <span v-else-if="pageType === 'detail'">无</span>
+                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+    <!-- 表格 -->
+    <detail-block title="样品清单">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
+          从样品库中添加
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="list"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        >
+          <template v-if="item.value !== 'powerVoltage' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+            <el-input
+              v-if="scope.row.isEdit"
+              v-model="scope.row[item.value]"
+              :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+              :disabled="item.disabled"
+              class="input"
+            />
+            <span v-else>{{ scope.row[item.value] }}</span>
+          </template>
+          <!-- <template v-if="item.value === 'powerVoltage' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+            <el-select v-if="scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <el-option
+                v-for="i in powerVoltageMap"
+                :key="i.value"
+                :label="i.label"
+                :value="i.value"
+              />
+            </el-select>
+            <span v-else>{{ scope.row[item.value] }}</span>
+          </template> -->
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <!-- 选择委托方组件 -->
+    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+    <!-- 选择样品组件 -->
+    <select-sample v-model:visible="sampleVisible" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 1d2c1bd..8749da7 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -25,3 +25,35 @@
   createTime: string // 创建时间
   remark: string // 备注
 }
+
+// 详情表单
+export interface IOrderDetail {
+  id?: string
+  orderCode: string // 委托书编号
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  orderTime: string // 委托日期
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 要求检完时间
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  companyAddress: string // 委托方地址
+  remark: string // 备注
+  minioFileName: string // 附件
+}
+
+// 样品清单
+export interface ISampleList {
+  id?: string
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  powerVoltage: string // 电源电压
+  appendixState: string // 附件说明
+  mesureContent: string // 检定项目
+  remark: string // 备注
+  isEdit?: boolean // 是否可编辑
+}
+
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
new file mode 100644
index 0000000..d9e39fc
--- /dev/null
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -0,0 +1,179 @@
+<!-- 选择样品dialog -->
+<script setup lang="ts" name="SelectSample">
+import { computed, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleList, ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+const visibleDialog = computed({
+  get() {
+    return props.visible
+  },
+  set(val) {
+    emits('changeVisible', val)
+  },
+})
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center', fixed: false },
+  { text: '出厂编号', value: 'evaluationName', align: 'center', fixed: false },
+  { text: '委托方代码', value: 'customerNo', align: 'center', fixed: false },
+  { text: '委托方名称', value: 'customerName', align: 'center', fixed: false },
+  { text: '检定周期', value: 'mesurePeriod', align: 'center', fixed: false },
+  { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px', fixed: false },
+  { text: '备注', value: 'remark', align: 'center', width: '180px', fixed: false },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+fetchData(true)
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 153b66e..8e58690 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -6,7 +6,7 @@
 import { ref } from 'vue'
 import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleEdit, Menu, SimpleCertification, SimpleMeasureRecord } from './sample_list_interface'
-import sampleDialog from './sampleDialog.vue'
+import selectCustomer from './selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
@@ -702,7 +702,7 @@
     </detail-block-switch>
 
     <!-- 选择委托方组件 -->
-    <sample-dialog v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
   </app-container>
 </template>
 
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index d4a4c0f..89a05a6 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -17,8 +17,8 @@
   sampleModel: '', // 型号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
-  startTime: '1', // 检定开始时间
-  endTime: '1', // 检定结束时间
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
   offset: 1,
   limit: 20,
 })
diff --git a/src/views/customer/sample/list/sampleDialog.vue b/src/views/customer/sample/list/sampleDialog.vue
deleted file mode 100644
index a5a371b..0000000
--- a/src/views/customer/sample/list/sampleDialog.vue
+++ /dev/null
@@ -1,227 +0,0 @@
-<script setup lang="ts" name="sampleDialog">
-import { computed, getCurrentInstance, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ICustomer, ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getCustomerList } from '@/api/customer/customer'
-import { getDictByCode } from '@/api/system/dict'
-const props = defineProps({
-  visible: {
-    type: Boolean,
-    default: false,
-  },
-})
-const emits = defineEmits(['changeVisible', 'confirmCheckout'])
-
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set(val) {
-    emits('changeVisible', val)
-  },
-})
-
-// 查询条件
-const listQuery: Ref<ICustomerQuery> = ref({
-  bussinessSize: '', // 业务规模
-  customerName: '', // 公司名称
-  customerNo: '', // 客户编号
-  grade: '', // 履约评级
-  offset: 1,
-  limit: 20,
-})
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
-// const companySizeList = ref<dictType[]>([]) // 公司规模列表
-const businessSizeList = ref<dictType[]>([]) // 业务规模列表
-const gradeList = ref<dictType[]>([]) // 履约评级列表
-// const evaluationList = ref<dictType[]>([]) // 整体评价列表
-function getDict() {
-  // // 获取公司规模
-  // getDictByCode('companySize').then((response) => {
-  //   companySizeList.value = response.data
-  // })
-  // 获取业务规模
-  getDictByCode('businessSize').then((response) => {
-    businessSizeList.value = response.data
-  })
-  // 获取履约评级
-  getDictByCode('grade').then((response) => {
-    gradeList.value = response.data
-  })
-  // // 获取整体评价
-  // getDictByCode('evaluation').then((response) => {
-  //   evaluationList.value = response.data
-  // })
-}
-getDict()
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '客户编号', value: 'customerNo', width: '160', align: 'center' },
-  { text: '客户名称', value: 'customerName', width: '120', align: 'center' },
-  { text: '公司规模', value: 'companySizeName', align: 'center' },
-  { text: '业务规模', value: 'businessSizeName', align: 'center' },
-  { text: '履约评级', value: 'gradeName', align: 'center' },
-  { text: '整体评价', value: 'evaluationName', align: 'center' },
-  { text: '公司地址', value: 'briefName', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
-  { text: '备注', value: 'remark', align: 'center' },
-])
-// 表格数据
-const list = ref<ICustomer[]>([])
-// 总数
-const total = ref(0)
-// 表格加载状态
-const loadingTable = ref(false)
-// 选中的内容
-const checkoutList = ref<string[]>([])
-
-// 数据查询
-function fetchData(isNowPage = false) {
-  // loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getCustomerList(listQuery.value).then((response) => {
-    // 模拟数据
-    response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-    list.value = response.data.rows.map((item: ICustomer) => {
-      if (item.companyProvinceName && item.companyCityName) {
-        item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-      }
-      else {
-        item.briefName = item.companyProvinceName || item.companyCityName
-      }
-      return item
-    })
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-
-  // 模拟数据
-  // const response = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-  //   { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '2集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-  //   { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '3集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  // list.value = response.map((item: ICustomer) => {
-  //   if (item.companyProvinceName && item.companyCityName) {
-  //     item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //   }
-  //   else {
-  //     item.briefName = item.companyProvinceName || item.companyCityName
-  //   }
-  //   return item
-  // })
-  // total.value = 50
-  // loadingTable.value = false
-}
-// 多选发生改变时
-function handleSelectionChange(e: any) {
-  checkoutList.value = e
-}
-// 点击搜索
-const searchList = () => {
-  fetchData(true)
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    bussinessSize: '', // 业务规模
-    customerName: '', // 公司名称
-    customerNo: '', // 客户编号
-    grade: '', // 履约评级
-    offset: 1,
-    limit: 20,
-  }
-}
-
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  fetchData(true)
-}
-
-// 点击取消
-const cancle = () => {
-  emits('changeVisible', false)
-}
-// 点击确定
-const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
-  }
-  emits('confirmCheckout', checkoutList.value)
-  cancle()
-}
-
-fetchData(true)
-</script>
-
-<template>
-  <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择委托方" @close="cancle">
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.customerNo"
-            placeholder="客户编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.customerName"
-            placeholder="公司名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
-            <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-select v-model="listQuery.grade" placeholder="履约评级">
-            <el-option v-for="item in gradeList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </search-item>
-      </search-area>
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="loadingTable"
-        is-showmulti-select
-        :is-multi="false"
-        @change="changePage"
-        @multiSelect="handleSelectionChange"
-      />
-      <template #footer>
-        <el-button type="primary" @click="clickConfirm">
-          确定
-        </el-button>
-        <el-button @click="cancle">
-          取消
-        </el-button>
-      </template>
-    </el-dialog>
-  </div>
-</template>

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index ead208d..cb0fbc2 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
     >
       <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
       <slot name="preColumns" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true">
+      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/components/NormalTable/table_interface.ts b/src/components/NormalTable/table_interface.ts
index 1031936..e080e57 100644
--- a/src/components/NormalTable/table_interface.ts
+++ b/src/components/NormalTable/table_interface.ts
@@ -7,4 +7,5 @@
   showOverflow?: boolean // 是否溢出为省略号
   filter?: Function // 字段过滤器
   styleFilter?: Function // 文字过滤器
+  fixed?: boolean // 固定列
 }
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index be7f8bd..7aea767 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -2,18 +2,17 @@
 <script lang="ts" setup name="InterchangeEdit">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
-import { Calendar, Search } from '@element-plus/icons-vue'
+import { Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
-import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
+import sampleDialog from '@/views/customer/sample/list/selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -151,7 +150,7 @@
 }
 
 // 校验规则
-const rules = ref({
+const rules = reactive<FormRules>({
   sampleName: [{ required: true, message: '样品名称不能为空', trigger: 'blur' }],
   sampleModel: [{ required: true, message: '样品型号不能为空', trigger: 'blur' }],
   manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
@@ -266,7 +265,6 @@
 // 委托方代码获取焦点
 const customerNoFocus = () => {
   visible.value = true
-  console.log(visible.value)
 }
 
 // 选好委托方
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index fd09c75..30b2bf4 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -148,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        orderListReceive({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
-            fetchData(true)
-          }
-        })
+        // orderListReceive({ id: row.id }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
       }
       else if (type === 'back') { // 退回
-        orderListBack({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
-            fetchData(true)
-          }
-        })
+        // orderListBack({ id: row.id }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
       }
     })
 }
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
index 2e49511..8f13ac5 100644
--- a/src/views/business/schedule/order/orderListEdit.vue
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -1,5 +1,433 @@
 <!-- 委托书详情 -->
 <script lang="ts" setup name="OrderListEdit">
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import type { IOrderDetail, ISampleList } from './orderList_interface'
+import selectSample from './selectSample.vue'
+import { UploadFile } from '@/api/measure/file'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const visible = ref(false) // 控制选择委托方对话框显隐
+const sampleVisible = ref(false) // 控制选择样品对话框显隐
+// 表单
+const dataForm: Ref<IOrderDetail> = ref({
+  id: '',
+  orderCode: '', // 委托书编号
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  planDeliverTime: '', // 预计送达时间
+  requireOverTime: '', // 要求检完时间
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  companyAddress: '', // 委托方地址
+  remark: '', // 备注
+  minioFileName: '', // 附件
+})
+const list = ref<ISampleList[]>([])// 表格数据
+// 电源电压
+const powerVoltageMap = [
+  {
+    label: '220V',
+    value: '220',
+  },
+  {
+    label: '110V',
+    value: '110',
+  },
+]
+// 选中的内容
+const checkoutList = ref([])
+// 表头
+const columns = ref([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true },
+  { text: '样品名称', value: 'sampleName', align: 'center', disabled: false },
+  { text: '型号', value: 'sampleModel', align: 'center', disabled: false },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center', disabled: false },
+  { text: '电源电压', value: 'powerVoltage', align: 'center', disabled: false },
+  { text: '检定项目', value: 'mesureContent', align: 'center', disabled: false },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '附件说明', value: 'appendixState', align: 'center', disabled: false },
+])
+// 校验规则
+const rules = reactive<FormRules>({
+  deliverer: [{ required: true, message: '送样人不能为空', trigger: 'blur' }],
+  delivererTel: [{ required: true, message: '送样人联系方式不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
+  phone: [{ required: true, message: '委托方电话不能为空', trigger: 'blur' }],
+  companyAddress: [{ required: true, message: '委托方地址不能为空', trigger: 'blur' }],
+  orderTime: [{ type: 'date', required: true, message: '委托日期不能为空', trigger: 'change' }],
+  planDeliverTime: [{ type: 'date', required: true, message: '预计送达时间不能为空', trigger: 'change' }],
+  requireOverTime: [{ type: 'date', required: true, message: '要求检完时间不能为空', trigger: 'change' }],
+}) // 表单验证规则
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+
+// 委托方代码获取焦点
+const customerNoFocus = () => {
+  visible.value = true
+}
+
+// 点击从样品库添加
+const multiAdd = () => {
+  sampleVisible.value = true
+}
+
+// 选好委托方
+const confirmCheckout = (val: Array<ICustomer>) => {
+  if (val && val.length) {
+    const getValue = val[0]
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 委托方电话
+    dataForm.value.companyAddress = getValue.briefName // 委托方地址
+  }
+}
+
+// 选择好样品
+const clickConfirmSample = (val: Array<ISampleList>) => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      list.value.push(item)
+    }
+  })
+}
+
+// 控制选择委托方对话框显隐
+const changeVisible = (val: boolean) => {
+  visible.value = val
+}
+
+// 控制选择样品对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+  console.log(e)
+}
+
+// 增加行
+const addRow = () => {
+  list.value.push({
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 样品型号
+    manufacturingNo: '', // 出厂编号
+    powerVoltage: '', // 电源电压
+    appendixState: '', // 附件说明
+    mesureContent: '', // 检定项目
+    remark: '', // 备注
+    isEdit: true, // 是否可编辑
+  })
+}
+
+// 删除行
+const delRow = () => {
+  if (checkoutList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    // --------------------------删除有问题----------------------------
+    checkoutList.value.forEach((item: ISampleList) => {
+      list.value.forEach((element, index) => {
+        if (element.sampleNo === item.sampleNo || !item.sampleNo) {
+          list.value.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
 </script>
 
+<template>
+  <app-container>
+    <detail-page title="检测/校准委托单">
+      <template #btns>
+        <!-- <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button> -->
+        <!-- <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="委托书编号:" prop="orderCode">
+                <el-input
+                  v-model="dataForm.orderCode"
+                  :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'"
+                />
+              </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'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="委托日期:" prop="orderTime">
+                <el-date-picker
+                  v-model="dataForm.orderTime"
+                  type="month"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </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'"
+                  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'"
+                  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' ? '' : '请输入委托方代码'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                  @focus="customerNoFocus"
+                >
+                  <template #suffix>
+                    <el-icon v-if="pageType !== 'detail'" class="el-input__icon">
+                      <search />
+                    </el-icon>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="dataForm.customerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </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
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item label="委托方地址:" prop="companyAddress">
+                <el-input
+                  v-model="dataForm.companyAddress"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="16">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <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" />
+                <span v-else-if="pageType === 'detail'">无</span>
+                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+    <!-- 表格 -->
+    <detail-block title="样品清单">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
+          从样品库中添加
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="list"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        >
+          <template v-if="item.value !== 'powerVoltage' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+            <el-input
+              v-if="scope.row.isEdit"
+              v-model="scope.row[item.value]"
+              :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+              :disabled="item.disabled"
+              class="input"
+            />
+            <span v-else>{{ scope.row[item.value] }}</span>
+          </template>
+          <!-- <template v-if="item.value === 'powerVoltage' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+            <el-select v-if="scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <el-option
+                v-for="i in powerVoltageMap"
+                :key="i.value"
+                :label="i.label"
+                :value="i.value"
+              />
+            </el-select>
+            <span v-else>{{ scope.row[item.value] }}</span>
+          </template> -->
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <!-- 选择委托方组件 -->
+    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+    <!-- 选择样品组件 -->
+    <select-sample v-model:visible="sampleVisible" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 1d2c1bd..8749da7 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -25,3 +25,35 @@
   createTime: string // 创建时间
   remark: string // 备注
 }
+
+// 详情表单
+export interface IOrderDetail {
+  id?: string
+  orderCode: string // 委托书编号
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  orderTime: string // 委托日期
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 要求检完时间
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  companyAddress: string // 委托方地址
+  remark: string // 备注
+  minioFileName: string // 附件
+}
+
+// 样品清单
+export interface ISampleList {
+  id?: string
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  powerVoltage: string // 电源电压
+  appendixState: string // 附件说明
+  mesureContent: string // 检定项目
+  remark: string // 备注
+  isEdit?: boolean // 是否可编辑
+}
+
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
new file mode 100644
index 0000000..d9e39fc
--- /dev/null
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -0,0 +1,179 @@
+<!-- 选择样品dialog -->
+<script setup lang="ts" name="SelectSample">
+import { computed, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleList, ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+const visibleDialog = computed({
+  get() {
+    return props.visible
+  },
+  set(val) {
+    emits('changeVisible', val)
+  },
+})
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center', fixed: false },
+  { text: '出厂编号', value: 'evaluationName', align: 'center', fixed: false },
+  { text: '委托方代码', value: 'customerNo', align: 'center', fixed: false },
+  { text: '委托方名称', value: 'customerName', align: 'center', fixed: false },
+  { text: '检定周期', value: 'mesurePeriod', align: 'center', fixed: false },
+  { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px', fixed: false },
+  { text: '备注', value: 'remark', align: 'center', width: '180px', fixed: false },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // listQuery.value.startTime = timeRange.value[0] as string || ''
+  // listQuery.value.endTime = timeRange.value[1] as string || ''
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+fetchData(true)
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 153b66e..8e58690 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -6,7 +6,7 @@
 import { ref } from 'vue'
 import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleEdit, Menu, SimpleCertification, SimpleMeasureRecord } from './sample_list_interface'
-import sampleDialog from './sampleDialog.vue'
+import selectCustomer from './selectCustomer.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
@@ -702,7 +702,7 @@
     </detail-block-switch>
 
     <!-- 选择委托方组件 -->
-    <sample-dialog v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
   </app-container>
 </template>
 
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index d4a4c0f..89a05a6 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -17,8 +17,8 @@
   sampleModel: '', // 型号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
-  startTime: '1', // 检定开始时间
-  endTime: '1', // 检定结束时间
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
   offset: 1,
   limit: 20,
 })
diff --git a/src/views/customer/sample/list/sampleDialog.vue b/src/views/customer/sample/list/sampleDialog.vue
deleted file mode 100644
index a5a371b..0000000
--- a/src/views/customer/sample/list/sampleDialog.vue
+++ /dev/null
@@ -1,227 +0,0 @@
-<script setup lang="ts" name="sampleDialog">
-import { computed, getCurrentInstance, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ICustomer, ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getCustomerList } from '@/api/customer/customer'
-import { getDictByCode } from '@/api/system/dict'
-const props = defineProps({
-  visible: {
-    type: Boolean,
-    default: false,
-  },
-})
-const emits = defineEmits(['changeVisible', 'confirmCheckout'])
-
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set(val) {
-    emits('changeVisible', val)
-  },
-})
-
-// 查询条件
-const listQuery: Ref<ICustomerQuery> = ref({
-  bussinessSize: '', // 业务规模
-  customerName: '', // 公司名称
-  customerNo: '', // 客户编号
-  grade: '', // 履约评级
-  offset: 1,
-  limit: 20,
-})
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
-// const companySizeList = ref<dictType[]>([]) // 公司规模列表
-const businessSizeList = ref<dictType[]>([]) // 业务规模列表
-const gradeList = ref<dictType[]>([]) // 履约评级列表
-// const evaluationList = ref<dictType[]>([]) // 整体评价列表
-function getDict() {
-  // // 获取公司规模
-  // getDictByCode('companySize').then((response) => {
-  //   companySizeList.value = response.data
-  // })
-  // 获取业务规模
-  getDictByCode('businessSize').then((response) => {
-    businessSizeList.value = response.data
-  })
-  // 获取履约评级
-  getDictByCode('grade').then((response) => {
-    gradeList.value = response.data
-  })
-  // // 获取整体评价
-  // getDictByCode('evaluation').then((response) => {
-  //   evaluationList.value = response.data
-  // })
-}
-getDict()
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '客户编号', value: 'customerNo', width: '160', align: 'center' },
-  { text: '客户名称', value: 'customerName', width: '120', align: 'center' },
-  { text: '公司规模', value: 'companySizeName', align: 'center' },
-  { text: '业务规模', value: 'businessSizeName', align: 'center' },
-  { text: '履约评级', value: 'gradeName', align: 'center' },
-  { text: '整体评价', value: 'evaluationName', align: 'center' },
-  { text: '公司地址', value: 'briefName', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
-  { text: '备注', value: 'remark', align: 'center' },
-])
-// 表格数据
-const list = ref<ICustomer[]>([])
-// 总数
-const total = ref(0)
-// 表格加载状态
-const loadingTable = ref(false)
-// 选中的内容
-const checkoutList = ref<string[]>([])
-
-// 数据查询
-function fetchData(isNowPage = false) {
-  // loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getCustomerList(listQuery.value).then((response) => {
-    // 模拟数据
-    response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-    list.value = response.data.rows.map((item: ICustomer) => {
-      if (item.companyProvinceName && item.companyCityName) {
-        item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-      }
-      else {
-        item.briefName = item.companyProvinceName || item.companyCityName
-      }
-      return item
-    })
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-
-  // 模拟数据
-  // const response = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-  //   { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '2集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
-  //   { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '3集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  // list.value = response.map((item: ICustomer) => {
-  //   if (item.companyProvinceName && item.companyCityName) {
-  //     item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //   }
-  //   else {
-  //     item.briefName = item.companyProvinceName || item.companyCityName
-  //   }
-  //   return item
-  // })
-  // total.value = 50
-  // loadingTable.value = false
-}
-// 多选发生改变时
-function handleSelectionChange(e: any) {
-  checkoutList.value = e
-}
-// 点击搜索
-const searchList = () => {
-  fetchData(true)
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    bussinessSize: '', // 业务规模
-    customerName: '', // 公司名称
-    customerNo: '', // 客户编号
-    grade: '', // 履约评级
-    offset: 1,
-    limit: 20,
-  }
-}
-
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  fetchData(true)
-}
-
-// 点击取消
-const cancle = () => {
-  emits('changeVisible', false)
-}
-// 点击确定
-const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
-  }
-  emits('confirmCheckout', checkoutList.value)
-  cancle()
-}
-
-fetchData(true)
-</script>
-
-<template>
-  <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择委托方" @close="cancle">
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.customerNo"
-            placeholder="客户编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.customerName"
-            placeholder="公司名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
-            <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-select v-model="listQuery.grade" placeholder="履约评级">
-            <el-option v-for="item in gradeList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </search-item>
-      </search-area>
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="loadingTable"
-        is-showmulti-select
-        :is-multi="false"
-        @change="changePage"
-        @multiSelect="handleSelectionChange"
-      />
-      <template #footer>
-        <el-button type="primary" @click="clickConfirm">
-          确定
-        </el-button>
-        <el-button @click="cancle">
-          取消
-        </el-button>
-      </template>
-    </el-dialog>
-  </div>
-</template>
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
new file mode 100644
index 0000000..570b263
--- /dev/null
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -0,0 +1,227 @@
+<script setup lang="ts" name="SelectCustomer">
+import { computed, getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { ICustomer, ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getCustomerList } from '@/api/customer/customer'
+import { getDictByCode } from '@/api/system/dict'
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+
+const visibleDialog = computed({
+  get() {
+    return props.visible
+  },
+  set(val) {
+    emits('changeVisible', val)
+  },
+})
+
+// 查询条件
+const listQuery: Ref<ICustomerQuery> = ref({
+  bussinessSize: '', // 业务规模
+  customerName: '', // 公司名称
+  customerNo: '', // 客户编号
+  grade: '', // 履约评级
+  offset: 1,
+  limit: 20,
+})
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
+// const companySizeList = ref<dictType[]>([]) // 公司规模列表
+const businessSizeList = ref<dictType[]>([]) // 业务规模列表
+const gradeList = ref<dictType[]>([]) // 履约评级列表
+// const evaluationList = ref<dictType[]>([]) // 整体评价列表
+function getDict() {
+  // // 获取公司规模
+  // getDictByCode('companySize').then((response) => {
+  //   companySizeList.value = response.data
+  // })
+  // 获取业务规模
+  getDictByCode('businessSize').then((response) => {
+    businessSizeList.value = response.data
+  })
+  // 获取履约评级
+  getDictByCode('grade').then((response) => {
+    gradeList.value = response.data
+  })
+  // // 获取整体评价
+  // getDictByCode('evaluation').then((response) => {
+  //   evaluationList.value = response.data
+  // })
+}
+getDict()
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '客户编号', value: 'customerNo', width: '160', align: 'center' },
+  { text: '客户名称', value: 'customerName', width: '120', align: 'center' },
+  { text: '公司规模', value: 'companySizeName', align: 'center' },
+  { text: '业务规模', value: 'businessSizeName', align: 'center' },
+  { text: '履约评级', value: 'gradeName', align: 'center' },
+  { text: '整体评价', value: 'evaluationName', align: 'center' },
+  { text: '公司地址', value: 'briefName', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<ICustomer[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getCustomerList(listQuery.value).then((response) => {
+    // 模拟数据
+    response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
+    list.value = response.data.rows.map((item: ICustomer) => {
+      if (item.companyProvinceName && item.companyCityName) {
+        item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
+      }
+      else {
+        item.briefName = item.companyProvinceName || item.companyCityName
+      }
+      return item
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+
+  // 模拟数据
+  // const response = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
+  //   { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '2集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
+  //   { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '3集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
+  // list.value = response.map((item: ICustomer) => {
+  //   if (item.companyProvinceName && item.companyCityName) {
+  //     item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
+  //   }
+  //   else {
+  //     item.briefName = item.companyProvinceName || item.companyCityName
+  //   }
+  //   return item
+  // })
+  // total.value = 50
+  // loadingTable.value = false
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    bussinessSize: '', // 业务规模
+    customerName: '', // 公司名称
+    customerNo: '', // 客户编号
+    grade: '', // 履约评级
+    offset: 1,
+    limit: 20,
+  }
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+// 点击确定
+const clickConfirm = () => {
+  console.log(checkoutList.value)
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+fetchData(true)
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择委托方" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.customerNo"
+            placeholder="客户编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.customerName"
+            placeholder="公司名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
+            <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-select v-model="listQuery.grade" placeholder="履约评级">
+            <el-option v-for="item in gradeList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirm">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>