diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 03edba9..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 03edba9..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-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>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 03edba9..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-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>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 03edba9..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-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>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index e5ccc22..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -7,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -65,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -221,30 +221,13 @@
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
     dataForm.value.orderId = val[0].id // 委托书id
     dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
     dataForm.value.customerId = val[0].id // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.postalCode = val[0].postalCode // 委托方邮编
-    dataForm.value.fax = val[0].fax // 委托方传真
-    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -388,10 +371,12 @@
   }
 }
 
+// 获取详情信息
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
-    dataForm.value = res.data
-    list.value = res.data.customerSampleInfoList
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
@@ -540,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -559,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -578,21 +569,9 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
                   <!-- <el-select
@@ -627,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -803,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 03edba9..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-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>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index e5ccc22..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -7,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -65,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -221,30 +221,13 @@
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
     dataForm.value.orderId = val[0].id // 委托书id
     dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
     dataForm.value.customerId = val[0].id // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.postalCode = val[0].postalCode // 委托方邮编
-    dataForm.value.fax = val[0].fax // 委托方传真
-    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -388,10 +371,12 @@
   }
 }
 
+// 获取详情信息
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
-    dataForm.value = res.data
-    list.value = res.data.customerSampleInfoList
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
@@ -540,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -559,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -578,21 +569,9 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
                   <!-- <el-select
@@ -627,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -803,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 9c56b8b..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -72,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 03edba9..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-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>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index e5ccc22..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -7,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -65,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -221,30 +221,13 @@
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
     dataForm.value.orderId = val[0].id // 委托书id
     dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
     dataForm.value.customerId = val[0].id // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.postalCode = val[0].postalCode // 委托方邮编
-    dataForm.value.fax = val[0].fax // 委托方传真
-    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -388,10 +371,12 @@
   }
 }
 
+// 获取详情信息
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
-    dataForm.value = res.data
-    list.value = res.data.customerSampleInfoList
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
@@ -540,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -559,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -578,21 +569,9 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
                   <!-- <el-select
@@ -627,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -803,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 9c56b8b..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -72,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 03edba9..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-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>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index e5ccc22..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -7,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -65,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -221,30 +221,13 @@
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
     dataForm.value.orderId = val[0].id // 委托书id
     dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
     dataForm.value.customerId = val[0].id // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.postalCode = val[0].postalCode // 委托方邮编
-    dataForm.value.fax = val[0].fax // 委托方传真
-    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -388,10 +371,12 @@
   }
 }
 
+// 获取详情信息
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
-    dataForm.value = res.data
-    list.value = res.data.customerSampleInfoList
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
@@ -540,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -559,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -578,21 +569,9 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
                   <!-- <el-select
@@ -627,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -803,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 9c56b8b..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -72,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  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' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+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.customerId = props.customerId
+  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 = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    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()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    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/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 03edba9..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-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>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index e5ccc22..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -7,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -65,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -221,30 +221,13 @@
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
     dataForm.value.orderId = val[0].id // 委托书id
     dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
     dataForm.value.customerId = val[0].id // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.postalCode = val[0].postalCode // 委托方邮编
-    dataForm.value.fax = val[0].fax // 委托方传真
-    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -388,10 +371,12 @@
   }
 }
 
+// 获取详情信息
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
-    dataForm.value = res.data
-    list.value = res.data.customerSampleInfoList
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
@@ -540,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -559,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -578,21 +569,9 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
                   <!-- <el-select
@@ -627,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -803,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 9c56b8b..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -72,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  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' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+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.customerId = props.customerId
+  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 = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    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()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    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/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 03edba9..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-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>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index e5ccc22..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -7,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -65,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -221,30 +221,13 @@
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
     dataForm.value.orderId = val[0].id // 委托书id
     dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
     dataForm.value.customerId = val[0].id // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.postalCode = val[0].postalCode // 委托方邮编
-    dataForm.value.fax = val[0].fax // 委托方传真
-    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -388,10 +371,12 @@
   }
 }
 
+// 获取详情信息
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
-    dataForm.value = res.data
-    list.value = res.data.customerSampleInfoList
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
@@ -540,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -559,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -578,21 +569,9 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
                   <!-- <el-select
@@ -627,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -803,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 9c56b8b..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -72,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  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' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+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.customerId = props.customerId
+  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 = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    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()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    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/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 03edba9..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-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>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index e5ccc22..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -7,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -65,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -221,30 +221,13 @@
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
     dataForm.value.orderId = val[0].id // 委托书id
     dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
     dataForm.value.customerId = val[0].id // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.postalCode = val[0].postalCode // 委托方邮编
