diff --git a/src/views/business/subpackage/apply/components/selectSample.vue b/src/views/business/subpackage/apply/components/selectSample.vue
index 137aa0f..651eabb 100644
--- a/src/views/business/subpackage/apply/components/selectSample.vue
+++ b/src/views/business/subpackage/apply/components/selectSample.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   },
+  isUseCustomerNo: { // 是否使用分包方编号
+    typeof: Boolean,
+    default: true,
+  },
 })
 
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
@@ -35,7 +39,7 @@
 // 查询条件
 const listQuery: Ref<ISampleList> = ref({
   id: '',
-  orderCode: '',	// 原始记录单编号
+  orderCode: '',	// 委托书编号
   sampleName: '',	// 样品名称
   sampleNo: '',	// 样品编号
   customerNo: '', // 委托方编号、委托方代码
@@ -49,7 +53,8 @@
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
-  { text: '分包方编号', value: 'customerNo', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '分包方编号', value: 'customerNo', align: 'center', width: '160' },
   { text: '分包方名称', value: 'customerName', align: 'center' },
   { text: '样品型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '180px' },
@@ -73,7 +78,9 @@
   }
   // listQuery.value.customerId = props.customerId
   // listQuery.value.id = props.orderId
-  listQuery.value.customerNo = props.customerNo
+  if (props.isUseCustomerNo) {
+    listQuery.value.customerNo = props.customerNo
+  }
   listPageBySubpackage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -98,7 +105,7 @@
 const clearList = () => {
   listQuery.value = {
     id: '',
-    orderCode: '',	// 原始记录单编号
+    orderCode: '',	// 委托书编号
     sampleName: '',	// 样品名称
     sampleNo: '',	// 样品编号
     customerNo: '', // 委托方id
@@ -157,16 +164,24 @@
         :need-clear="true"
         @search="searchList" @clear="clearList"
       >
-        <!-- <search-item>
+        <search-item>
           <el-input
-            v-model.trim="listQuery.customerNo"
-            placeholder="委托方编号"
+            v-model.trim="listQuery.orderCode"
+            placeholder="委托书编号"
             class="short-input"
             clearable
           />
         </search-item>
         <search-item>
           <el-input
+            v-model.trim="listQuery.customerNo"
+            placeholder="分包方编号"
+            class="short-input"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
             v-model.trim="listQuery.customerName"
             placeholder="委托方名称"
             class="short-input"

diff --git a/src/views/business/subpackage/apply/components/selectSample.vue b/src/views/business/subpackage/apply/components/selectSample.vue
index 137aa0f..651eabb 100644
--- a/src/views/business/subpackage/apply/components/selectSample.vue
+++ b/src/views/business/subpackage/apply/components/selectSample.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   },
+  isUseCustomerNo: { // 是否使用分包方编号
+    typeof: Boolean,
+    default: true,
+  },
 })
 
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
@@ -35,7 +39,7 @@
 // 查询条件
 const listQuery: Ref<ISampleList> = ref({
   id: '',
-  orderCode: '',	// 原始记录单编号
+  orderCode: '',	// 委托书编号
   sampleName: '',	// 样品名称
   sampleNo: '',	// 样品编号
   customerNo: '', // 委托方编号、委托方代码
@@ -49,7 +53,8 @@
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
-  { text: '分包方编号', value: 'customerNo', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '分包方编号', value: 'customerNo', align: 'center', width: '160' },
   { text: '分包方名称', value: 'customerName', align: 'center' },
   { text: '样品型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '180px' },
@@ -73,7 +78,9 @@
   }
   // listQuery.value.customerId = props.customerId
   // listQuery.value.id = props.orderId
-  listQuery.value.customerNo = props.customerNo
+  if (props.isUseCustomerNo) {
+    listQuery.value.customerNo = props.customerNo
+  }
   listPageBySubpackage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -98,7 +105,7 @@
 const clearList = () => {
   listQuery.value = {
     id: '',
-    orderCode: '',	// 原始记录单编号
+    orderCode: '',	// 委托书编号
     sampleName: '',	// 样品名称
     sampleNo: '',	// 样品编号
     customerNo: '', // 委托方id
@@ -157,16 +164,24 @@
         :need-clear="true"
         @search="searchList" @clear="clearList"
       >
-        <!-- <search-item>
+        <search-item>
           <el-input
-            v-model.trim="listQuery.customerNo"
-            placeholder="委托方编号"
+            v-model.trim="listQuery.orderCode"
+            placeholder="委托书编号"
             class="short-input"
             clearable
           />
         </search-item>
         <search-item>
           <el-input
+            v-model.trim="listQuery.customerNo"
+            placeholder="分包方编号"
+            class="short-input"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
             v-model.trim="listQuery.customerName"
             placeholder="委托方名称"
             class="short-input"
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index cbf29a6..4e6553f 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -573,7 +573,7 @@
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
     <!-- 样品增加弹窗 -->
-    <select-sample v-model:visible="sampleVisible" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
     <!-- 项目选择 -->
     <select-project-approve
       v-model:visible="projectVisible" :form-id="detailForm.formId" @clickConfirmProject="clickConfirmProject"