-    dataForm.value.fax = val[0].fax // 委托方传真
-    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -388,10 +371,12 @@
   }
 }
 
+// 获取详情信息
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
-    dataForm.value = res.data
-    list.value = res.data.customerSampleInfoList
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
@@ -540,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -559,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -578,21 +569,9 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
                   <!-- <el-select
@@ -627,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -803,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 9c56b8b..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -72,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  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' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+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.customerId = props.customerId
+  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 = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    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()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    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/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 3b03275..d04456b 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -163,7 +163,7 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
+          <el-select v-model="listQuery.businessSize" placeholder="业务规模">
             <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
@@ -183,7 +183,16 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirm">
           确定

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 03edba9..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-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>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index e5ccc22..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -7,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -65,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -221,30 +221,13 @@
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
     dataForm.value.orderId = val[0].id // 委托书id
     dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
     dataForm.value.customerId = val[0].id // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.postalCode = val[0].postalCode // 委托方邮编
-    dataForm.value.fax = val[0].fax // 委托方传真
-    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -388,10 +371,12 @@
   }
 }
 
+// 获取详情信息
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
-    dataForm.value = res.data
-    list.value = res.data.customerSampleInfoList
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
@@ -540,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -559,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -578,21 +569,9 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
                   <!-- <el-select
@@ -627,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -803,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 9c56b8b..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -72,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  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' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+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.customerId = props.customerId
+  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 = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    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()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    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/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 3b03275..d04456b 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -163,7 +163,7 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
+          <el-select v-model="listQuery.businessSize" placeholder="业务规模">
             <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
@@ -183,7 +183,16 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirm">
           确定
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 519f0af..cceb09b 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -135,7 +135,7 @@
         @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 03edba9..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-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>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index e5ccc22..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -7,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -65,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -221,30 +221,13 @@
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
     dataForm.value.orderId = val[0].id // 委托书id
     dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
     dataForm.value.customerId = val[0].id // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.postalCode = val[0].postalCode // 委托方邮编
-    dataForm.value.fax = val[0].fax // 委托方传真
-    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -388,10 +371,12 @@
   }
 }
 
+// 获取详情信息
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
-    dataForm.value = res.data
-    list.value = res.data.customerSampleInfoList
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
@@ -540,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -559,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -578,21 +569,9 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
                   <!-- <el-select
@@ -627,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -803,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 9c56b8b..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -72,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  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' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+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.customerId = props.customerId
+  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 = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    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()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    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/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 3b03275..d04456b 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -163,7 +163,7 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
+          <el-select v-model="listQuery.businessSize" placeholder="业务规模">
             <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
@@ -183,7 +183,16 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirm">
           确定
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 519f0af..cceb09b 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -135,7 +135,7 @@
         @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/measure/train/components/selectMeasurePersonDialog.vue b/src/views/measure/train/components/selectMeasurePersonDialog.vue
index 30c3dc7..251b1e5 100644
--- a/src/views/measure/train/components/selectMeasurePersonDialog.vue
+++ b/src/views/measure/train/components/selectMeasurePersonDialog.vue
@@ -19,6 +19,7 @@
 })
 // 多选选中的内容
 const checkoutList = ref([])
+const singleChecked = ref('') // 单选选中id
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
@@ -80,7 +81,6 @@
 }
 // 多选选中
 const handleSelectionChange = (val: any) => {
-  console.log('多选', val)
   checkoutList.value = val
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -102,16 +102,6 @@
     emits('add', checkoutList.value)
     dialogFormVisible.value = false
   }
-  // if (select.value >= 0) {
-  //   const person = list.value.filter((item, index) => index == select.value)[0]
-  //   getStaffDetail(person).then((res) => {
-  //     if (res.code === 200) {
-  //       emits('add', res.data)
-  //       dialogFormVisible.value = false
-  //       reset()
-  //     }
-  //   })
-  // }
 }
 // 取消
 const resetForm = () => {
@@ -158,13 +148,14 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
-        <!-- <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
           </el-table-column>
-        </template> -->
+        </template>
       </normal-table>
     </div>
     <template #footer>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 03edba9..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-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>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index e5ccc22..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -7,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -65,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -221,30 +221,13 @@
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
     dataForm.value.orderId = val[0].id // 委托书id
     dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
     dataForm.value.customerId = val[0].id // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.postalCode = val[0].postalCode // 委托方邮编
-    dataForm.value.fax = val[0].fax // 委托方传真
-    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -388,10 +371,12 @@
   }
 }
 
+// 获取详情信息
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
-    dataForm.value = res.data
-    list.value = res.data.customerSampleInfoList
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
@@ -540,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -559,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -578,21 +569,9 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
                   <!-- <el-select
@@ -627,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -803,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 9c56b8b..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -72,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  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' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+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.customerId = props.customerId
+  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 = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    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()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    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/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 3b03275..d04456b 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -163,7 +163,7 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
+          <el-select v-model="listQuery.businessSize" placeholder="业务规模">
             <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
@@ -183,7 +183,16 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirm">
           确定
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 519f0af..cceb09b 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -135,7 +135,7 @@
         @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/measure/train/components/selectMeasurePersonDialog.vue b/src/views/measure/train/components/selectMeasurePersonDialog.vue
index 30c3dc7..251b1e5 100644
--- a/src/views/measure/train/components/selectMeasurePersonDialog.vue
+++ b/src/views/measure/train/components/selectMeasurePersonDialog.vue
@@ -19,6 +19,7 @@
 })
 // 多选选中的内容
 const checkoutList = ref([])
+const singleChecked = ref('') // 单选选中id
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
@@ -80,7 +81,6 @@
 }
 // 多选选中
 const handleSelectionChange = (val: any) => {
-  console.log('多选', val)
   checkoutList.value = val
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -102,16 +102,6 @@
     emits('add', checkoutList.value)
     dialogFormVisible.value = false
   }
-  // if (select.value >= 0) {
-  //   const person = list.value.filter((item, index) => index == select.value)[0]
-  //   getStaffDetail(person).then((res) => {
-  //     if (res.code === 200) {
-  //       emits('add', res.data)
-  //       dialogFormVisible.value = false
-  //       reset()
-  //     }
-  //   })
-  // }
 }
 // 取消
 const resetForm = () => {
@@ -158,13 +148,14 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
-        <!-- <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
           </el-table-column>
-        </template> -->
+        </template>
       </normal-table>
     </div>
     <template #footer>
diff --git a/src/views/measure/train/components/selectUser.vue b/src/views/measure/train/components/selectUser.vue
new file mode 100644
index 0000000..67eebdb
--- /dev/null
+++ b/src/views/measure/train/components/selectUser.vue
@@ -0,0 +1,237 @@
+<!-- 选择用户 -->
+<!-- 选择成员 -->
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
+import { getUserList } from '@/api/system/user'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
+})
+const emits = defineEmits(['update:visible', 'change'])
+const table = ref() // 表格ref
+
+// 表格表头
+const columns = ref<TableColumn[]>([
+  { text: '真实姓名', value: 'name', align: 'center' },
+  { text: '所在组织机构', value: 'deptName', align: 'center' },
+])
+
+// 表格数据
+const list = ref<IEmployees[]>([])
+
+const loading = ref(false)
+const total = ref(0)
+// 查询参数
+const listQuery = reactive({
+  keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
+  offset: 1,
+  limit: 10,
+  sort: 'id',
+  deptType: '',
+})
+const checkedList = ref([])
+// 多选的数据
+const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
+const closeDialog = () => {
+  emits('update:visible', false)
+}
+const visibleDialog = computed({
+  get() {
+    return props.visible
+  },
+  set() {
+    closeDialog()
+  },
+})
+
+watch(() => props.visible, (val) => {
+  // 清除上次选中
+  if (!val) {
+    table.value.clearMulti()
+  }
+})
+
+// 点击确定，保存选择的成员配置
+const saveDialog = () => {
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
+}
+
+const select = ref('')
+// 获取列表数据
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
+  getUserList(listQuery).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    loading.value = false
+  })
+}
+
+// 多选
+const multiSelect = (val: any) => {
+  multipleTable.value = val
+}
+
+// 查询数据
+const search = () => {
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
+
+onMounted(() => {
+  // 获取列表数据
+  fetchData(true)
+})
+</script>
+
+<template>
+  <div class="select-emplotees-dialog">
+    <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table-area">
+        <!-- 筛选条件 -->
+        <search-area @search="search">
+          <search-item>
+            <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
+          </search-item>
+        </search-area>
+        <!-- 表头标题 -->
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
+          <!-- 查询结果Table显示 -->
+          <normal-table
+            ref="table"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
+          >
+            <!-- 序号 -->
+            <template #preColumns>
+              <el-table-column label="#" width="55" align="center">
+                <template #default="scope">
+                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
+            </template>
+            <!-- 状态 -->
+            <template #columns>
+              <el-table-column label="状态" align="center" width="80">
+                <template #default="scope">
+                  <el-tag :type="scope.row.statusName === '启用' ? 'success' : 'danger'">
+                    {{ scope.row.statusName }}
+                  </el-tag>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+      <!-- </div> -->
+      <template #footer>
+        <el-button @click="closeDialog">
+          取 消
+        </el-button>
+        <el-button type="primary" @click="saveDialog">
+          确 定
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss">
+@import "@/css/dialog.css";
+
+.chengyuan-dialog {
+  .el-table .cell {
+    white-space: nowrap;
+  }
+
+  .el-dialog__body {
+    display: flex;
+    overflow: auto;
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+.chengyuan-dialog {
+  width: 100%;
+
+  .left-container {
+    white-space: nowrap;
+    height: 100%;
+  }
+
+  .table-area {
+    flex: 1;
+    overflow: auto;
+
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
+    .pagination {
+      margin-top: 10px;
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+    }
+  }
+}
+</style>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 03edba9..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-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>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index e5ccc22..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -7,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -65,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -221,30 +221,13 @@
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
     dataForm.value.orderId = val[0].id // 委托书id
     dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
     dataForm.value.customerId = val[0].id // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.postalCode = val[0].postalCode // 委托方邮编
-    dataForm.value.fax = val[0].fax // 委托方传真
-    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -388,10 +371,12 @@
   }
 }
 
+// 获取详情信息
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
-    dataForm.value = res.data
-    list.value = res.data.customerSampleInfoList
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
@@ -540,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -559,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -578,21 +569,9 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
                   <!-- <el-select
@@ -627,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -803,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 9c56b8b..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -72,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  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' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+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.customerId = props.customerId
+  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 = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    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()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    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/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 3b03275..d04456b 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -163,7 +163,7 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
+          <el-select v-model="listQuery.businessSize" placeholder="业务规模">
             <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
@@ -183,7 +183,16 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirm">
           确定
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 519f0af..cceb09b 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -135,7 +135,7 @@
         @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/measure/train/components/selectMeasurePersonDialog.vue b/src/views/measure/train/components/selectMeasurePersonDialog.vue
index 30c3dc7..251b1e5 100644
--- a/src/views/measure/train/components/selectMeasurePersonDialog.vue
+++ b/src/views/measure/train/components/selectMeasurePersonDialog.vue
@@ -19,6 +19,7 @@
 })
 // 多选选中的内容
 const checkoutList = ref([])
+const singleChecked = ref('') // 单选选中id
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
@@ -80,7 +81,6 @@
 }
 // 多选选中
 const handleSelectionChange = (val: any) => {
-  console.log('多选', val)
   checkoutList.value = val
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -102,16 +102,6 @@
     emits('add', checkoutList.value)
     dialogFormVisible.value = false
   }
-  // if (select.value >= 0) {
-  //   const person = list.value.filter((item, index) => index == select.value)[0]
-  //   getStaffDetail(person).then((res) => {
-  //     if (res.code === 200) {
-  //       emits('add', res.data)
-  //       dialogFormVisible.value = false
-  //       reset()
-  //     }
-  //   })
-  // }
 }
 // 取消
 const resetForm = () => {
@@ -158,13 +148,14 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
-        <!-- <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
           </el-table-column>
-        </template> -->
+        </template>
       </normal-table>
     </div>
     <template #footer>
diff --git a/src/views/measure/train/components/selectUser.vue b/src/views/measure/train/components/selectUser.vue
new file mode 100644
index 0000000..67eebdb
--- /dev/null
+++ b/src/views/measure/train/components/selectUser.vue
@@ -0,0 +1,237 @@
+<!-- 选择用户 -->
+<!-- 选择成员 -->
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
+import { getUserList } from '@/api/system/user'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
+})
+const emits = defineEmits(['update:visible', 'change'])
+const table = ref() // 表格ref
+
+// 表格表头
+const columns = ref<TableColumn[]>([
+  { text: '真实姓名', value: 'name', align: 'center' },
+  { text: '所在组织机构', value: 'deptName', align: 'center' },
+])
+
+// 表格数据
+const list = ref<IEmployees[]>([])
+
+const loading = ref(false)
+const total = ref(0)
+// 查询参数
+const listQuery = reactive({
+  keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
+  offset: 1,
+  limit: 10,
+  sort: 'id',
+  deptType: '',
+})
+const checkedList = ref([])
+// 多选的数据
+const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
+const closeDialog = () => {
+  emits('update:visible', false)
+}
+const visibleDialog = computed({
+  get() {
+    return props.visible
+  },
+  set() {
+    closeDialog()
+  },
+})
+
+watch(() => props.visible, (val) => {
+  // 清除上次选中
+  if (!val) {
+    table.value.clearMulti()
+  }
+})
+
+// 点击确定，保存选择的成员配置
+const saveDialog = () => {
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
+}
+
+const select = ref('')
+// 获取列表数据
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
+  getUserList(listQuery).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    loading.value = false
+  })
+}
+
+// 多选
+const multiSelect = (val: any) => {
+  multipleTable.value = val
+}
+
+// 查询数据
+const search = () => {
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
+
+onMounted(() => {
+  // 获取列表数据
+  fetchData(true)
+})
+</script>
+
+<template>
+  <div class="select-emplotees-dialog">
+    <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table-area">
+        <!-- 筛选条件 -->
+        <search-area @search="search">
+          <search-item>
+            <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
+          </search-item>
+        </search-area>
+        <!-- 表头标题 -->
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
+          <!-- 查询结果Table显示 -->
+          <normal-table
+            ref="table"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
+          >
+            <!-- 序号 -->
+            <template #preColumns>
+              <el-table-column label="#" width="55" align="center">
+                <template #default="scope">
+                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
+            </template>
+            <!-- 状态 -->
+            <template #columns>
+              <el-table-column label="状态" align="center" width="80">
+                <template #default="scope">
+                  <el-tag :type="scope.row.statusName === '启用' ? 'success' : 'danger'">
+                    {{ scope.row.statusName }}
+                  </el-tag>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+      <!-- </div> -->
+      <template #footer>
+        <el-button @click="closeDialog">
+          取 消
+        </el-button>
+        <el-button type="primary" @click="saveDialog">
+          确 定
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss">
+@import "@/css/dialog.css";
+
+.chengyuan-dialog {
+  .el-table .cell {
+    white-space: nowrap;
+  }
+
+  .el-dialog__body {
+    display: flex;
+    overflow: auto;
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+.chengyuan-dialog {
+  width: 100%;
+
+  .left-container {
+    white-space: nowrap;
+    height: 100%;
+  }
+
+  .table-area {
+    flex: 1;
+    overflow: auto;
+
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
+    .pagination {
+      margin-top: 10px;
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 1ca6f89..2862696 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -2,9 +2,9 @@
 <script lang="ts" setup name="PlanAdd">
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import userListDialog from '../person/components/userListDialog.vue'
 import selectMeasurePersonDialog from './components/selectMeasurePersonDialog.vue'
 import type { IaddPersonListType, IformInlineType } from './plan_interface'
+import selectEmployeesDialog from '@/components/dialog/selectEmployeesDialog.vue'
 import DeptSelect from '@/components/DeptSelect/index.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import {
@@ -14,6 +14,8 @@
   getListUpdate,
 } from '@/api/system/plan'
 const infoId = ref('') // id
+const userVisible = ref(false) // 控制选择用户弹框显隐
+const checkedList = ref([]) // 选择的成员
 const pageType = ref('add') // 页面类型: add,edit, detail
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -84,7 +86,8 @@
 const userListRef = ref() // 选择人员dialog ref
 // 点击表单中的选择人员
 const selectPerson = () => {
-  userListRef.value.initDialog()
+  // userListRef.value.initDialog()
+  userVisible.value = true
 }
 // 增加行
 const addRow = () => {
@@ -135,8 +138,9 @@
   SelectionList.value = e
 }
 // 选择完负责人
-const confirmPerson = (object: IaddPersonListType) => {
-  formInline.value.director = object.name
+const confirmPerson = (val: IaddPersonListType) => {
+  formInline.value.director = val.name
+  userVisible.value = false
 }
 if (infoId.value && infoId.value !== '') {
   getListDetail({ id: infoId.value }).then((res) => {
@@ -303,7 +307,7 @@
                 type="datetime"
                 style="width: 100%;"
                 placeholder="培训时间"
-                format="YYYY/MM/DD HH:mm:ss"
+                format="YYYY-MM-DD HH:mm:ss"
                 value-format="YYYY-MM-DD HH:mm:ss"
                 :disabled="pageType === 'detail'"
               />
@@ -435,8 +439,14 @@
       </el-table>
     </detail-block>
   </app-container>
-  <!-- 选择用户列表组件 -->
-  <user-list-dialog ref="userListRef" @add="confirmPerson" />
+
   <!-- 选择计量人员组件列表 -->
   <select-measure-person-dialog ref="userTrainRef" @add="confirmSelectPerson" />
+  <!-- 用户弹框 -->
+  <select-employees-dialog
+    v-model:visible="userVisible"
+    v-model:data="checkedList"
+    :multi="false"
+    @change="confirmPerson"
+  />
 </template>