diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index f7ac81c..7f6e7ec 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -77,6 +77,7 @@
   })
 }
 
+// 分包页面 样品列表
 export function listPageBySubpackage(data: object) {
   return request({
     url: '/customer/sample/listPageBySubpackage',
@@ -85,3 +86,11 @@
   })
 }
 
+// 分包页面 申请审批通过列表
+export function listPageOutsourceProject(data: object) {
+  return request({
+    url: '/business/outsourceProject/apply/listPage',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index f7ac81c..7f6e7ec 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -77,6 +77,7 @@
   })
 }
 
+// 分包页面 样品列表
 export function listPageBySubpackage(data: object) {
   return request({
     url: '/customer/sample/listPageBySubpackage',
@@ -85,3 +86,11 @@
   })
 }
 
+// 分包页面 申请审批通过列表
+export function listPageOutsourceProject(data: object) {
+  return request({
+    url: '/business/outsourceProject/apply/listPage',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 941ee89..49d2fec 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -24,6 +24,6 @@
   BUSINESS_SUBPACKAGE_APPLY = 'ywglfbxmsq', // 分包项目申请
   BUSINESS_SUBPACKAGE_CHECK = 'ywglfbxmys', // 分包项目验收
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
-  BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzgsp', // 分包方资格资格审批
+  BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
 }

diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index f7ac81c..7f6e7ec 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -77,6 +77,7 @@
   })
 }
 
+// 分包页面 样品列表
 export function listPageBySubpackage(data: object) {
   return request({
     url: '/customer/sample/listPageBySubpackage',
@@ -85,3 +86,11 @@
   })
 }
 
+// 分包页面 申请审批通过列表
+export function listPageOutsourceProject(data: object) {
+  return request({
+    url: '/business/outsourceProject/apply/listPage',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 941ee89..49d2fec 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -24,6 +24,6 @@
   BUSINESS_SUBPACKAGE_APPLY = 'ywglfbxmsq', // 分包项目申请
   BUSINESS_SUBPACKAGE_CHECK = 'ywglfbxmys', // 分包项目验收
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
-  BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzgsp', // 分包方资格资格审批
+  BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
 }
diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue
index 18e5ea3..3afcdd3 100644
--- a/src/views/business/lab/components/distributeDialog.vue
+++ b/src/views/business/lab/components/distributeDialog.vue
@@ -65,14 +65,8 @@
       sampleDetail.value = res.data
       sampleDetail.value.laboratoryId = id
       // 证书类别
-      console.log(res.data)
       sampleDetail.value.certifications = [res.data.measureType]
-      // sampleDetail.value.deptName = res.data.measureProcessList[0].measureSegment
-      const ItemInfo = res.data.measureProcessList.filter((item: { measurePerson: any; measureSegmentId: any }) => {
-        return item.measurePerson == localStorage.name
-      })
-      console.log(ItemInfo)
-      sampleDetail.value.deptId = ItemInfo[0].measureSegmentId
+      sampleDetail.value.deptId = res.data.measureProcessList[0].measureSegmentId
       // 延迟使用，因为还没挂载
       nextTick(() => {
         _selectStaffDialog.value.fetchData()
@@ -90,7 +84,6 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string; measurePersonId: string; measureSegmentId: string }) => {
-  console.log(person)
   processNode.value.executivePerson = person.id
   processNode.value.executivePersonName = person.name
   processNode.value.measurePersonId = person.measurePersonId
@@ -113,21 +106,26 @@
     if (res.code == 200) {
       ElMessage.success('分配成功')
     }
+    cancel()
   })
   emit('close')
 }
 
 function cancel() {
   dialogVisible.value = false
+  // 清除之前的选择
+  processNode.value.executivePerson = ''
+  processNode.value.executivePersonName = ''
+  processNode.value.measurePersonId = ''
+  processNode.value.measureSegmentId = ''
 }
 getDict()
-
 // ----------------------- 以下是暴露的方法内容 ----------------------------
-defineExpose({ initDialog })
+defineExpose({ initDialog, choosePerson })
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" title="任务分发" width="700" @close="cancel">
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="任务分发" width="700" @close="cancel">
     <div class="simple-info">
       <div class="simple-info-line">
         <span class="label">样品名称:</span>
@@ -170,8 +168,7 @@
         取消
       </el-button>
     </template>
-    <!-- :dept-id="sampleDetail.deptId" -->
-    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :dept-id="sampleDetail.deptId" :data="[processNode.executivePerson]" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-if="choosePersonShow" ref="_selectStaffDialog" v-model:visible="choosePersonShow" :dept-id="sampleDetail.deptId" :data="[processNode.executivePerson]" :multi="false" @change="choosePersonOver" />
   </el-dialog>
 </template>
 

diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index f7ac81c..7f6e7ec 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -77,6 +77,7 @@
   })
 }
 
+// 分包页面 样品列表
 export function listPageBySubpackage(data: object) {
   return request({
     url: '/customer/sample/listPageBySubpackage',
@@ -85,3 +86,11 @@
   })
 }
 
+// 分包页面 申请审批通过列表
+export function listPageOutsourceProject(data: object) {
+  return request({
+    url: '/business/outsourceProject/apply/listPage',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 941ee89..49d2fec 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -24,6 +24,6 @@
   BUSINESS_SUBPACKAGE_APPLY = 'ywglfbxmsq', // 分包项目申请
   BUSINESS_SUBPACKAGE_CHECK = 'ywglfbxmys', // 分包项目验收
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
-  BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzgsp', // 分包方资格资格审批
+  BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
 }
diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue
index 18e5ea3..3afcdd3 100644
--- a/src/views/business/lab/components/distributeDialog.vue
+++ b/src/views/business/lab/components/distributeDialog.vue
@@ -65,14 +65,8 @@
       sampleDetail.value = res.data
       sampleDetail.value.laboratoryId = id
       // 证书类别
-      console.log(res.data)
       sampleDetail.value.certifications = [res.data.measureType]
-      // sampleDetail.value.deptName = res.data.measureProcessList[0].measureSegment
-      const ItemInfo = res.data.measureProcessList.filter((item: { measurePerson: any; measureSegmentId: any }) => {
-        return item.measurePerson == localStorage.name
-      })
-      console.log(ItemInfo)
-      sampleDetail.value.deptId = ItemInfo[0].measureSegmentId
+      sampleDetail.value.deptId = res.data.measureProcessList[0].measureSegmentId
       // 延迟使用，因为还没挂载
       nextTick(() => {
         _selectStaffDialog.value.fetchData()
@@ -90,7 +84,6 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string; measurePersonId: string; measureSegmentId: string }) => {
-  console.log(person)
   processNode.value.executivePerson = person.id
   processNode.value.executivePersonName = person.name
   processNode.value.measurePersonId = person.measurePersonId
@@ -113,21 +106,26 @@
     if (res.code == 200) {
       ElMessage.success('分配成功')
     }
+    cancel()
   })
   emit('close')
 }
 
 function cancel() {
   dialogVisible.value = false
+  // 清除之前的选择
+  processNode.value.executivePerson = ''
+  processNode.value.executivePersonName = ''
+  processNode.value.measurePersonId = ''
+  processNode.value.measureSegmentId = ''
 }
 getDict()
-
 // ----------------------- 以下是暴露的方法内容 ----------------------------
-defineExpose({ initDialog })
+defineExpose({ initDialog, choosePerson })
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" title="任务分发" width="700" @close="cancel">
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="任务分发" width="700" @close="cancel">
     <div class="simple-info">
       <div class="simple-info-line">
         <span class="label">样品名称:</span>
@@ -170,8 +168,7 @@
         取消
       </el-button>
     </template>
-    <!-- :dept-id="sampleDetail.deptId" -->
-    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :dept-id="sampleDetail.deptId" :data="[processNode.executivePerson]" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-if="choosePersonShow" ref="_selectStaffDialog" v-model:visible="choosePersonShow" :dept-id="sampleDetail.deptId" :data="[processNode.executivePerson]" :multi="false" @change="choosePersonOver" />
   </el-dialog>
 </template>
 
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index bd9c8ee..d6cc168 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -96,7 +96,7 @@
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
       return item
     })
-    total.value = res.total
+    total.value = res.data.total
     loadingTable.value = false
   })
 }
@@ -128,6 +128,7 @@
   timeRange.value = ['', '']
   fetchData(true)
 }
+const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
   $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)

diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index f7ac81c..7f6e7ec 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -77,6 +77,7 @@
   })
 }
 
+// 分包页面 样品列表
 export function listPageBySubpackage(data: object) {
   return request({
     url: '/customer/sample/listPageBySubpackage',
@@ -85,3 +86,11 @@
   })
 }
 
+// 分包页面 申请审批通过列表
+export function listPageOutsourceProject(data: object) {
+  return request({
+    url: '/business/outsourceProject/apply/listPage',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 941ee89..49d2fec 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -24,6 +24,6 @@
   BUSINESS_SUBPACKAGE_APPLY = 'ywglfbxmsq', // 分包项目申请
   BUSINESS_SUBPACKAGE_CHECK = 'ywglfbxmys', // 分包项目验收
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
-  BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzgsp', // 分包方资格资格审批
+  BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
 }
diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue
index 18e5ea3..3afcdd3 100644
--- a/src/views/business/lab/components/distributeDialog.vue
+++ b/src/views/business/lab/components/distributeDialog.vue
@@ -65,14 +65,8 @@
       sampleDetail.value = res.data
       sampleDetail.value.laboratoryId = id
       // 证书类别
-      console.log(res.data)
       sampleDetail.value.certifications = [res.data.measureType]
-      // sampleDetail.value.deptName = res.data.measureProcessList[0].measureSegment
-      const ItemInfo = res.data.measureProcessList.filter((item: { measurePerson: any; measureSegmentId: any }) => {
-        return item.measurePerson == localStorage.name
-      })
-      console.log(ItemInfo)
-      sampleDetail.value.deptId = ItemInfo[0].measureSegmentId
+      sampleDetail.value.deptId = res.data.measureProcessList[0].measureSegmentId
       // 延迟使用，因为还没挂载
       nextTick(() => {
         _selectStaffDialog.value.fetchData()
@@ -90,7 +84,6 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string; measurePersonId: string; measureSegmentId: string }) => {
-  console.log(person)
   processNode.value.executivePerson = person.id
   processNode.value.executivePersonName = person.name
   processNode.value.measurePersonId = person.measurePersonId
@@ -113,21 +106,26 @@
     if (res.code == 200) {
       ElMessage.success('分配成功')
     }
+    cancel()
   })
   emit('close')
 }
 
 function cancel() {
   dialogVisible.value = false
+  // 清除之前的选择
+  processNode.value.executivePerson = ''
+  processNode.value.executivePersonName = ''
+  processNode.value.measurePersonId = ''
+  processNode.value.measureSegmentId = ''
 }
 getDict()
-
 // ----------------------- 以下是暴露的方法内容 ----------------------------
-defineExpose({ initDialog })
+defineExpose({ initDialog, choosePerson })
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" title="任务分发" width="700" @close="cancel">
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="任务分发" width="700" @close="cancel">
     <div class="simple-info">
       <div class="simple-info-line">
         <span class="label">样品名称:</span>
@@ -170,8 +168,7 @@
         取消
       </el-button>
     </template>
-    <!-- :dept-id="sampleDetail.deptId" -->
-    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :dept-id="sampleDetail.deptId" :data="[processNode.executivePerson]" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-if="choosePersonShow" ref="_selectStaffDialog" v-model:visible="choosePersonShow" :dept-id="sampleDetail.deptId" :data="[processNode.executivePerson]" :multi="false" @change="choosePersonOver" />
   </el-dialog>
 </template>
 
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index bd9c8ee..d6cc168 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -96,7 +96,7 @@
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
       return item
     })
-    total.value = res.total
+    total.value = res.data.total
     loadingTable.value = false
   })
 }
@@ -128,6 +128,7 @@
   timeRange.value = ['', '']
   fetchData(true)
 }
+const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
   $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index fb6a3f5..d46a204 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -111,7 +111,7 @@
     <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
       批量添加
     </el-button>
-    <process-config v-if="orderId" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
     <template #footer>
       <el-button type="primary" @click="saveProcess">
         确定

diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index f7ac81c..7f6e7ec 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -77,6 +77,7 @@
   })
 }
 
+// 分包页面 样品列表
 export function listPageBySubpackage(data: object) {
   return request({
     url: '/customer/sample/listPageBySubpackage',
@@ -85,3 +86,11 @@
   })
 }
 
+// 分包页面 申请审批通过列表
+export function listPageOutsourceProject(data: object) {
+  return request({
+    url: '/business/outsourceProject/apply/listPage',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 941ee89..49d2fec 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -24,6 +24,6 @@
   BUSINESS_SUBPACKAGE_APPLY = 'ywglfbxmsq', // 分包项目申请
   BUSINESS_SUBPACKAGE_CHECK = 'ywglfbxmys', // 分包项目验收
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
-  BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzgsp', // 分包方资格资格审批
+  BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
 }
diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue
index 18e5ea3..3afcdd3 100644
--- a/src/views/business/lab/components/distributeDialog.vue
+++ b/src/views/business/lab/components/distributeDialog.vue
@@ -65,14 +65,8 @@
       sampleDetail.value = res.data
       sampleDetail.value.laboratoryId = id
       // 证书类别
-      console.log(res.data)
       sampleDetail.value.certifications = [res.data.measureType]
-      // sampleDetail.value.deptName = res.data.measureProcessList[0].measureSegment
-      const ItemInfo = res.data.measureProcessList.filter((item: { measurePerson: any; measureSegmentId: any }) => {
-        return item.measurePerson == localStorage.name
-      })
-      console.log(ItemInfo)
-      sampleDetail.value.deptId = ItemInfo[0].measureSegmentId
+      sampleDetail.value.deptId = res.data.measureProcessList[0].measureSegmentId
       // 延迟使用，因为还没挂载
       nextTick(() => {
         _selectStaffDialog.value.fetchData()
@@ -90,7 +84,6 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string; measurePersonId: string; measureSegmentId: string }) => {
-  console.log(person)
   processNode.value.executivePerson = person.id
   processNode.value.executivePersonName = person.name
   processNode.value.measurePersonId = person.measurePersonId
@@ -113,21 +106,26 @@
     if (res.code == 200) {
       ElMessage.success('分配成功')
     }
+    cancel()
   })
   emit('close')
 }
 
 function cancel() {
   dialogVisible.value = false
+  // 清除之前的选择
+  processNode.value.executivePerson = ''
+  processNode.value.executivePersonName = ''
+  processNode.value.measurePersonId = ''
+  processNode.value.measureSegmentId = ''
 }
 getDict()
-
 // ----------------------- 以下是暴露的方法内容 ----------------------------
-defineExpose({ initDialog })
+defineExpose({ initDialog, choosePerson })
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" title="任务分发" width="700" @close="cancel">
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="任务分发" width="700" @close="cancel">
     <div class="simple-info">
       <div class="simple-info-line">
         <span class="label">样品名称:</span>
@@ -170,8 +168,7 @@
         取消
       </el-button>
     </template>
-    <!-- :dept-id="sampleDetail.deptId" -->
-    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :dept-id="sampleDetail.deptId" :data="[processNode.executivePerson]" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-if="choosePersonShow" ref="_selectStaffDialog" v-model:visible="choosePersonShow" :dept-id="sampleDetail.deptId" :data="[processNode.executivePerson]" :multi="false" @change="choosePersonOver" />
   </el-dialog>
 </template>
 
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index bd9c8ee..d6cc168 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -96,7 +96,7 @@
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
       return item
     })
-    total.value = res.total
+    total.value = res.data.total
     loadingTable.value = false
   })
 }
@@ -128,6 +128,7 @@
   timeRange.value = ['', '']
   fetchData(true)
 }
+const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
   $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index fb6a3f5..d46a204 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -111,7 +111,7 @@
     <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
       批量添加
     </el-button>
-    <process-config v-if="orderId" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
     <template #footer>
       <el-button type="primary" @click="saveProcess">
         确定
diff --git a/src/views/business/subpackage/apply/components/selectProjectApprove.vue b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
new file mode 100644
index 0000000..523ae7b
--- /dev/null
+++ b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
@@ -0,0 +1,169 @@
+<!-- 分包资格审批选择列表 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { IListQueryRecord, IRecordList } from '../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getListPage } from '@/api/business/subpackage/record'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  formId: {
+    type: String,
+    default: '',
+  },
+})
+
+const emits = defineEmits(['changeVisible', 'clickConfirmProject'])
+
+// 查询条件
+const listQuery: Ref<IListQueryRecord> = ref({
+  businessSize: '', // 业务规模-字典code
+  formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPROVE, // 表单id
+  grade: '', // 	履约评级-字典code
+  ids: [],
+  outsourcerName: '', // 分包方公司名字
+  outsourcerNo: '', // 编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '分包项目编号', value: 'outsourcerNo', align: 'center', width: '160px' },
+  { text: '公司名称', value: 'outsourcerName', align: 'center', width: '160px' },
+  { text: '公司规模', value: 'outsourcerSize', align: 'center', width: '160px' },
+  { text: '业务规模', value: 'reciever', align: 'center', width: '180px' },
+  { text: '履约评级', value: 'grade', align: 'center', width: '180px' },
+  { text: '整体评价', value: 'businessSizeName', align: 'center', width: '180px' },
+  { text: '业务内容', value: 'deliverTime', align: 'center', width: '180px' },
+  { text: '公司地址', value: 'fullAddress', align: 'center', width: '180px' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<IRecordList[]>([])
+// 总数
+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
+  // listQuery.value.id = props.orderId
+  getListPage(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 = {
+    businessSize: '', // 业务规模-字典code
+    formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPROVE, // 表单id
+    grade: '', // 	履约评级-字典code
+    ids: [],
+    outsourcerName: '', // 分包方公司名字
+    outsourcerNo: '', // 编号
+    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 clickConfirmProject = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmProject', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择分包方" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.outsourcerNo" placeholder="分包方编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.outsourcerName" placeholder="分包方名称" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
+        :height="260" :is-multi="false" @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmProject">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>

diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index f7ac81c..7f6e7ec 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -77,6 +77,7 @@
   })
 }
 
+// 分包页面 样品列表
 export function listPageBySubpackage(data: object) {
   return request({
     url: '/customer/sample/listPageBySubpackage',
@@ -85,3 +86,11 @@
   })
 }
 
+// 分包页面 申请审批通过列表
+export function listPageOutsourceProject(data: object) {
+  return request({
+    url: '/business/outsourceProject/apply/listPage',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 941ee89..49d2fec 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -24,6 +24,6 @@
   BUSINESS_SUBPACKAGE_APPLY = 'ywglfbxmsq', // 分包项目申请
   BUSINESS_SUBPACKAGE_CHECK = 'ywglfbxmys', // 分包项目验收
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
-  BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzgsp', // 分包方资格资格审批
+  BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
 }
diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue
index 18e5ea3..3afcdd3 100644
--- a/src/views/business/lab/components/distributeDialog.vue
+++ b/src/views/business/lab/components/distributeDialog.vue
@@ -65,14 +65,8 @@
       sampleDetail.value = res.data
       sampleDetail.value.laboratoryId = id
       // 证书类别
-      console.log(res.data)
       sampleDetail.value.certifications = [res.data.measureType]
-      // sampleDetail.value.deptName = res.data.measureProcessList[0].measureSegment
-      const ItemInfo = res.data.measureProcessList.filter((item: { measurePerson: any; measureSegmentId: any }) => {
-        return item.measurePerson == localStorage.name
-      })
-      console.log(ItemInfo)
-      sampleDetail.value.deptId = ItemInfo[0].measureSegmentId
+      sampleDetail.value.deptId = res.data.measureProcessList[0].measureSegmentId
       // 延迟使用，因为还没挂载
       nextTick(() => {
         _selectStaffDialog.value.fetchData()
@@ -90,7 +84,6 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string; measurePersonId: string; measureSegmentId: string }) => {
-  console.log(person)
   processNode.value.executivePerson = person.id
   processNode.value.executivePersonName = person.name
   processNode.value.measurePersonId = person.measurePersonId
@@ -113,21 +106,26 @@
     if (res.code == 200) {
       ElMessage.success('分配成功')
     }
+    cancel()
   })
   emit('close')
 }
 
 function cancel() {
   dialogVisible.value = false
+  // 清除之前的选择
+  processNode.value.executivePerson = ''
+  processNode.value.executivePersonName = ''
+  processNode.value.measurePersonId = ''
+  processNode.value.measureSegmentId = ''
 }
 getDict()
-
 // ----------------------- 以下是暴露的方法内容 ----------------------------
-defineExpose({ initDialog })
+defineExpose({ initDialog, choosePerson })
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" title="任务分发" width="700" @close="cancel">
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="任务分发" width="700" @close="cancel">
     <div class="simple-info">
       <div class="simple-info-line">
         <span class="label">样品名称:</span>
@@ -170,8 +168,7 @@
         取消
       </el-button>
     </template>
-    <!-- :dept-id="sampleDetail.deptId" -->
-    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :dept-id="sampleDetail.deptId" :data="[processNode.executivePerson]" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-if="choosePersonShow" ref="_selectStaffDialog" v-model:visible="choosePersonShow" :dept-id="sampleDetail.deptId" :data="[processNode.executivePerson]" :multi="false" @change="choosePersonOver" />
   </el-dialog>
 </template>
 
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index bd9c8ee..d6cc168 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -96,7 +96,7 @@
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
       return item
     })
-    total.value = res.total
+    total.value = res.data.total
     loadingTable.value = false
   })
 }
@@ -128,6 +128,7 @@
   timeRange.value = ['', '']
   fetchData(true)
 }
+const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
   $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index fb6a3f5..d46a204 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -111,7 +111,7 @@
     <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
       批量添加
     </el-button>
-    <process-config v-if="orderId" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
     <template #footer>
       <el-button type="primary" @click="saveProcess">
         确定
diff --git a/src/views/business/subpackage/apply/components/selectProjectApprove.vue b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
new file mode 100644
index 0000000..523ae7b
--- /dev/null
+++ b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
@@ -0,0 +1,169 @@
+<!-- 分包资格审批选择列表 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { IListQueryRecord, IRecordList } from '../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getListPage } from '@/api/business/subpackage/record'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  formId: {
+    type: String,
+    default: '',
+  },
+})
+
+const emits = defineEmits(['changeVisible', 'clickConfirmProject'])
+
+// 查询条件
+const listQuery: Ref<IListQueryRecord> = ref({
+  businessSize: '', // 业务规模-字典code
+  formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPROVE, // 表单id
+  grade: '', // 	履约评级-字典code
+  ids: [],
+  outsourcerName: '', // 分包方公司名字
+  outsourcerNo: '', // 编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '分包项目编号', value: 'outsourcerNo', align: 'center', width: '160px' },
+  { text: '公司名称', value: 'outsourcerName', align: 'center', width: '160px' },
+  { text: '公司规模', value: 'outsourcerSize', align: 'center', width: '160px' },
+  { text: '业务规模', value: 'reciever', align: 'center', width: '180px' },
+  { text: '履约评级', value: 'grade', align: 'center', width: '180px' },
+  { text: '整体评价', value: 'businessSizeName', align: 'center', width: '180px' },
+  { text: '业务内容', value: 'deliverTime', align: 'center', width: '180px' },
+  { text: '公司地址', value: 'fullAddress', align: 'center', width: '180px' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<IRecordList[]>([])
+// 总数
+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
+  // listQuery.value.id = props.orderId
+  getListPage(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 = {
+    businessSize: '', // 业务规模-字典code
+    formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPROVE, // 表单id
+    grade: '', // 	履约评级-字典code
+    ids: [],
+    outsourcerName: '', // 分包方公司名字
+    outsourcerNo: '', // 编号
+    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 clickConfirmProject = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmProject', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择分包方" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.outsourcerNo" placeholder="分包方编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.outsourcerName" placeholder="分包方名称" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
+        :height="260" :is-multi="false" @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmProject">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/subpackage/apply/components/selectProjectNo.vue b/src/views/business/subpackage/apply/components/selectProjectNo.vue
new file mode 100644
index 0000000..9d145a8
--- /dev/null
+++ b/src/views/business/subpackage/apply/components/selectProjectNo.vue
@@ -0,0 +1,158 @@
+<!-- 分包管理项目选择列表 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { IListQueryProject, IProjectList } from '../../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageOutsourceProject } from '@/api/business/subpackage/apply'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  formId: {
+    type: String,
+    default: '',
+  },
+})
+
+const emits = defineEmits(['changeVisible', 'clickConfirmProject'])
+
+// 查询条件
+const listQuery: Ref<IListQueryProject> = ref({
+  formId: props.formId!,
+  projectName: '',
+  projectNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '项目编号', value: 'id', width: '160', align: 'center' },
+  { text: '项目名称', value: 'projectName', width: '120', align: 'center' },
+  { text: '申请时间', value: 'applicantTime', align: 'center' },
+  { text: '备注', value: 'applyRemark', align: 'center' },
+])
+// 表格数据
+const list = ref<IProjectList[]>([])
+// 总数
+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
+  // listQuery.value.id = props.orderId
+  listPageOutsourceProject(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 = {
+    formId: props.formId!,
+    projectName: '',
+    projectNo: '',
+    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 clickConfirmProject = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmProject', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择项目" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.projectNo" placeholder="项目编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.projectName" placeholder="项目名称" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
+        :height="260" :is-multi="false" @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmProject">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>

diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index f7ac81c..7f6e7ec 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -77,6 +77,7 @@
   })
 }
 
+// 分包页面 样品列表
 export function listPageBySubpackage(data: object) {
   return request({
     url: '/customer/sample/listPageBySubpackage',
@@ -85,3 +86,11 @@
   })
 }
 
+// 分包页面 申请审批通过列表
+export function listPageOutsourceProject(data: object) {
+  return request({
+    url: '/business/outsourceProject/apply/listPage',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 941ee89..49d2fec 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -24,6 +24,6 @@
   BUSINESS_SUBPACKAGE_APPLY = 'ywglfbxmsq', // 分包项目申请
   BUSINESS_SUBPACKAGE_CHECK = 'ywglfbxmys', // 分包项目验收
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
-  BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzgsp', // 分包方资格资格审批
+  BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
 }
diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue
index 18e5ea3..3afcdd3 100644
--- a/src/views/business/lab/components/distributeDialog.vue
+++ b/src/views/business/lab/components/distributeDialog.vue
@@ -65,14 +65,8 @@
       sampleDetail.value = res.data
       sampleDetail.value.laboratoryId = id
       // 证书类别
-      console.log(res.data)
       sampleDetail.value.certifications = [res.data.measureType]
-      // sampleDetail.value.deptName = res.data.measureProcessList[0].measureSegment
-      const ItemInfo = res.data.measureProcessList.filter((item: { measurePerson: any; measureSegmentId: any }) => {
-        return item.measurePerson == localStorage.name
-      })
-      console.log(ItemInfo)
-      sampleDetail.value.deptId = ItemInfo[0].measureSegmentId
+      sampleDetail.value.deptId = res.data.measureProcessList[0].measureSegmentId
       // 延迟使用，因为还没挂载
       nextTick(() => {
         _selectStaffDialog.value.fetchData()
@@ -90,7 +84,6 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string; measurePersonId: string; measureSegmentId: string }) => {
-  console.log(person)
   processNode.value.executivePerson = person.id
   processNode.value.executivePersonName = person.name
   processNode.value.measurePersonId = person.measurePersonId
@@ -113,21 +106,26 @@
     if (res.code == 200) {
       ElMessage.success('分配成功')
     }
+    cancel()
   })
   emit('close')
 }
 
 function cancel() {
   dialogVisible.value = false
+  // 清除之前的选择
+  processNode.value.executivePerson = ''
+  processNode.value.executivePersonName = ''
+  processNode.value.measurePersonId = ''
+  processNode.value.measureSegmentId = ''
 }
 getDict()
-
 // ----------------------- 以下是暴露的方法内容 ----------------------------
-defineExpose({ initDialog })
+defineExpose({ initDialog, choosePerson })
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" title="任务分发" width="700" @close="cancel">
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="任务分发" width="700" @close="cancel">
     <div class="simple-info">
       <div class="simple-info-line">
         <span class="label">样品名称:</span>
@@ -170,8 +168,7 @@
         取消
       </el-button>
     </template>
-    <!-- :dept-id="sampleDetail.deptId" -->
-    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :dept-id="sampleDetail.deptId" :data="[processNode.executivePerson]" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-if="choosePersonShow" ref="_selectStaffDialog" v-model:visible="choosePersonShow" :dept-id="sampleDetail.deptId" :data="[processNode.executivePerson]" :multi="false" @change="choosePersonOver" />
   </el-dialog>
 </template>
 
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index bd9c8ee..d6cc168 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -96,7 +96,7 @@
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
       return item
     })
-    total.value = res.total
+    total.value = res.data.total
     loadingTable.value = false
   })
 }
@@ -128,6 +128,7 @@
   timeRange.value = ['', '']
   fetchData(true)
 }
+const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
   $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index fb6a3f5..d46a204 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -111,7 +111,7 @@
     <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
       批量添加
     </el-button>
-    <process-config v-if="orderId" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
     <template #footer>
       <el-button type="primary" @click="saveProcess">
         确定
diff --git a/src/views/business/subpackage/apply/components/selectProjectApprove.vue b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
new file mode 100644
index 0000000..523ae7b
--- /dev/null
+++ b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
@@ -0,0 +1,169 @@
+<!-- 分包资格审批选择列表 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { IListQueryRecord, IRecordList } from '../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getListPage } from '@/api/business/subpackage/record'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  formId: {
+    type: String,
+    default: '',
+  },
+})
+
+const emits = defineEmits(['changeVisible', 'clickConfirmProject'])
+
+// 查询条件
+const listQuery: Ref<IListQueryRecord> = ref({
+  businessSize: '', // 业务规模-字典code
+  formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPROVE, // 表单id
+  grade: '', // 	履约评级-字典code
+  ids: [],
+  outsourcerName: '', // 分包方公司名字
+  outsourcerNo: '', // 编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '分包项目编号', value: 'outsourcerNo', align: 'center', width: '160px' },
+  { text: '公司名称', value: 'outsourcerName', align: 'center', width: '160px' },
+  { text: '公司规模', value: 'outsourcerSize', align: 'center', width: '160px' },
+  { text: '业务规模', value: 'reciever', align: 'center', width: '180px' },
+  { text: '履约评级', value: 'grade', align: 'center', width: '180px' },
+  { text: '整体评价', value: 'businessSizeName', align: 'center', width: '180px' },
+  { text: '业务内容', value: 'deliverTime', align: 'center', width: '180px' },
+  { text: '公司地址', value: 'fullAddress', align: 'center', width: '180px' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<IRecordList[]>([])
+// 总数
+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
+  // listQuery.value.id = props.orderId
+  getListPage(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 = {
+    businessSize: '', // 业务规模-字典code
+    formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPROVE, // 表单id
+    grade: '', // 	履约评级-字典code
+    ids: [],
+    outsourcerName: '', // 分包方公司名字
+    outsourcerNo: '', // 编号
+    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 clickConfirmProject = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmProject', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择分包方" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.outsourcerNo" placeholder="分包方编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.outsourcerName" placeholder="分包方名称" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
+        :height="260" :is-multi="false" @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmProject">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/subpackage/apply/components/selectProjectNo.vue b/src/views/business/subpackage/apply/components/selectProjectNo.vue
new file mode 100644
index 0000000..9d145a8
--- /dev/null
+++ b/src/views/business/subpackage/apply/components/selectProjectNo.vue
@@ -0,0 +1,158 @@
+<!-- 分包管理项目选择列表 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { IListQueryProject, IProjectList } from '../../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageOutsourceProject } from '@/api/business/subpackage/apply'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  formId: {
+    type: String,
+    default: '',
+  },
+})
+
+const emits = defineEmits(['changeVisible', 'clickConfirmProject'])
+
+// 查询条件
+const listQuery: Ref<IListQueryProject> = ref({
+  formId: props.formId!,
+  projectName: '',
+  projectNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '项目编号', value: 'id', width: '160', align: 'center' },
+  { text: '项目名称', value: 'projectName', width: '120', align: 'center' },
+  { text: '申请时间', value: 'applicantTime', align: 'center' },
+  { text: '备注', value: 'applyRemark', align: 'center' },
+])
+// 表格数据
+const list = ref<IProjectList[]>([])
+// 总数
+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
+  // listQuery.value.id = props.orderId
+  listPageOutsourceProject(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 = {
+    formId: props.formId!,
+    projectName: '',
+    projectNo: '',
+    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 clickConfirmProject = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmProject', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择项目" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.projectNo" placeholder="项目编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.projectName" placeholder="项目名称" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
+        :height="260" :is-multi="false" @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmProject">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/subpackage/apply/components/selectSample.vue b/src/views/business/subpackage/apply/components/selectSample.vue
index e15c8ba..336912a 100644
--- a/src/views/business/subpackage/apply/components/selectSample.vue
+++ b/src/views/business/subpackage/apply/components/selectSample.vue
@@ -1,4 +1,4 @@
-<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<!-- 分包管理样品列表 -->
 <script setup lang="ts" name="SelectSample">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -20,7 +20,12 @@
     type: String,
     default: '',
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
+
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
@@ -147,8 +152,25 @@
       >
         <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"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
             v-model.trim="listQuery.sampleNo"
             placeholder="样品编号"
+            class="short-input"
             clearable
           />
         </search-item>
@@ -156,6 +178,7 @@
           <el-input
             v-model.trim="listQuery.sampleName"
             placeholder="样品名称"
+            class="short-input"
             clearable
           />
         </search-item>
@@ -167,8 +190,7 @@
         :query="listQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
-        :page-sizes="[20]"
+        :is-multi="isMulti"
         :height="260"
         @change="changePage"
         @multi-select="handleSelectionChange"
@@ -177,7 +199,7 @@
         <template #preColumns>
           <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
-              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
             </template>
           </el-table-column>
         </template>

diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index f7ac81c..7f6e7ec 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -77,6 +77,7 @@
   })
 }
 
+// 分包页面 样品列表
 export function listPageBySubpackage(data: object) {
   return request({
     url: '/customer/sample/listPageBySubpackage',
@@ -85,3 +86,11 @@
   })
 }
 
+// 分包页面 申请审批通过列表
+export function listPageOutsourceProject(data: object) {
+  return request({
+    url: '/business/outsourceProject/apply/listPage',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 941ee89..49d2fec 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -24,6 +24,6 @@
   BUSINESS_SUBPACKAGE_APPLY = 'ywglfbxmsq', // 分包项目申请
   BUSINESS_SUBPACKAGE_CHECK = 'ywglfbxmys', // 分包项目验收
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
-  BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzgsp', // 分包方资格资格审批
+  BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
 }
diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue
index 18e5ea3..3afcdd3 100644
--- a/src/views/business/lab/components/distributeDialog.vue
+++ b/src/views/business/lab/components/distributeDialog.vue
@@ -65,14 +65,8 @@
       sampleDetail.value = res.data
       sampleDetail.value.laboratoryId = id
       // 证书类别
-      console.log(res.data)
       sampleDetail.value.certifications = [res.data.measureType]
-      // sampleDetail.value.deptName = res.data.measureProcessList[0].measureSegment
-      const ItemInfo = res.data.measureProcessList.filter((item: { measurePerson: any; measureSegmentId: any }) => {
-        return item.measurePerson == localStorage.name
-      })
-      console.log(ItemInfo)
-      sampleDetail.value.deptId = ItemInfo[0].measureSegmentId
+      sampleDetail.value.deptId = res.data.measureProcessList[0].measureSegmentId
       // 延迟使用，因为还没挂载
       nextTick(() => {
         _selectStaffDialog.value.fetchData()
@@ -90,7 +84,6 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string; measurePersonId: string; measureSegmentId: string }) => {
-  console.log(person)
   processNode.value.executivePerson = person.id
   processNode.value.executivePersonName = person.name
   processNode.value.measurePersonId = person.measurePersonId
@@ -113,21 +106,26 @@
     if (res.code == 200) {
       ElMessage.success('分配成功')
     }
+    cancel()
   })
   emit('close')
 }
 
 function cancel() {
   dialogVisible.value = false
+  // 清除之前的选择
+  processNode.value.executivePerson = ''
+  processNode.value.executivePersonName = ''
+  processNode.value.measurePersonId = ''
+  processNode.value.measureSegmentId = ''
 }
 getDict()
-
 // ----------------------- 以下是暴露的方法内容 ----------------------------
-defineExpose({ initDialog })
+defineExpose({ initDialog, choosePerson })
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" title="任务分发" width="700" @close="cancel">
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="任务分发" width="700" @close="cancel">
     <div class="simple-info">
       <div class="simple-info-line">
         <span class="label">样品名称:</span>
@@ -170,8 +168,7 @@
         取消
       </el-button>
     </template>
-    <!-- :dept-id="sampleDetail.deptId" -->
-    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :dept-id="sampleDetail.deptId" :data="[processNode.executivePerson]" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-if="choosePersonShow" ref="_selectStaffDialog" v-model:visible="choosePersonShow" :dept-id="sampleDetail.deptId" :data="[processNode.executivePerson]" :multi="false" @change="choosePersonOver" />
   </el-dialog>
 </template>
 
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index bd9c8ee..d6cc168 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -96,7 +96,7 @@
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
       return item
     })
-    total.value = res.total
+    total.value = res.data.total
     loadingTable.value = false
   })
 }
@@ -128,6 +128,7 @@
   timeRange.value = ['', '']
   fetchData(true)
 }
+const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
   $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index fb6a3f5..d46a204 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -111,7 +111,7 @@
     <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
       批量添加
     </el-button>
-    <process-config v-if="orderId" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
     <template #footer>
       <el-button type="primary" @click="saveProcess">
         确定
diff --git a/src/views/business/subpackage/apply/components/selectProjectApprove.vue b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
new file mode 100644
index 0000000..523ae7b
--- /dev/null
+++ b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
@@ -0,0 +1,169 @@
+<!-- 分包资格审批选择列表 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { IListQueryRecord, IRecordList } from '../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getListPage } from '@/api/business/subpackage/record'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  formId: {
+    type: String,
+    default: '',
+  },
+})
+
+const emits = defineEmits(['changeVisible', 'clickConfirmProject'])
+
+// 查询条件
+const listQuery: Ref<IListQueryRecord> = ref({
+  businessSize: '', // 业务规模-字典code
+  formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPROVE, // 表单id
+  grade: '', // 	履约评级-字典code
+  ids: [],
+  outsourcerName: '', // 分包方公司名字
+  outsourcerNo: '', // 编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '分包项目编号', value: 'outsourcerNo', align: 'center', width: '160px' },
+  { text: '公司名称', value: 'outsourcerName', align: 'center', width: '160px' },
+  { text: '公司规模', value: 'outsourcerSize', align: 'center', width: '160px' },
+  { text: '业务规模', value: 'reciever', align: 'center', width: '180px' },
+  { text: '履约评级', value: 'grade', align: 'center', width: '180px' },
+  { text: '整体评价', value: 'businessSizeName', align: 'center', width: '180px' },
+  { text: '业务内容', value: 'deliverTime', align: 'center', width: '180px' },
+  { text: '公司地址', value: 'fullAddress', align: 'center', width: '180px' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<IRecordList[]>([])
+// 总数
+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
+  // listQuery.value.id = props.orderId
+  getListPage(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 = {
+    businessSize: '', // 业务规模-字典code
+    formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPROVE, // 表单id
+    grade: '', // 	履约评级-字典code
+    ids: [],
+    outsourcerName: '', // 分包方公司名字
+    outsourcerNo: '', // 编号
+    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 clickConfirmProject = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmProject', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择分包方" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.outsourcerNo" placeholder="分包方编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.outsourcerName" placeholder="分包方名称" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
+        :height="260" :is-multi="false" @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmProject">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/subpackage/apply/components/selectProjectNo.vue b/src/views/business/subpackage/apply/components/selectProjectNo.vue
new file mode 100644
index 0000000..9d145a8
--- /dev/null
+++ b/src/views/business/subpackage/apply/components/selectProjectNo.vue
@@ -0,0 +1,158 @@
+<!-- 分包管理项目选择列表 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { IListQueryProject, IProjectList } from '../../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageOutsourceProject } from '@/api/business/subpackage/apply'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  formId: {
+    type: String,
+    default: '',
+  },
+})
+
+const emits = defineEmits(['changeVisible', 'clickConfirmProject'])
+
+// 查询条件
+const listQuery: Ref<IListQueryProject> = ref({
+  formId: props.formId!,
+  projectName: '',
+  projectNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '项目编号', value: 'id', width: '160', align: 'center' },
+  { text: '项目名称', value: 'projectName', width: '120', align: 'center' },
+  { text: '申请时间', value: 'applicantTime', align: 'center' },
+  { text: '备注', value: 'applyRemark', align: 'center' },
+])
+// 表格数据
+const list = ref<IProjectList[]>([])
+// 总数
+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
+  // listQuery.value.id = props.orderId
+  listPageOutsourceProject(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 = {
+    formId: props.formId!,
+    projectName: '',
+    projectNo: '',
+    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 clickConfirmProject = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmProject', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择项目" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.projectNo" placeholder="项目编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.projectName" placeholder="项目名称" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
+        :height="260" :is-multi="false" @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmProject">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/subpackage/apply/components/selectSample.vue b/src/views/business/subpackage/apply/components/selectSample.vue
index e15c8ba..336912a 100644
--- a/src/views/business/subpackage/apply/components/selectSample.vue
+++ b/src/views/business/subpackage/apply/components/selectSample.vue
@@ -1,4 +1,4 @@
-<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<!-- 分包管理样品列表 -->
 <script setup lang="ts" name="SelectSample">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -20,7 +20,12 @@
     type: String,
     default: '',
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
+
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
@@ -147,8 +152,25 @@
       >
         <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"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
             v-model.trim="listQuery.sampleNo"
             placeholder="样品编号"
+            class="short-input"
             clearable
           />
         </search-item>
@@ -156,6 +178,7 @@
           <el-input
             v-model.trim="listQuery.sampleName"
             placeholder="样品名称"
+            class="short-input"
             clearable
           />
         </search-item>
@@ -167,8 +190,7 @@
         :query="listQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
-        :page-sizes="[20]"
+        :is-multi="isMulti"
         :height="260"
         @change="changePage"
         @multi-select="handleSelectionChange"
@@ -177,7 +199,7 @@
         <template #preColumns>
           <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
-              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 542e2aa..94b068f 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -3,9 +3,8 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ref } from 'vue'
-import { filter } from 'lodash'
 import type { IApplyDetail, ISampleList } from '../subpackage-interface'
-// import selectSampleDialog from './components/selectSampleDialog.vue'
+import selectProjectApprove from '../apply/components/selectProjectApprove.vue'
 import selectSample from './components/selectSample.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { detail, save, submit } from '@/api/business/subpackage/apply'
@@ -18,6 +17,7 @@
 const query = $route.query
 const ruleFormRef = ref<FormInstance>() as any
 const detailForm = ref<IApplyDetail>({
+  formId: query.formId as string,
   applicantName: '', // 申请名称
   applicantId: '', // 申请id
   applicantTime: '', // 申请时间
@@ -51,10 +51,10 @@
 })
 // 校验规则
 const formRules = ref({
-  projectName: [{ required: true, message: '分包项目名称必填', trigger: 'blur' }],
+  projectName: [{ required: true, message: '分包项目名称必填', trigger: ['blur', 'change'] }],
   outsourcerId: [{ required: true, message: '分包方编号必填', trigger: ['blur', 'change'] }],
   outsourcerName: [{ required: true, message: '公司名称必填', trigger: ['blur', 'change'] }],
-  outsourceReasonName: [{ required: true, message: '分包原因必填', trigger: ['blur', 'change'] }],
+  outsourceReason: [{ required: true, message: '分包原因必填', trigger: ['blur', 'change'] }],
   preCost: [{ required: true, message: '预计费用必填', trigger: ['blur', 'change'] }],
   preStartTime: [{ required: true, message: '预计开始时间必填', trigger: ['blur', 'change'] }],
   preEndTime: [{ required: true, message: '预计结束时间必填', trigger: ['blur', 'change'] }],
@@ -66,19 +66,13 @@
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '230' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'orderCode', align: 'center' },
-  { text: '委托书编号', value: 'manufacturingNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'customerNo', align: 'center' },
   { text: '委托单位', value: 'customerName', align: 'center' },
 ])
 
 const getDetail = () => {
   detail({ id: $route.params.id }).then((res) => {
-    // let interfaceStr = ''
-    // for (const key in res.data.sampleList[0]) {
-    //   const item = res.data[key]
-    //   interfaceStr += `${key}:${typeof (item)}\n`
-    // }
-    // console.log(interfaceStr)
     detailForm.value = res.data
     list.value = res.data.sampleList.filter((item: ISampleList) => {
       return item !== null
@@ -115,33 +109,29 @@
       const _list = list.value.map((item: any) => {
         return {
           orderId: item.orderId ? item.orderId : 0,
-          sampleId: item.sampleNo,
+          sampleId: item.id,
         }
       })
       const params = {
+        id: detailForm.value.id,
+        projectName: detailForm.value.projectName,
+        outsourcerName: detailForm.value.outsourcerName,
         applicantTime: detailForm.value.applicantTime,
         applyMinioFileName: detailForm.value.applyMinioFileName,
         applyProcessId: detailForm.value.applyProcessId,
         applyRemark: detailForm.value.applyRemark,
         outsourceReason: detailForm.value.outsourceReason,
         outsourceReasonName: detailForm.value.outsourceReasonName,
-        outsourcerId: 0,
+        outsourcerId: detailForm.value.outsourcerId,
+        checkTime: detailForm.value.checkTime,
+        checkConclusion: detailForm.value.checkConclusion,
         preCost: detailForm.value.preCost,
         preEndTime: detailForm.value.preEndTime,
         preStartTime: detailForm.value.preStartTime,
-        projectName: detailForm.value.projectName,
-        projectNo: '',
-        sampleList: [
-          // {
-          //   customerName: '',
-          //   manufacturingNo: '',
-          //   orderCode: '',
-          //   sampleModel: '',
-          //   sampleName: '',
-          //   sampleNo: '',
-          // },
-          ...list.value,
-        ],
+        projectNo: detailForm.value.projectNo,
+        checkMinioFileName: detailForm.value.checkMinioFileName,
+        checkRemark: detailForm.value.checkRemark,
+        checkProcessId: detailForm.value.checkProcessId,
         orderSampleList: [..._list],
       }
       save(params).then((res) => {
@@ -187,15 +177,17 @@
     return
   }
   list.value.push({
-    customerName: '', // 消费名称
-    manufacturingNo: '', // 编号
-    orderCode: '', // 订单code
-    sampleModel: '', // 样品模型
-    sampleName: '', // 样品名称
-    sampleNo: '', // 样品编号
+    orderCode: '',	// 原始记录单编号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    customerNo: '', // 委托方id
+    customerName: '', // 委托方名称
+    startTime: '',
+    endTime: '',
   })
 }
 const sampleVisible = ref(false)
+const projectVisible = ref(false)
 const isMulti = ref(false)
 const selectIndex = ref(0)
 // 点击选择
@@ -217,18 +209,44 @@
 const changeSampleVisible = (val: boolean) => {
   sampleVisible.value = val
 }
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
 // 选好样品
 const clickConfirmSample = (val: any) => {
   if (val && val.length) {
-    const index = list.value.findIndex((i: ISampleList) => val[0].sampleNo === i.sampleNo)
-    if (index !== -1) {
-      ElMessage.warning('此样品已添加过')
-      return
+    if (isMulti.value) {
+      val.forEach((item: ISampleList) => {
+        // 只添加列表里不存在的
+        const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+        if (index === -1) {
+          list.value.push(item)
+        }
+      })
     }
-    list.value.splice(selectIndex.value, 1, val[0])
+    else {
+      const index = list.value.findIndex((i: ISampleList) => val[0].sampleNo === i.sampleNo)
+      if (index !== -1) {
+        ElMessage.warning('此样品已添加过')
+        return
+      }
+      list.value.splice(selectIndex.value, 1, val[0])
+    }
   }
 }
 
+// 选择项目id
+const clickConfirmProject = (val: any) => {
+  // detailForm.value.checkTime = val[0].checkTime
+  // detailForm.value.projectName = val[0].projectName
+  // detailForm.value.outsourcerId = val[0].outsourcerId
+  // detailForm.value.projectNo = val[0].projectNo
+  detailForm.value.outsourcerId = val[0].outsourcerNo
+  detailForm.value.outsourcerName = val[0].outsourcerName
+}
+
 // 选中行
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
@@ -289,7 +307,7 @@
   }
   else {
     // 初始化编号,申请人,申请时间
-    detailForm.value.projectNo = '系统自动生成'
+    detailForm.value.projectNo = ''
     detailForm.value.createUser = window.localStorage.getItem('name')!
     detailForm.value.createTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
@@ -348,10 +366,8 @@
       >
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item label="分包项目编号:" prop="projectNo">
-              <el-input
-                v-model="detailForm.projectNo" disabled
-              />
+            <el-form-item label="分包项目编号:" prop="id">
+              <el-input v-model="detailForm.id" disabled placeholder="系统自动生成" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -380,24 +396,35 @@
             <el-form-item label="分包方编号:" prop="outsourcerId">
               <el-input
                 v-model="detailForm.outsourcerId"
-                :disabled="query.title === '详情'"
-              />
+                disabled
+              >
+                <template v-if="query.title !== '详情'" #append>
+                  <el-button
+                    size="small"
+                    @click="changeProjectVisible(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="公司名称:" prop="outsourcerName">
               <el-input
                 v-model="detailForm.outsourcerName"
-                :disabled="query.title === '详情'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="分包原因:" prop="outsourceReason">
-              <el-input
-                v-model="detailForm.outsourceReason"
-                :disabled="query.title === '详情'"
-              />
+              <el-select
+                v-model="detailForm.outsourceReason" :disabled="query.title === '详情'"
+              >
+                <el-option label="无检测能力" value="无检测能力" />
+                <el-option label="其他" value="其他" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -459,11 +486,11 @@
         </el-row>
       </el-form>
     </detail-page>
-    <detail-block title="样品列表">
+    <detail-block title="样品信息">
       <template v-if="query.title !== '详情'" #btns>
-        <!-- <el-button type="primary" @click="multiAdd">
+        <el-button type="primary" @click="multiAdd">
           批量添加
-        </el-button> -->
+        </el-button>
         <el-button type="primary" @click="addRow">
           增加行
         </el-button>
@@ -471,7 +498,6 @@
           删除行
         </el-button>
       </template>
-
       <el-table
         :data="list"
         border
@@ -506,8 +532,13 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
-    <!-- :order-id="detailForm.orderId" :customer-id="formInline.customerId" -->
-    <select-sample v-model:visible="sampleVisible" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+    <!-- 样品增加弹窗 -->
+    <select-sample v-model:visible="sampleVisible" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+    <!-- 项目选择 -->
+    <select-project-approve
+      v-model:visible="projectVisible" :form-id="detailForm.formId" @clickConfirmProject="clickConfirmProject"
+      @change-visible="changeProjectVisible(false)"
+    />
   </app-container>
 </template>
 

diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index f7ac81c..7f6e7ec 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -77,6 +77,7 @@
   })
 }
 
+// 分包页面 样品列表
 export function listPageBySubpackage(data: object) {
   return request({
     url: '/customer/sample/listPageBySubpackage',
@@ -85,3 +86,11 @@
   })
 }
 
+// 分包页面 申请审批通过列表
+export function listPageOutsourceProject(data: object) {
+  return request({
+    url: '/business/outsourceProject/apply/listPage',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 941ee89..49d2fec 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -24,6 +24,6 @@
   BUSINESS_SUBPACKAGE_APPLY = 'ywglfbxmsq', // 分包项目申请
   BUSINESS_SUBPACKAGE_CHECK = 'ywglfbxmys', // 分包项目验收
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
-  BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzgsp', // 分包方资格资格审批
+  BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
 }
diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue
index 18e5ea3..3afcdd3 100644
--- a/src/views/business/lab/components/distributeDialog.vue
+++ b/src/views/business/lab/components/distributeDialog.vue
@@ -65,14 +65,8 @@
       sampleDetail.value = res.data
       sampleDetail.value.laboratoryId = id
       // 证书类别
-      console.log(res.data)
       sampleDetail.value.certifications = [res.data.measureType]
-      // sampleDetail.value.deptName = res.data.measureProcessList[0].measureSegment
-      const ItemInfo = res.data.measureProcessList.filter((item: { measurePerson: any; measureSegmentId: any }) => {
-        return item.measurePerson == localStorage.name
-      })
-      console.log(ItemInfo)
-      sampleDetail.value.deptId = ItemInfo[0].measureSegmentId
+      sampleDetail.value.deptId = res.data.measureProcessList[0].measureSegmentId
       // 延迟使用，因为还没挂载
       nextTick(() => {
         _selectStaffDialog.value.fetchData()
@@ -90,7 +84,6 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string; measurePersonId: string; measureSegmentId: string }) => {
-  console.log(person)
   processNode.value.executivePerson = person.id
   processNode.value.executivePersonName = person.name
   processNode.value.measurePersonId = person.measurePersonId
@@ -113,21 +106,26 @@
     if (res.code == 200) {
       ElMessage.success('分配成功')
     }
+    cancel()
   })
   emit('close')
 }
 
 function cancel() {
   dialogVisible.value = false
+  // 清除之前的选择
+  processNode.value.executivePerson = ''
+  processNode.value.executivePersonName = ''
+  processNode.value.measurePersonId = ''
+  processNode.value.measureSegmentId = ''
 }
 getDict()
-
 // ----------------------- 以下是暴露的方法内容 ----------------------------
-defineExpose({ initDialog })
+defineExpose({ initDialog, choosePerson })
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" title="任务分发" width="700" @close="cancel">
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="任务分发" width="700" @close="cancel">
     <div class="simple-info">
       <div class="simple-info-line">
         <span class="label">样品名称:</span>
@@ -170,8 +168,7 @@
         取消
       </el-button>
     </template>
-    <!-- :dept-id="sampleDetail.deptId" -->
-    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :dept-id="sampleDetail.deptId" :data="[processNode.executivePerson]" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-if="choosePersonShow" ref="_selectStaffDialog" v-model:visible="choosePersonShow" :dept-id="sampleDetail.deptId" :data="[processNode.executivePerson]" :multi="false" @change="choosePersonOver" />
   </el-dialog>
 </template>
 
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index bd9c8ee..d6cc168 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -96,7 +96,7 @@
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
       return item
     })
-    total.value = res.total
+    total.value = res.data.total
     loadingTable.value = false
   })
 }
@@ -128,6 +128,7 @@
   timeRange.value = ['', '']
   fetchData(true)
 }
+const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
   $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index fb6a3f5..d46a204 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -111,7 +111,7 @@
     <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
       批量添加
     </el-button>
-    <process-config v-if="orderId" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
     <template #footer>
       <el-button type="primary" @click="saveProcess">
         确定
diff --git a/src/views/business/subpackage/apply/components/selectProjectApprove.vue b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
new file mode 100644
index 0000000..523ae7b
--- /dev/null
+++ b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
@@ -0,0 +1,169 @@
+<!-- 分包资格审批选择列表 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { IListQueryRecord, IRecordList } from '../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getListPage } from '@/api/business/subpackage/record'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  formId: {
+    type: String,
+    default: '',
+  },
+})
+
+const emits = defineEmits(['changeVisible', 'clickConfirmProject'])
+
+// 查询条件
+const listQuery: Ref<IListQueryRecord> = ref({
+  businessSize: '', // 业务规模-字典code
+  formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPROVE, // 表单id
+  grade: '', // 	履约评级-字典code
+  ids: [],
+  outsourcerName: '', // 分包方公司名字
+  outsourcerNo: '', // 编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '分包项目编号', value: 'outsourcerNo', align: 'center', width: '160px' },
+  { text: '公司名称', value: 'outsourcerName', align: 'center', width: '160px' },
+  { text: '公司规模', value: 'outsourcerSize', align: 'center', width: '160px' },
+  { text: '业务规模', value: 'reciever', align: 'center', width: '180px' },
+  { text: '履约评级', value: 'grade', align: 'center', width: '180px' },
+  { text: '整体评价', value: 'businessSizeName', align: 'center', width: '180px' },
+  { text: '业务内容', value: 'deliverTime', align: 'center', width: '180px' },
+  { text: '公司地址', value: 'fullAddress', align: 'center', width: '180px' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<IRecordList[]>([])
+// 总数
+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
+  // listQuery.value.id = props.orderId
+  getListPage(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 = {
+    businessSize: '', // 业务规模-字典code
+    formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPROVE, // 表单id
+    grade: '', // 	履约评级-字典code
+    ids: [],
+    outsourcerName: '', // 分包方公司名字
+    outsourcerNo: '', // 编号
+    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 clickConfirmProject = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmProject', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择分包方" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.outsourcerNo" placeholder="分包方编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.outsourcerName" placeholder="分包方名称" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
+        :height="260" :is-multi="false" @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmProject">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/subpackage/apply/components/selectProjectNo.vue b/src/views/business/subpackage/apply/components/selectProjectNo.vue
new file mode 100644
index 0000000..9d145a8
--- /dev/null
+++ b/src/views/business/subpackage/apply/components/selectProjectNo.vue
@@ -0,0 +1,158 @@
+<!-- 分包管理项目选择列表 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { IListQueryProject, IProjectList } from '../../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageOutsourceProject } from '@/api/business/subpackage/apply'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  formId: {
+    type: String,
+    default: '',
+  },
+})
+
+const emits = defineEmits(['changeVisible', 'clickConfirmProject'])
+
+// 查询条件
+const listQuery: Ref<IListQueryProject> = ref({
+  formId: props.formId!,
+  projectName: '',
+  projectNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '项目编号', value: 'id', width: '160', align: 'center' },
+  { text: '项目名称', value: 'projectName', width: '120', align: 'center' },
+  { text: '申请时间', value: 'applicantTime', align: 'center' },
+  { text: '备注', value: 'applyRemark', align: 'center' },
+])
+// 表格数据
+const list = ref<IProjectList[]>([])
+// 总数
+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
+  // listQuery.value.id = props.orderId
+  listPageOutsourceProject(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 = {
+    formId: props.formId!,
+    projectName: '',
+    projectNo: '',
+    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 clickConfirmProject = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmProject', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择项目" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.projectNo" placeholder="项目编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.projectName" placeholder="项目名称" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
+        :height="260" :is-multi="false" @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmProject">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/subpackage/apply/components/selectSample.vue b/src/views/business/subpackage/apply/components/selectSample.vue
index e15c8ba..336912a 100644
--- a/src/views/business/subpackage/apply/components/selectSample.vue
+++ b/src/views/business/subpackage/apply/components/selectSample.vue
@@ -1,4 +1,4 @@
-<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<!-- 分包管理样品列表 -->
 <script setup lang="ts" name="SelectSample">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -20,7 +20,12 @@
     type: String,
     default: '',
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
+
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
@@ -147,8 +152,25 @@
       >
         <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"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
             v-model.trim="listQuery.sampleNo"
             placeholder="样品编号"
+            class="short-input"
             clearable
           />
         </search-item>
@@ -156,6 +178,7 @@
           <el-input
             v-model.trim="listQuery.sampleName"
             placeholder="样品名称"
+            class="short-input"
             clearable
           />
         </search-item>
@@ -167,8 +190,7 @@
         :query="listQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
-        :page-sizes="[20]"
+        :is-multi="isMulti"
         :height="260"
         @change="changePage"
         @multi-select="handleSelectionChange"
@@ -177,7 +199,7 @@
         <template #preColumns>
           <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
-              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 542e2aa..94b068f 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -3,9 +3,8 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ref } from 'vue'
-import { filter } from 'lodash'
 import type { IApplyDetail, ISampleList } from '../subpackage-interface'
-// import selectSampleDialog from './components/selectSampleDialog.vue'
+import selectProjectApprove from '../apply/components/selectProjectApprove.vue'
 import selectSample from './components/selectSample.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { detail, save, submit } from '@/api/business/subpackage/apply'
@@ -18,6 +17,7 @@
 const query = $route.query
 const ruleFormRef = ref<FormInstance>() as any
 const detailForm = ref<IApplyDetail>({
+  formId: query.formId as string,
   applicantName: '', // 申请名称
   applicantId: '', // 申请id
   applicantTime: '', // 申请时间
@@ -51,10 +51,10 @@
 })
 // 校验规则
 const formRules = ref({
-  projectName: [{ required: true, message: '分包项目名称必填', trigger: 'blur' }],
+  projectName: [{ required: true, message: '分包项目名称必填', trigger: ['blur', 'change'] }],
   outsourcerId: [{ required: true, message: '分包方编号必填', trigger: ['blur', 'change'] }],
   outsourcerName: [{ required: true, message: '公司名称必填', trigger: ['blur', 'change'] }],
-  outsourceReasonName: [{ required: true, message: '分包原因必填', trigger: ['blur', 'change'] }],
+  outsourceReason: [{ required: true, message: '分包原因必填', trigger: ['blur', 'change'] }],
   preCost: [{ required: true, message: '预计费用必填', trigger: ['blur', 'change'] }],
   preStartTime: [{ required: true, message: '预计开始时间必填', trigger: ['blur', 'change'] }],
   preEndTime: [{ required: true, message: '预计结束时间必填', trigger: ['blur', 'change'] }],
@@ -66,19 +66,13 @@
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '230' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'orderCode', align: 'center' },
-  { text: '委托书编号', value: 'manufacturingNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'customerNo', align: 'center' },
   { text: '委托单位', value: 'customerName', align: 'center' },
 ])
 
 const getDetail = () => {
   detail({ id: $route.params.id }).then((res) => {
-    // let interfaceStr = ''
-    // for (const key in res.data.sampleList[0]) {
-    //   const item = res.data[key]
-    //   interfaceStr += `${key}:${typeof (item)}\n`
-    // }
-    // console.log(interfaceStr)
     detailForm.value = res.data
     list.value = res.data.sampleList.filter((item: ISampleList) => {
       return item !== null
@@ -115,33 +109,29 @@
       const _list = list.value.map((item: any) => {
         return {
           orderId: item.orderId ? item.orderId : 0,
-          sampleId: item.sampleNo,
+          sampleId: item.id,
         }
       })
       const params = {
+        id: detailForm.value.id,
+        projectName: detailForm.value.projectName,
+        outsourcerName: detailForm.value.outsourcerName,
         applicantTime: detailForm.value.applicantTime,
         applyMinioFileName: detailForm.value.applyMinioFileName,
         applyProcessId: detailForm.value.applyProcessId,
         applyRemark: detailForm.value.applyRemark,
         outsourceReason: detailForm.value.outsourceReason,
         outsourceReasonName: detailForm.value.outsourceReasonName,
-        outsourcerId: 0,
+        outsourcerId: detailForm.value.outsourcerId,
+        checkTime: detailForm.value.checkTime,
+        checkConclusion: detailForm.value.checkConclusion,
         preCost: detailForm.value.preCost,
         preEndTime: detailForm.value.preEndTime,
         preStartTime: detailForm.value.preStartTime,
-        projectName: detailForm.value.projectName,
-        projectNo: '',
-        sampleList: [
-          // {
-          //   customerName: '',
-          //   manufacturingNo: '',
-          //   orderCode: '',
-          //   sampleModel: '',
-          //   sampleName: '',
-          //   sampleNo: '',
-          // },
-          ...list.value,
-        ],
+        projectNo: detailForm.value.projectNo,
+        checkMinioFileName: detailForm.value.checkMinioFileName,
+        checkRemark: detailForm.value.checkRemark,
+        checkProcessId: detailForm.value.checkProcessId,
         orderSampleList: [..._list],
       }
       save(params).then((res) => {
@@ -187,15 +177,17 @@
     return
   }
   list.value.push({
-    customerName: '', // 消费名称
-    manufacturingNo: '', // 编号
-    orderCode: '', // 订单code
-    sampleModel: '', // 样品模型
-    sampleName: '', // 样品名称
-    sampleNo: '', // 样品编号
+    orderCode: '',	// 原始记录单编号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    customerNo: '', // 委托方id
+    customerName: '', // 委托方名称
+    startTime: '',
+    endTime: '',
   })
 }
 const sampleVisible = ref(false)
+const projectVisible = ref(false)
 const isMulti = ref(false)
 const selectIndex = ref(0)
 // 点击选择
@@ -217,18 +209,44 @@
 const changeSampleVisible = (val: boolean) => {
   sampleVisible.value = val
 }
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
 // 选好样品
 const clickConfirmSample = (val: any) => {
   if (val && val.length) {
-    const index = list.value.findIndex((i: ISampleList) => val[0].sampleNo === i.sampleNo)
-    if (index !== -1) {
-      ElMessage.warning('此样品已添加过')
-      return
+    if (isMulti.value) {
+      val.forEach((item: ISampleList) => {
+        // 只添加列表里不存在的
+        const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+        if (index === -1) {
+          list.value.push(item)
+        }
+      })
     }
-    list.value.splice(selectIndex.value, 1, val[0])
+    else {
+      const index = list.value.findIndex((i: ISampleList) => val[0].sampleNo === i.sampleNo)
+      if (index !== -1) {
+        ElMessage.warning('此样品已添加过')
+        return
+      }
+      list.value.splice(selectIndex.value, 1, val[0])
+    }
   }
 }
 
+// 选择项目id
+const clickConfirmProject = (val: any) => {
+  // detailForm.value.checkTime = val[0].checkTime
+  // detailForm.value.projectName = val[0].projectName
+  // detailForm.value.outsourcerId = val[0].outsourcerId
+  // detailForm.value.projectNo = val[0].projectNo
+  detailForm.value.outsourcerId = val[0].outsourcerNo
+  detailForm.value.outsourcerName = val[0].outsourcerName
+}
+
 // 选中行
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
@@ -289,7 +307,7 @@
   }
   else {
     // 初始化编号,申请人,申请时间
-    detailForm.value.projectNo = '系统自动生成'
+    detailForm.value.projectNo = ''
     detailForm.value.createUser = window.localStorage.getItem('name')!
     detailForm.value.createTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
@@ -348,10 +366,8 @@
       >
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item label="分包项目编号:" prop="projectNo">
-              <el-input
-                v-model="detailForm.projectNo" disabled
-              />
+            <el-form-item label="分包项目编号:" prop="id">
+              <el-input v-model="detailForm.id" disabled placeholder="系统自动生成" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -380,24 +396,35 @@
             <el-form-item label="分包方编号:" prop="outsourcerId">
               <el-input
                 v-model="detailForm.outsourcerId"
-                :disabled="query.title === '详情'"
-              />
+                disabled
+              >
+                <template v-if="query.title !== '详情'" #append>
+                  <el-button
+                    size="small"
+                    @click="changeProjectVisible(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="公司名称:" prop="outsourcerName">
               <el-input
                 v-model="detailForm.outsourcerName"
-                :disabled="query.title === '详情'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="分包原因:" prop="outsourceReason">
-              <el-input
-                v-model="detailForm.outsourceReason"
-                :disabled="query.title === '详情'"
-              />
+              <el-select
+                v-model="detailForm.outsourceReason" :disabled="query.title === '详情'"
+              >
+                <el-option label="无检测能力" value="无检测能力" />
+                <el-option label="其他" value="其他" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -459,11 +486,11 @@
         </el-row>
       </el-form>
     </detail-page>
-    <detail-block title="样品列表">
+    <detail-block title="样品信息">
       <template v-if="query.title !== '详情'" #btns>
-        <!-- <el-button type="primary" @click="multiAdd">
+        <el-button type="primary" @click="multiAdd">
           批量添加
-        </el-button> -->
+        </el-button>
         <el-button type="primary" @click="addRow">
           增加行
         </el-button>
@@ -471,7 +498,6 @@
           删除行
         </el-button>
       </template>
-
       <el-table
         :data="list"
         border
@@ -506,8 +532,13 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
-    <!-- :order-id="detailForm.orderId" :customer-id="formInline.customerId" -->
-    <select-sample v-model:visible="sampleVisible" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+    <!-- 样品增加弹窗 -->
+    <select-sample v-model:visible="sampleVisible" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+    <!-- 项目选择 -->
+    <select-project-approve
+      v-model:visible="projectVisible" :form-id="detailForm.formId" @clickConfirmProject="clickConfirmProject"
+      @change-visible="changeProjectVisible(false)"
+    />
   </app-container>
 </template>
 
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index 57a789a..0f926af 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -271,7 +271,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" fixed="right" width="120">
+            <el-table-column label="操作" align="center" fixed="right" width="180">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看

diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index f7ac81c..7f6e7ec 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -77,6 +77,7 @@
   })
 }
 
+// 分包页面 样品列表
 export function listPageBySubpackage(data: object) {
   return request({
     url: '/customer/sample/listPageBySubpackage',
@@ -85,3 +86,11 @@
   })
 }
 
+// 分包页面 申请审批通过列表
+export function listPageOutsourceProject(data: object) {
+  return request({
+    url: '/business/outsourceProject/apply/listPage',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 941ee89..49d2fec 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -24,6 +24,6 @@
   BUSINESS_SUBPACKAGE_APPLY = 'ywglfbxmsq', // 分包项目申请
   BUSINESS_SUBPACKAGE_CHECK = 'ywglfbxmys', // 分包项目验收
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
-  BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzgsp', // 分包方资格资格审批
+  BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
 }
diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue
index 18e5ea3..3afcdd3 100644
--- a/src/views/business/lab/components/distributeDialog.vue
+++ b/src/views/business/lab/components/distributeDialog.vue
@@ -65,14 +65,8 @@
       sampleDetail.value = res.data
       sampleDetail.value.laboratoryId = id
       // 证书类别
-      console.log(res.data)
       sampleDetail.value.certifications = [res.data.measureType]
-      // sampleDetail.value.deptName = res.data.measureProcessList[0].measureSegment
-      const ItemInfo = res.data.measureProcessList.filter((item: { measurePerson: any; measureSegmentId: any }) => {
-        return item.measurePerson == localStorage.name
-      })
-      console.log(ItemInfo)
-      sampleDetail.value.deptId = ItemInfo[0].measureSegmentId
+      sampleDetail.value.deptId = res.data.measureProcessList[0].measureSegmentId
       // 延迟使用，因为还没挂载
       nextTick(() => {
         _selectStaffDialog.value.fetchData()
@@ -90,7 +84,6 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string; measurePersonId: string; measureSegmentId: string }) => {
-  console.log(person)
   processNode.value.executivePerson = person.id
   processNode.value.executivePersonName = person.name
   processNode.value.measurePersonId = person.measurePersonId
@@ -113,21 +106,26 @@
     if (res.code == 200) {
       ElMessage.success('分配成功')
     }
+    cancel()
   })
   emit('close')
 }
 
 function cancel() {
   dialogVisible.value = false
+  // 清除之前的选择
+  processNode.value.executivePerson = ''
+  processNode.value.executivePersonName = ''
+  processNode.value.measurePersonId = ''
+  processNode.value.measureSegmentId = ''
 }
 getDict()
-
 // ----------------------- 以下是暴露的方法内容 ----------------------------
-defineExpose({ initDialog })
+defineExpose({ initDialog, choosePerson })
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" title="任务分发" width="700" @close="cancel">
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="任务分发" width="700" @close="cancel">
     <div class="simple-info">
       <div class="simple-info-line">
         <span class="label">样品名称:</span>
@@ -170,8 +168,7 @@
         取消
       </el-button>
     </template>
-    <!-- :dept-id="sampleDetail.deptId" -->
-    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :dept-id="sampleDetail.deptId" :data="[processNode.executivePerson]" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-if="choosePersonShow" ref="_selectStaffDialog" v-model:visible="choosePersonShow" :dept-id="sampleDetail.deptId" :data="[processNode.executivePerson]" :multi="false" @change="choosePersonOver" />
   </el-dialog>
 </template>
 
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index bd9c8ee..d6cc168 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -96,7 +96,7 @@
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
       return item
     })
-    total.value = res.total
+    total.value = res.data.total
     loadingTable.value = false
   })
 }
@@ -128,6 +128,7 @@
   timeRange.value = ['', '']
   fetchData(true)
 }
+const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
   $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index fb6a3f5..d46a204 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -111,7 +111,7 @@
     <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
       批量添加
     </el-button>
-    <process-config v-if="orderId" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
     <template #footer>
       <el-button type="primary" @click="saveProcess">
         确定
diff --git a/src/views/business/subpackage/apply/components/selectProjectApprove.vue b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
new file mode 100644
index 0000000..523ae7b
--- /dev/null
+++ b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
@@ -0,0 +1,169 @@
+<!-- 分包资格审批选择列表 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { IListQueryRecord, IRecordList } from '../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getListPage } from '@/api/business/subpackage/record'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  formId: {
+    type: String,
+    default: '',
+  },
+})
+
+const emits = defineEmits(['changeVisible', 'clickConfirmProject'])
+
+// 查询条件
+const listQuery: Ref<IListQueryRecord> = ref({
+  businessSize: '', // 业务规模-字典code
+  formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPROVE, // 表单id
+  grade: '', // 	履约评级-字典code
+  ids: [],
+  outsourcerName: '', // 分包方公司名字
+  outsourcerNo: '', // 编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '分包项目编号', value: 'outsourcerNo', align: 'center', width: '160px' },
+  { text: '公司名称', value: 'outsourcerName', align: 'center', width: '160px' },
+  { text: '公司规模', value: 'outsourcerSize', align: 'center', width: '160px' },
+  { text: '业务规模', value: 'reciever', align: 'center', width: '180px' },
+  { text: '履约评级', value: 'grade', align: 'center', width: '180px' },
+  { text: '整体评价', value: 'businessSizeName', align: 'center', width: '180px' },
+  { text: '业务内容', value: 'deliverTime', align: 'center', width: '180px' },
+  { text: '公司地址', value: 'fullAddress', align: 'center', width: '180px' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<IRecordList[]>([])
+// 总数
+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
+  // listQuery.value.id = props.orderId
+  getListPage(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 = {
+    businessSize: '', // 业务规模-字典code
+    formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPROVE, // 表单id
+    grade: '', // 	履约评级-字典code
+    ids: [],
+    outsourcerName: '', // 分包方公司名字
+    outsourcerNo: '', // 编号
+    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 clickConfirmProject = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmProject', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择分包方" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.outsourcerNo" placeholder="分包方编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.outsourcerName" placeholder="分包方名称" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
+        :height="260" :is-multi="false" @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmProject">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/subpackage/apply/components/selectProjectNo.vue b/src/views/business/subpackage/apply/components/selectProjectNo.vue
new file mode 100644
index 0000000..9d145a8
--- /dev/null
+++ b/src/views/business/subpackage/apply/components/selectProjectNo.vue
@@ -0,0 +1,158 @@
+<!-- 分包管理项目选择列表 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { IListQueryProject, IProjectList } from '../../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageOutsourceProject } from '@/api/business/subpackage/apply'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  formId: {
+    type: String,
+    default: '',
+  },
+})
+
+const emits = defineEmits(['changeVisible', 'clickConfirmProject'])
+
+// 查询条件
+const listQuery: Ref<IListQueryProject> = ref({
+  formId: props.formId!,
+  projectName: '',
+  projectNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '项目编号', value: 'id', width: '160', align: 'center' },
+  { text: '项目名称', value: 'projectName', width: '120', align: 'center' },
+  { text: '申请时间', value: 'applicantTime', align: 'center' },
+  { text: '备注', value: 'applyRemark', align: 'center' },
+])
+// 表格数据
+const list = ref<IProjectList[]>([])
+// 总数
+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
+  // listQuery.value.id = props.orderId
+  listPageOutsourceProject(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 = {
+    formId: props.formId!,
+    projectName: '',
+    projectNo: '',
+    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 clickConfirmProject = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmProject', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择项目" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.projectNo" placeholder="项目编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.projectName" placeholder="项目名称" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
+        :height="260" :is-multi="false" @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmProject">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/subpackage/apply/components/selectSample.vue b/src/views/business/subpackage/apply/components/selectSample.vue
index e15c8ba..336912a 100644
--- a/src/views/business/subpackage/apply/components/selectSample.vue
+++ b/src/views/business/subpackage/apply/components/selectSample.vue
@@ -1,4 +1,4 @@
-<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<!-- 分包管理样品列表 -->
 <script setup lang="ts" name="SelectSample">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -20,7 +20,12 @@
     type: String,
     default: '',
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
+
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
@@ -147,8 +152,25 @@
       >
         <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"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
             v-model.trim="listQuery.sampleNo"
             placeholder="样品编号"
+            class="short-input"
             clearable
           />
         </search-item>
@@ -156,6 +178,7 @@
           <el-input
             v-model.trim="listQuery.sampleName"
             placeholder="样品名称"
+            class="short-input"
             clearable
           />
         </search-item>
@@ -167,8 +190,7 @@
         :query="listQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
-        :page-sizes="[20]"
+        :is-multi="isMulti"
         :height="260"
         @change="changePage"
         @multi-select="handleSelectionChange"
@@ -177,7 +199,7 @@
         <template #preColumns>
           <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
-              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 542e2aa..94b068f 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -3,9 +3,8 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ref } from 'vue'
-import { filter } from 'lodash'
 import type { IApplyDetail, ISampleList } from '../subpackage-interface'
-// import selectSampleDialog from './components/selectSampleDialog.vue'
+import selectProjectApprove from '../apply/components/selectProjectApprove.vue'
 import selectSample from './components/selectSample.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { detail, save, submit } from '@/api/business/subpackage/apply'
@@ -18,6 +17,7 @@
 const query = $route.query
 const ruleFormRef = ref<FormInstance>() as any
 const detailForm = ref<IApplyDetail>({
+  formId: query.formId as string,
   applicantName: '', // 申请名称
   applicantId: '', // 申请id
   applicantTime: '', // 申请时间
@@ -51,10 +51,10 @@
 })
 // 校验规则
 const formRules = ref({
-  projectName: [{ required: true, message: '分包项目名称必填', trigger: 'blur' }],
+  projectName: [{ required: true, message: '分包项目名称必填', trigger: ['blur', 'change'] }],
   outsourcerId: [{ required: true, message: '分包方编号必填', trigger: ['blur', 'change'] }],
   outsourcerName: [{ required: true, message: '公司名称必填', trigger: ['blur', 'change'] }],
-  outsourceReasonName: [{ required: true, message: '分包原因必填', trigger: ['blur', 'change'] }],
+  outsourceReason: [{ required: true, message: '分包原因必填', trigger: ['blur', 'change'] }],
   preCost: [{ required: true, message: '预计费用必填', trigger: ['blur', 'change'] }],
   preStartTime: [{ required: true, message: '预计开始时间必填', trigger: ['blur', 'change'] }],
   preEndTime: [{ required: true, message: '预计结束时间必填', trigger: ['blur', 'change'] }],
@@ -66,19 +66,13 @@
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '230' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'orderCode', align: 'center' },
-  { text: '委托书编号', value: 'manufacturingNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'customerNo', align: 'center' },
   { text: '委托单位', value: 'customerName', align: 'center' },
 ])
 
 const getDetail = () => {
   detail({ id: $route.params.id }).then((res) => {
-    // let interfaceStr = ''
-    // for (const key in res.data.sampleList[0]) {
-    //   const item = res.data[key]
-    //   interfaceStr += `${key}:${typeof (item)}\n`
-    // }
-    // console.log(interfaceStr)
     detailForm.value = res.data
     list.value = res.data.sampleList.filter((item: ISampleList) => {
       return item !== null
@@ -115,33 +109,29 @@
       const _list = list.value.map((item: any) => {
         return {
           orderId: item.orderId ? item.orderId : 0,
-          sampleId: item.sampleNo,
+          sampleId: item.id,
         }
       })
       const params = {
+        id: detailForm.value.id,
+        projectName: detailForm.value.projectName,
+        outsourcerName: detailForm.value.outsourcerName,
         applicantTime: detailForm.value.applicantTime,
         applyMinioFileName: detailForm.value.applyMinioFileName,
         applyProcessId: detailForm.value.applyProcessId,
         applyRemark: detailForm.value.applyRemark,
         outsourceReason: detailForm.value.outsourceReason,
         outsourceReasonName: detailForm.value.outsourceReasonName,
-        outsourcerId: 0,
+        outsourcerId: detailForm.value.outsourcerId,
+        checkTime: detailForm.value.checkTime,
+        checkConclusion: detailForm.value.checkConclusion,
         preCost: detailForm.value.preCost,
         preEndTime: detailForm.value.preEndTime,
         preStartTime: detailForm.value.preStartTime,
-        projectName: detailForm.value.projectName,
-        projectNo: '',
-        sampleList: [
-          // {
-          //   customerName: '',
-          //   manufacturingNo: '',
-          //   orderCode: '',
-          //   sampleModel: '',
-          //   sampleName: '',
-          //   sampleNo: '',
-          // },
-          ...list.value,
-        ],
+        projectNo: detailForm.value.projectNo,
+        checkMinioFileName: detailForm.value.checkMinioFileName,
+        checkRemark: detailForm.value.checkRemark,
+        checkProcessId: detailForm.value.checkProcessId,
         orderSampleList: [..._list],
       }
       save(params).then((res) => {
@@ -187,15 +177,17 @@
     return
   }
   list.value.push({
-    customerName: '', // 消费名称
-    manufacturingNo: '', // 编号
-    orderCode: '', // 订单code
-    sampleModel: '', // 样品模型
-    sampleName: '', // 样品名称
-    sampleNo: '', // 样品编号
+    orderCode: '',	// 原始记录单编号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    customerNo: '', // 委托方id
+    customerName: '', // 委托方名称
+    startTime: '',
+    endTime: '',
   })
 }
 const sampleVisible = ref(false)
+const projectVisible = ref(false)
 const isMulti = ref(false)
 const selectIndex = ref(0)
 // 点击选择
@@ -217,18 +209,44 @@
 const changeSampleVisible = (val: boolean) => {
   sampleVisible.value = val
 }
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
 // 选好样品
 const clickConfirmSample = (val: any) => {
   if (val && val.length) {
-    const index = list.value.findIndex((i: ISampleList) => val[0].sampleNo === i.sampleNo)
-    if (index !== -1) {
-      ElMessage.warning('此样品已添加过')
-      return
+    if (isMulti.value) {
+      val.forEach((item: ISampleList) => {
+        // 只添加列表里不存在的
+        const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+        if (index === -1) {
+          list.value.push(item)
+        }
+      })
     }
-    list.value.splice(selectIndex.value, 1, val[0])
+    else {
+      const index = list.value.findIndex((i: ISampleList) => val[0].sampleNo === i.sampleNo)
+      if (index !== -1) {
+        ElMessage.warning('此样品已添加过')
+        return
+      }
+      list.value.splice(selectIndex.value, 1, val[0])
+    }
   }
 }
 
+// 选择项目id
+const clickConfirmProject = (val: any) => {
+  // detailForm.value.checkTime = val[0].checkTime
+  // detailForm.value.projectName = val[0].projectName
+  // detailForm.value.outsourcerId = val[0].outsourcerId
+  // detailForm.value.projectNo = val[0].projectNo
+  detailForm.value.outsourcerId = val[0].outsourcerNo
+  detailForm.value.outsourcerName = val[0].outsourcerName
+}
+
 // 选中行
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
@@ -289,7 +307,7 @@
   }
   else {
     // 初始化编号,申请人,申请时间
-    detailForm.value.projectNo = '系统自动生成'
+    detailForm.value.projectNo = ''
     detailForm.value.createUser = window.localStorage.getItem('name')!
     detailForm.value.createTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
@@ -348,10 +366,8 @@
       >
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item label="分包项目编号:" prop="projectNo">
-              <el-input
-                v-model="detailForm.projectNo" disabled
-              />
+            <el-form-item label="分包项目编号:" prop="id">
+              <el-input v-model="detailForm.id" disabled placeholder="系统自动生成" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -380,24 +396,35 @@
             <el-form-item label="分包方编号:" prop="outsourcerId">
               <el-input
                 v-model="detailForm.outsourcerId"
-                :disabled="query.title === '详情'"
-              />
+                disabled
+              >
+                <template v-if="query.title !== '详情'" #append>
+                  <el-button
+                    size="small"
+                    @click="changeProjectVisible(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="公司名称:" prop="outsourcerName">
               <el-input
                 v-model="detailForm.outsourcerName"
-                :disabled="query.title === '详情'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="分包原因:" prop="outsourceReason">
-              <el-input
-                v-model="detailForm.outsourceReason"
-                :disabled="query.title === '详情'"
-              />
+              <el-select
+                v-model="detailForm.outsourceReason" :disabled="query.title === '详情'"
+              >
+                <el-option label="无检测能力" value="无检测能力" />
+                <el-option label="其他" value="其他" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -459,11 +486,11 @@
         </el-row>
       </el-form>
     </detail-page>
-    <detail-block title="样品列表">
+    <detail-block title="样品信息">
       <template v-if="query.title !== '详情'" #btns>
-        <!-- <el-button type="primary" @click="multiAdd">
+        <el-button type="primary" @click="multiAdd">
           批量添加
-        </el-button> -->
+        </el-button>
         <el-button type="primary" @click="addRow">
           增加行
         </el-button>
@@ -471,7 +498,6 @@
           删除行
         </el-button>
       </template>
-
       <el-table
         :data="list"
         border
@@ -506,8 +532,13 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
-    <!-- :order-id="detailForm.orderId" :customer-id="formInline.customerId" -->
-    <select-sample v-model:visible="sampleVisible" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+    <!-- 样品增加弹窗 -->
+    <select-sample v-model:visible="sampleVisible" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+    <!-- 项目选择 -->
+    <select-project-approve
+      v-model:visible="projectVisible" :form-id="detailForm.formId" @clickConfirmProject="clickConfirmProject"
+      @change-visible="changeProjectVisible(false)"
+    />
   </app-container>
 </template>
 
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index 57a789a..0f926af 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -271,7 +271,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" fixed="right" width="120">
+            <el-table-column label="操作" align="center" fixed="right" width="180">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index 0be983d..690b50e 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -256,7 +256,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" fixed="right" width="120">
+            <el-table-column label="操作" align="center" fixed="right" width="180">
               <template #default="{ row }">
                 <el-button
                   size="small"

diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index f7ac81c..7f6e7ec 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -77,6 +77,7 @@
   })
 }
 
+// 分包页面 样品列表
 export function listPageBySubpackage(data: object) {
   return request({
     url: '/customer/sample/listPageBySubpackage',
@@ -85,3 +86,11 @@
   })
 }
 
+// 分包页面 申请审批通过列表
+export function listPageOutsourceProject(data: object) {
+  return request({
+    url: '/business/outsourceProject/apply/listPage',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 941ee89..49d2fec 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -24,6 +24,6 @@
   BUSINESS_SUBPACKAGE_APPLY = 'ywglfbxmsq', // 分包项目申请
   BUSINESS_SUBPACKAGE_CHECK = 'ywglfbxmys', // 分包项目验收
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
-  BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzgsp', // 分包方资格资格审批
+  BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
 }
diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue
index 18e5ea3..3afcdd3 100644
--- a/src/views/business/lab/components/distributeDialog.vue
+++ b/src/views/business/lab/components/distributeDialog.vue
@@ -65,14 +65,8 @@
       sampleDetail.value = res.data
       sampleDetail.value.laboratoryId = id
       // 证书类别
-      console.log(res.data)
       sampleDetail.value.certifications = [res.data.measureType]
-      // sampleDetail.value.deptName = res.data.measureProcessList[0].measureSegment
-      const ItemInfo = res.data.measureProcessList.filter((item: { measurePerson: any; measureSegmentId: any }) => {
-        return item.measurePerson == localStorage.name
-      })
-      console.log(ItemInfo)
-      sampleDetail.value.deptId = ItemInfo[0].measureSegmentId
+      sampleDetail.value.deptId = res.data.measureProcessList[0].measureSegmentId
       // 延迟使用，因为还没挂载
       nextTick(() => {
         _selectStaffDialog.value.fetchData()
@@ -90,7 +84,6 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string; measurePersonId: string; measureSegmentId: string }) => {
-  console.log(person)
   processNode.value.executivePerson = person.id
   processNode.value.executivePersonName = person.name
   processNode.value.measurePersonId = person.measurePersonId
@@ -113,21 +106,26 @@
     if (res.code == 200) {
       ElMessage.success('分配成功')
     }
+    cancel()
   })
   emit('close')
 }
 
 function cancel() {
   dialogVisible.value = false
+  // 清除之前的选择
+  processNode.value.executivePerson = ''
+  processNode.value.executivePersonName = ''
+  processNode.value.measurePersonId = ''
+  processNode.value.measureSegmentId = ''
 }
 getDict()
-
 // ----------------------- 以下是暴露的方法内容 ----------------------------
-defineExpose({ initDialog })
+defineExpose({ initDialog, choosePerson })
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" title="任务分发" width="700" @close="cancel">
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="任务分发" width="700" @close="cancel">
     <div class="simple-info">
       <div class="simple-info-line">
         <span class="label">样品名称:</span>
@@ -170,8 +168,7 @@
         取消
       </el-button>
     </template>
-    <!-- :dept-id="sampleDetail.deptId" -->
-    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :dept-id="sampleDetail.deptId" :data="[processNode.executivePerson]" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-if="choosePersonShow" ref="_selectStaffDialog" v-model:visible="choosePersonShow" :dept-id="sampleDetail.deptId" :data="[processNode.executivePerson]" :multi="false" @change="choosePersonOver" />
   </el-dialog>
 </template>
 
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index bd9c8ee..d6cc168 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -96,7 +96,7 @@
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
       return item
     })
-    total.value = res.total
+    total.value = res.data.total
     loadingTable.value = false
   })
 }
@@ -128,6 +128,7 @@
   timeRange.value = ['', '']
   fetchData(true)
 }
+const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
   $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index fb6a3f5..d46a204 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -111,7 +111,7 @@
     <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
       批量添加
     </el-button>
-    <process-config v-if="orderId" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
     <template #footer>
       <el-button type="primary" @click="saveProcess">
         确定
diff --git a/src/views/business/subpackage/apply/components/selectProjectApprove.vue b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
new file mode 100644
index 0000000..523ae7b
--- /dev/null
+++ b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
@@ -0,0 +1,169 @@
+<!-- 分包资格审批选择列表 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { IListQueryRecord, IRecordList } from '../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getListPage } from '@/api/business/subpackage/record'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  formId: {
+    type: String,
+    default: '',
+  },
+})
+
+const emits = defineEmits(['changeVisible', 'clickConfirmProject'])
+
+// 查询条件
+const listQuery: Ref<IListQueryRecord> = ref({
+  businessSize: '', // 业务规模-字典code
+  formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPROVE, // 表单id
+  grade: '', // 	履约评级-字典code
+  ids: [],
+  outsourcerName: '', // 分包方公司名字
+  outsourcerNo: '', // 编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '分包项目编号', value: 'outsourcerNo', align: 'center', width: '160px' },
+  { text: '公司名称', value: 'outsourcerName', align: 'center', width: '160px' },
+  { text: '公司规模', value: 'outsourcerSize', align: 'center', width: '160px' },
+  { text: '业务规模', value: 'reciever', align: 'center', width: '180px' },
+  { text: '履约评级', value: 'grade', align: 'center', width: '180px' },
+  { text: '整体评价', value: 'businessSizeName', align: 'center', width: '180px' },
+  { text: '业务内容', value: 'deliverTime', align: 'center', width: '180px' },
+  { text: '公司地址', value: 'fullAddress', align: 'center', width: '180px' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<IRecordList[]>([])
+// 总数
+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
+  // listQuery.value.id = props.orderId
+  getListPage(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 = {
+    businessSize: '', // 业务规模-字典code
+    formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPROVE, // 表单id
+    grade: '', // 	履约评级-字典code
+    ids: [],
+    outsourcerName: '', // 分包方公司名字
+    outsourcerNo: '', // 编号
+    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 clickConfirmProject = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmProject', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择分包方" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.outsourcerNo" placeholder="分包方编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.outsourcerName" placeholder="分包方名称" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
+        :height="260" :is-multi="false" @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmProject">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/subpackage/apply/components/selectProjectNo.vue b/src/views/business/subpackage/apply/components/selectProjectNo.vue
new file mode 100644
index 0000000..9d145a8
--- /dev/null
+++ b/src/views/business/subpackage/apply/components/selectProjectNo.vue
@@ -0,0 +1,158 @@
+<!-- 分包管理项目选择列表 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { IListQueryProject, IProjectList } from '../../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageOutsourceProject } from '@/api/business/subpackage/apply'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  formId: {
+    type: String,
+    default: '',
+  },
+})
+
+const emits = defineEmits(['changeVisible', 'clickConfirmProject'])
+
+// 查询条件
+const listQuery: Ref<IListQueryProject> = ref({
+  formId: props.formId!,
+  projectName: '',
+  projectNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '项目编号', value: 'id', width: '160', align: 'center' },
+  { text: '项目名称', value: 'projectName', width: '120', align: 'center' },
+  { text: '申请时间', value: 'applicantTime', align: 'center' },
+  { text: '备注', value: 'applyRemark', align: 'center' },
+])
+// 表格数据
+const list = ref<IProjectList[]>([])
+// 总数
+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
+  // listQuery.value.id = props.orderId
+  listPageOutsourceProject(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 = {
+    formId: props.formId!,
+    projectName: '',
+    projectNo: '',
+    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 clickConfirmProject = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmProject', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择项目" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.projectNo" placeholder="项目编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.projectName" placeholder="项目名称" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
+        :height="260" :is-multi="false" @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmProject">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/subpackage/apply/components/selectSample.vue b/src/views/business/subpackage/apply/components/selectSample.vue
index e15c8ba..336912a 100644
--- a/src/views/business/subpackage/apply/components/selectSample.vue
+++ b/src/views/business/subpackage/apply/components/selectSample.vue
@@ -1,4 +1,4 @@
-<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<!-- 分包管理样品列表 -->
 <script setup lang="ts" name="SelectSample">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -20,7 +20,12 @@
     type: String,
     default: '',
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
+
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
@@ -147,8 +152,25 @@
       >
         <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"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
             v-model.trim="listQuery.sampleNo"
             placeholder="样品编号"
+            class="short-input"
             clearable
           />
         </search-item>
@@ -156,6 +178,7 @@
           <el-input
             v-model.trim="listQuery.sampleName"
             placeholder="样品名称"
+            class="short-input"
             clearable
           />
         </search-item>
@@ -167,8 +190,7 @@
         :query="listQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
-        :page-sizes="[20]"
+        :is-multi="isMulti"
         :height="260"
         @change="changePage"
         @multi-select="handleSelectionChange"
@@ -177,7 +199,7 @@
         <template #preColumns>
           <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
-              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 542e2aa..94b068f 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -3,9 +3,8 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ref } from 'vue'
-import { filter } from 'lodash'
 import type { IApplyDetail, ISampleList } from '../subpackage-interface'
-// import selectSampleDialog from './components/selectSampleDialog.vue'
+import selectProjectApprove from '../apply/components/selectProjectApprove.vue'
 import selectSample from './components/selectSample.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { detail, save, submit } from '@/api/business/subpackage/apply'
@@ -18,6 +17,7 @@
 const query = $route.query
 const ruleFormRef = ref<FormInstance>() as any
 const detailForm = ref<IApplyDetail>({
+  formId: query.formId as string,
   applicantName: '', // 申请名称
   applicantId: '', // 申请id
   applicantTime: '', // 申请时间
@@ -51,10 +51,10 @@
 })
 // 校验规则
 const formRules = ref({
-  projectName: [{ required: true, message: '分包项目名称必填', trigger: 'blur' }],
+  projectName: [{ required: true, message: '分包项目名称必填', trigger: ['blur', 'change'] }],
   outsourcerId: [{ required: true, message: '分包方编号必填', trigger: ['blur', 'change'] }],
   outsourcerName: [{ required: true, message: '公司名称必填', trigger: ['blur', 'change'] }],
-  outsourceReasonName: [{ required: true, message: '分包原因必填', trigger: ['blur', 'change'] }],
+  outsourceReason: [{ required: true, message: '分包原因必填', trigger: ['blur', 'change'] }],
   preCost: [{ required: true, message: '预计费用必填', trigger: ['blur', 'change'] }],
   preStartTime: [{ required: true, message: '预计开始时间必填', trigger: ['blur', 'change'] }],
   preEndTime: [{ required: true, message: '预计结束时间必填', trigger: ['blur', 'change'] }],
@@ -66,19 +66,13 @@
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '230' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'orderCode', align: 'center' },
-  { text: '委托书编号', value: 'manufacturingNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'customerNo', align: 'center' },
   { text: '委托单位', value: 'customerName', align: 'center' },
 ])
 
 const getDetail = () => {
   detail({ id: $route.params.id }).then((res) => {
-    // let interfaceStr = ''
-    // for (const key in res.data.sampleList[0]) {
-    //   const item = res.data[key]
-    //   interfaceStr += `${key}:${typeof (item)}\n`
-    // }
-    // console.log(interfaceStr)
     detailForm.value = res.data
     list.value = res.data.sampleList.filter((item: ISampleList) => {
       return item !== null
@@ -115,33 +109,29 @@
       const _list = list.value.map((item: any) => {
         return {
           orderId: item.orderId ? item.orderId : 0,
-          sampleId: item.sampleNo,
+          sampleId: item.id,
         }
       })
       const params = {
+        id: detailForm.value.id,
+        projectName: detailForm.value.projectName,
+        outsourcerName: detailForm.value.outsourcerName,
         applicantTime: detailForm.value.applicantTime,
         applyMinioFileName: detailForm.value.applyMinioFileName,
         applyProcessId: detailForm.value.applyProcessId,
         applyRemark: detailForm.value.applyRemark,
         outsourceReason: detailForm.value.outsourceReason,
         outsourceReasonName: detailForm.value.outsourceReasonName,
-        outsourcerId: 0,
+        outsourcerId: detailForm.value.outsourcerId,
+        checkTime: detailForm.value.checkTime,
+        checkConclusion: detailForm.value.checkConclusion,
         preCost: detailForm.value.preCost,
         preEndTime: detailForm.value.preEndTime,
         preStartTime: detailForm.value.preStartTime,
-        projectName: detailForm.value.projectName,
-        projectNo: '',
-        sampleList: [
-          // {
-          //   customerName: '',
-          //   manufacturingNo: '',
-          //   orderCode: '',
-          //   sampleModel: '',
-          //   sampleName: '',
-          //   sampleNo: '',
-          // },
-          ...list.value,
-        ],
+        projectNo: detailForm.value.projectNo,
+        checkMinioFileName: detailForm.value.checkMinioFileName,
+        checkRemark: detailForm.value.checkRemark,
+        checkProcessId: detailForm.value.checkProcessId,
         orderSampleList: [..._list],
       }
       save(params).then((res) => {
@@ -187,15 +177,17 @@
     return
   }
   list.value.push({
-    customerName: '', // 消费名称
-    manufacturingNo: '', // 编号
-    orderCode: '', // 订单code
-    sampleModel: '', // 样品模型
-    sampleName: '', // 样品名称
-    sampleNo: '', // 样品编号
+    orderCode: '',	// 原始记录单编号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    customerNo: '', // 委托方id
+    customerName: '', // 委托方名称
+    startTime: '',
+    endTime: '',
   })
 }
 const sampleVisible = ref(false)
+const projectVisible = ref(false)
 const isMulti = ref(false)
 const selectIndex = ref(0)
 // 点击选择
@@ -217,18 +209,44 @@
 const changeSampleVisible = (val: boolean) => {
   sampleVisible.value = val
 }
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
 // 选好样品
 const clickConfirmSample = (val: any) => {
   if (val && val.length) {
-    const index = list.value.findIndex((i: ISampleList) => val[0].sampleNo === i.sampleNo)
-    if (index !== -1) {
-      ElMessage.warning('此样品已添加过')
-      return
+    if (isMulti.value) {
+      val.forEach((item: ISampleList) => {
+        // 只添加列表里不存在的
+        const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+        if (index === -1) {
+          list.value.push(item)
+        }
+      })
     }
-    list.value.splice(selectIndex.value, 1, val[0])
+    else {
+      const index = list.value.findIndex((i: ISampleList) => val[0].sampleNo === i.sampleNo)
+      if (index !== -1) {
+        ElMessage.warning('此样品已添加过')
+        return
+      }
+      list.value.splice(selectIndex.value, 1, val[0])
+    }
   }
 }
 
+// 选择项目id
+const clickConfirmProject = (val: any) => {
+  // detailForm.value.checkTime = val[0].checkTime
+  // detailForm.value.projectName = val[0].projectName
+  // detailForm.value.outsourcerId = val[0].outsourcerId
+  // detailForm.value.projectNo = val[0].projectNo
+  detailForm.value.outsourcerId = val[0].outsourcerNo
+  detailForm.value.outsourcerName = val[0].outsourcerName
+}
+
 // 选中行
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
@@ -289,7 +307,7 @@
   }
   else {
     // 初始化编号,申请人,申请时间
-    detailForm.value.projectNo = '系统自动生成'
+    detailForm.value.projectNo = ''
     detailForm.value.createUser = window.localStorage.getItem('name')!
     detailForm.value.createTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
@@ -348,10 +366,8 @@
       >
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item label="分包项目编号:" prop="projectNo">
-              <el-input
-                v-model="detailForm.projectNo" disabled
-              />
+            <el-form-item label="分包项目编号:" prop="id">
+              <el-input v-model="detailForm.id" disabled placeholder="系统自动生成" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -380,24 +396,35 @@
             <el-form-item label="分包方编号:" prop="outsourcerId">
               <el-input
                 v-model="detailForm.outsourcerId"
-                :disabled="query.title === '详情'"
-              />
+                disabled
+              >
+                <template v-if="query.title !== '详情'" #append>
+                  <el-button
+                    size="small"
+                    @click="changeProjectVisible(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="公司名称:" prop="outsourcerName">
               <el-input
                 v-model="detailForm.outsourcerName"
-                :disabled="query.title === '详情'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="分包原因:" prop="outsourceReason">
-              <el-input
-                v-model="detailForm.outsourceReason"
-                :disabled="query.title === '详情'"
-              />
+              <el-select
+                v-model="detailForm.outsourceReason" :disabled="query.title === '详情'"
+              >
+                <el-option label="无检测能力" value="无检测能力" />
+                <el-option label="其他" value="其他" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -459,11 +486,11 @@
         </el-row>
       </el-form>
     </detail-page>
-    <detail-block title="样品列表">
+    <detail-block title="样品信息">
       <template v-if="query.title !== '详情'" #btns>
-        <!-- <el-button type="primary" @click="multiAdd">
+        <el-button type="primary" @click="multiAdd">
           批量添加
-        </el-button> -->
+        </el-button>
         <el-button type="primary" @click="addRow">
           增加行
         </el-button>
@@ -471,7 +498,6 @@
           删除行
         </el-button>
       </template>
-
       <el-table
         :data="list"
         border
@@ -506,8 +532,13 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
-    <!-- :order-id="detailForm.orderId" :customer-id="formInline.customerId" -->
-    <select-sample v-model:visible="sampleVisible" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+    <!-- 样品增加弹窗 -->
+    <select-sample v-model:visible="sampleVisible" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+    <!-- 项目选择 -->
+    <select-project-approve
+      v-model:visible="projectVisible" :form-id="detailForm.formId" @clickConfirmProject="clickConfirmProject"
+      @change-visible="changeProjectVisible(false)"
+    />
   </app-container>
 </template>
 
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index 57a789a..0f926af 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -271,7 +271,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" fixed="right" width="120">
+            <el-table-column label="操作" align="center" fixed="right" width="180">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index 0be983d..690b50e 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -256,7 +256,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" fixed="right" width="120">
+            <el-table-column label="操作" align="center" fixed="right" width="180">
               <template #default="{ row }">
                 <el-button
                   size="small"
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index c7730a1..dac01f9 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -1,19 +1,23 @@
 <!-- 分包验收详情 -->
 <script lang="ts" setup>
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ref } from 'vue'
-import { filter } from 'lodash'
-import type { IApplyDetail, IDetailList } from '../subpackage-interface'
+import type { IApplyDetail, ISampleList } from '../subpackage-interface'
+import selectSample from '../apply/components/selectSample.vue'
+import selectProjectNo from '../apply/components/selectProjectNo.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { detail } from '@/api/business/subpackage/check'
+import { detail, save, submit } from '@/api/business/subpackage/check'
 import { fetchApproval, submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 
+const { proxy } = getCurrentInstance() as any
 const $route = useRoute()
 const $router = useRouter()
 const query = $route.query
+const ruleFormRef = ref<FormInstance>() as any
 const detailForm = ref<IApplyDetail>({
+  formId: query.formId as string,
   applicantName: '', // 申请名称
   applicantId: '', // 申请id
   applicantTime: '', // 申请时间
@@ -22,7 +26,7 @@
   applyProcessId: '', // 申请流程id
   applyRemark: '', // 申请备注
   checkApprovalStatus: '', // 申请状态码
-  checkConclusion: '', // 审批结果
+  checkConclusion: '', // 验收结论
   checkMinioFileName: '', // 审核文件名称
   checkProcessId: '', // 审批流程id
   checkRemark: '', // 审核备注
@@ -52,31 +56,25 @@
   outsourcerName: [{ required: true, message: '公司名称必填', trigger: ['blur', 'change'] }],
   outsourceReasonName: [{ required: true, message: '分包原因必填', trigger: ['blur', 'change'] }],
   preCost: [{ required: true, message: '预计费用必填', trigger: ['blur', 'change'] }],
-  preStartTime: [{ required: true, message: '预计开始时间必填', trigger: ['blur', 'change'] }],
-  preEndTime: [{ required: true, message: '预计结束时间必填', trigger: ['blur', 'change'] }],
+  checkTime: [{ required: true, message: '验收时间必填', trigger: ['blur', 'change'] }],
+  checkConclusion: [{ required: true, message: '验收结论必填', trigger: ['blur', 'change'] }],
 })
 
-const list = ref<IDetailList[]>([])// 表格数据
+const list = ref<ISampleList[]>([])// 表格数据
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '230' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'orderCode', align: 'center' },
-  { text: '委托书编号', value: 'manufacturingNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'customerNo', align: 'center' },
   { text: '委托单位', value: 'customerName', align: 'center' },
 ])
 
 const getDetail = () => {
   detail({ id: $route.params.id }).then((res) => {
-    // let interfaceStr = ''
-    // for (const key in res.data.sampleList[0]) {
-    //   const item = res.data[key]
-    //   interfaceStr += `${key}:${typeof (item)}\n`
-    // }
-    // console.log(interfaceStr)
     detailForm.value = res.data
-    list.value = res.data.sampleList.filter((item: IDetailList) => {
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
       return item !== null
     })
   })
@@ -99,6 +97,193 @@
 const close = () => {
   $router.back()
 }
+
+// 保存
+const handleSave = () => {
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      const _list = list.value.map((item: any) => {
+        return {
+          orderId: item.orderId ? item.orderId : 0,
+          sampleId: item.id,
+        }
+      })
+      const params = {
+        id: detailForm.value.id,
+        outsourcerName: detailForm.value.outsourcerName,
+        applicantTime: detailForm.value.applicantTime,
+        applyMinioFileName: detailForm.value.applyMinioFileName,
+        applyProcessId: detailForm.value.applyProcessId,
+        applyRemark: detailForm.value.applyRemark,
+        outsourceReason: detailForm.value.outsourceReason,
+        outsourceReasonName: detailForm.value.outsourceReasonName,
+        outsourcerId: detailForm.value.outsourcerId,
+        checkTime: detailForm.value.checkTime,
+        checkConclusion: detailForm.value.checkConclusion,
+        preCost: detailForm.value.preCost,
+        preEndTime: detailForm.value.preEndTime,
+        preStartTime: detailForm.value.preStartTime,
+        projectName: detailForm.value.projectName,
+        projectNo: detailForm.value.projectNo,
+        checkMinioFileName: detailForm.value.checkMinioFileName,
+        checkRemark: detailForm.value.checkRemark,
+        checkProcessId: detailForm.value.checkProcessId,
+        orderSampleList: [..._list],
+      }
+      save(params).then((res) => {
+        detailForm.value.id = res.data.id
+        ElMessage.success('保存成功')
+        loading.close()
+        close()
+      })
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  console.log(detailForm.value.id)
+  if (detailForm.value.id) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: detailForm.value.id,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存再提交！')
+  }
+}
+
+// 编辑
+const handleEdit = () => {
+
+}
+
+// 编辑
+const handleDel = () => {
+
+}
+
+// 增加行
+const addRow = () => {
+  const index = list.value.findIndex(item => !item.sampleNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  list.value.push({
+    orderCode: '',	// 原始记录单编号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    customerNo: '', // 委托方id
+    customerName: '', // 委托方名称
+    startTime: '',
+    endTime: '',
+  })
+}
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+// 点击批量添加
+const multiAdd = () => {
+  sampleVisible.value = true
+  isMulti.value = true
+}
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+// 选好样品
+const clickConfirmSample = (val: any) => {
+  if (val && val.length) {
+    if (isMulti.value) {
+      val.forEach((item: ISampleList) => {
+        // 只添加列表里不存在的
+        const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+        if (index === -1) {
+          list.value.push(item)
+        }
+      })
+    }
+    else {
+      const index = list.value.findIndex((i: ISampleList) => val[0].sampleNo === i.sampleNo)
+      if (index !== -1) {
+        ElMessage.warning('此样品已添加过')
+        return
+      }
+      list.value.splice(selectIndex.value, 1, val[0])
+    }
+  }
+}
+
+// 选择项目id
+const clickConfirmProject = (val: any) => {
+  detailForm.value.id = val[0].id
+  detailForm.value.checkConclusion = val[0].checkConclusion
+  detailForm.value.checkTime = val[0].checkTime
+  detailForm.value.checkMinioFileName = val[0].checkMinioFileName
+  detailForm.value.checkRemark = val[0].checkRemark
+  detailForm.value.checkProcessId = val[0].checkProcessId
+
+  detailForm.value.projectName = val[0].projectName
+  detailForm.value.outsourcerId = val[0].outsourcerId
+  detailForm.value.projectNo = val[0].projectNo
+}
+
+const checkoutList = ref([])
+// 选中行
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+
+// 删除行
+const delRow = () => {
+  if (checkoutList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutList.value.forEach((item: ISampleList) => {
+      list.value.forEach((element, index) => {
+        if (element.sampleNo === item.sampleNo) {
+          list.value.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
 // 文件上传
 const fileRef = ref()
 const onFileChange = (event: any) => {
@@ -128,6 +313,11 @@
   if (query.title !== '新建') {
     getDetail()
   }
+  else {
+    // 初始化编号,申请人,申请时间
+    detailForm.value.projectNo = '系统自动生成'
+    detailForm.value.checkerName = window.localStorage.getItem('name')!
+  }
 })
 </script>
 
@@ -147,13 +337,13 @@
           </el-button>
         </template>
         <template v-if="['草稿箱', '已取消'].includes(query.approvalStatusName as string)">
-          <el-button type="primary">
+          <el-button type="primary" @click="handleSubmit">
             提交
           </el-button>
-          <el-button type="primary">
+          <el-button type="primary" @click="handleEdit">
             编辑
           </el-button>
-          <el-button type="primary">
+          <el-button type="primary" @click="handleDel">
             删除
           </el-button>
         </template>
@@ -163,10 +353,10 @@
           </el-button>
         </template>
         <template v-if="query.title === '新建'">
-          <el-button type="primary">
+          <el-button type="primary" @click="handleSave">
             保存
           </el-button>
-          <el-button type="primary">
+          <el-button type="primary" @click="handleSubmit">
             提交
           </el-button>
         </template>
@@ -174,83 +364,70 @@
           关闭
         </el-button>
       </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="detailForm"
-        label-width="140"
-        label-position="right"
-        :rules="formRules"
-      >
+      <el-form ref="ruleFormRef" :model="detailForm" label-width="140" label-position="right" :rules="formRules">
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item label="分包项目编号:" prop="projectNo">
-              <el-input
-                v-model="detailForm.projectNo" disabled
-              />
+            <el-form-item label="分包项目编号:" prop="id">
+              <el-input v-model="detailForm.id" disabled>
+                <template v-if="query.title !== '详情'" #append>
+                  <el-button
+                    size="small"
+                    @click="changeProjectVisible(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="分包项目名称:" prop="projectName">
-              <el-input
-                v-model="detailForm.projectName"
-                :disabled="query.title === '详情'"
-              />
+              <el-input v-model="detailForm.projectName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="验收人:" prop="applicantName">
-              <el-input
-                v-model="detailForm.applicantName" disabled
-              />
+            <el-form-item label="验收人:" prop="checkerName">
+              <el-input v-model="detailForm.checkerName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="验收时间:" prop="applicantTime">
-              <el-input
-                v-model="detailForm.applicantTime" disabled
+            <el-form-item label="验收时间:" prop="checkTime">
+              <el-date-picker
+                v-model="detailForm.checkTime" type="datetime" placeholder="请选择验收时间"
+                format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="分包方编号:" prop="outsourcerId">
-              <el-input
-                v-model="detailForm.outsourcerId"
-                :disabled="query.title === '详情'"
-              />
+              <el-input v-model="detailForm.outsourcerId" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="公司名称:" prop="outsourcerName">
-              <el-input
-                v-model="detailForm.outsourcerName"
-                :disabled="query.title === '详情'"
-              />
+              <el-input v-model="detailForm.outsourcerName" :disabled="query.title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="分包原因:" prop="outsourceReasonName">
-              <el-input
-                v-model="detailForm.outsourceReasonName"
-                :disabled="query.title === '详情'"
-              />
+              <el-select
+                v-model="detailForm.outsourceReasonName" :disabled="query.title === '详情'"
+              >
+                <el-option label="无检测能力" value="无检测能力" />
+                <el-option label="其他" value="其他" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6" />
           <el-col :span="12">
-            <el-form-item label="结论:" prop="applyRemark">
-              <el-input
-                v-model="detailForm.applyRemark"
-                :disabled="query.title === '详情'"
-              />
+            <el-form-item label="验收结论:" prop="checkConclusion">
+              <el-input v-model="detailForm.checkConclusion" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12" />
           <el-col :span="12">
             <el-form-item label="备注:" prop="applyRemark">
-              <el-input
-                v-model="detailForm.applyRemark"
-                :disabled="query.title === '详情'"
-              />
+              <el-input v-model="detailForm.applyRemark" :disabled="query.title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="12" />
@@ -259,7 +436,7 @@
               <input v-show="query.title === ''" ref="fileRef" multiple type="file" @change="onFileChange">
               <span v-if="query.title === '详情' && !detailForm.applyMinioFileName">无</span>
               <div v-else style="display: flex;">
-                <show-photo :minio-file-name="detailForm.applyMinioFileName || ''" style="display: inline-block;margin: 10px;" />
+                <show-photo :minio-file-name="detailForm.applyMinioFileName || ''" style="display: inline-block;" />
               </div>
               <el-button v-if="query.title !== '详情'" type="primary" :disabled="query.title === '详情'" @click="upload">
                 {{ detailForm.applyMinioFileName ? '更换' : '上传' }}
@@ -270,30 +447,51 @@
         </el-row>
       </el-form>
     </detail-page>
-    <detail-block title="样品详情">
-      <el-table
-        :data="list"
-        border
-        style="width: 100%;"
-        max-height="600"
-      >
-        <el-table-column type="selection" width="38" />
+    <detail-block title="样品信息">
+      <template v-if="query.title !== '详情'" #btns>
+        <el-button type="primary" @click="multiAdd">
+          批量添加
+        </el-button>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table :data="list" border style="width: 100%;" max-height="600" @selection-change="handleSelectionChange">
+        <el-table-column v-if="query.title !== '详情'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          show-overflow-tooltip
-          align="center"
-        />
+          v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
+          :width="item.width" show-overflow-tooltip align="center"
+        >
+          <template v-if="item.value === 'sampleNo' && ['新建', '编辑'].includes(query.title as string)" #default="scope">
+            <el-input v-model="scope.row.sampleNo" placeholder="请选择设备" class="input">
+              <template #append>
+                <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="query.approvalStatusName !== '草稿箱' && query.title !== '新增'" title="审批流程">
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && query.title !== '新建'" title="审批流程">
       <!-- 审批流程 -->
       <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-project-no
+      v-model:visible="projectVisible" :form-id="detailForm.formId" @clickConfirmProject="clickConfirmProject"
+      @change-visible="changeProjectVisible(false)"
+    />
   </app-container>
 </template>
 

diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index f7ac81c..7f6e7ec 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -77,6 +77,7 @@
   })
 }
 
+// 分包页面 样品列表
 export function listPageBySubpackage(data: object) {
   return request({
     url: '/customer/sample/listPageBySubpackage',
@@ -85,3 +86,11 @@
   })
 }
 
+// 分包页面 申请审批通过列表
+export function listPageOutsourceProject(data: object) {
+  return request({
+    url: '/business/outsourceProject/apply/listPage',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 941ee89..49d2fec 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -24,6 +24,6 @@
   BUSINESS_SUBPACKAGE_APPLY = 'ywglfbxmsq', // 分包项目申请
   BUSINESS_SUBPACKAGE_CHECK = 'ywglfbxmys', // 分包项目验收
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
-  BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzgsp', // 分包方资格资格审批
+  BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
 }
diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue
index 18e5ea3..3afcdd3 100644
--- a/src/views/business/lab/components/distributeDialog.vue
+++ b/src/views/business/lab/components/distributeDialog.vue
@@ -65,14 +65,8 @@
       sampleDetail.value = res.data
       sampleDetail.value.laboratoryId = id
       // 证书类别
-      console.log(res.data)
       sampleDetail.value.certifications = [res.data.measureType]
-      // sampleDetail.value.deptName = res.data.measureProcessList[0].measureSegment
-      const ItemInfo = res.data.measureProcessList.filter((item: { measurePerson: any; measureSegmentId: any }) => {
-        return item.measurePerson == localStorage.name
-      })
-      console.log(ItemInfo)
-      sampleDetail.value.deptId = ItemInfo[0].measureSegmentId
+      sampleDetail.value.deptId = res.data.measureProcessList[0].measureSegmentId
       // 延迟使用，因为还没挂载
       nextTick(() => {
         _selectStaffDialog.value.fetchData()
@@ -90,7 +84,6 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string; measurePersonId: string; measureSegmentId: string }) => {
-  console.log(person)
   processNode.value.executivePerson = person.id
   processNode.value.executivePersonName = person.name
   processNode.value.measurePersonId = person.measurePersonId
@@ -113,21 +106,26 @@
     if (res.code == 200) {
       ElMessage.success('分配成功')
     }
+    cancel()
   })
   emit('close')
 }
 
 function cancel() {
   dialogVisible.value = false
+  // 清除之前的选择
+  processNode.value.executivePerson = ''
+  processNode.value.executivePersonName = ''
+  processNode.value.measurePersonId = ''
+  processNode.value.measureSegmentId = ''
 }
 getDict()
-
 // ----------------------- 以下是暴露的方法内容 ----------------------------
-defineExpose({ initDialog })
+defineExpose({ initDialog, choosePerson })
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" title="任务分发" width="700" @close="cancel">
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="任务分发" width="700" @close="cancel">
     <div class="simple-info">
       <div class="simple-info-line">
         <span class="label">样品名称:</span>
@@ -170,8 +168,7 @@
         取消
       </el-button>
     </template>
-    <!-- :dept-id="sampleDetail.deptId" -->
-    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :dept-id="sampleDetail.deptId" :data="[processNode.executivePerson]" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-if="choosePersonShow" ref="_selectStaffDialog" v-model:visible="choosePersonShow" :dept-id="sampleDetail.deptId" :data="[processNode.executivePerson]" :multi="false" @change="choosePersonOver" />
   </el-dialog>
 </template>
 
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index bd9c8ee..d6cc168 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -96,7 +96,7 @@
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
       return item
     })
-    total.value = res.total
+    total.value = res.data.total
     loadingTable.value = false
   })
 }
@@ -128,6 +128,7 @@
   timeRange.value = ['', '']
   fetchData(true)
 }
+const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
   $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index fb6a3f5..d46a204 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -111,7 +111,7 @@
     <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
       批量添加
     </el-button>
-    <process-config v-if="orderId" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
     <template #footer>
       <el-button type="primary" @click="saveProcess">
         确定
diff --git a/src/views/business/subpackage/apply/components/selectProjectApprove.vue b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
new file mode 100644
index 0000000..523ae7b
--- /dev/null
+++ b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
@@ -0,0 +1,169 @@
+<!-- 分包资格审批选择列表 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { IListQueryRecord, IRecordList } from '../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getListPage } from '@/api/business/subpackage/record'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  formId: {
+    type: String,
+    default: '',
+  },
+})
+
+const emits = defineEmits(['changeVisible', 'clickConfirmProject'])
+
+// 查询条件
+const listQuery: Ref<IListQueryRecord> = ref({
+  businessSize: '', // 业务规模-字典code
+  formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPROVE, // 表单id
+  grade: '', // 	履约评级-字典code
+  ids: [],
+  outsourcerName: '', // 分包方公司名字
+  outsourcerNo: '', // 编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '分包项目编号', value: 'outsourcerNo', align: 'center', width: '160px' },
+  { text: '公司名称', value: 'outsourcerName', align: 'center', width: '160px' },
+  { text: '公司规模', value: 'outsourcerSize', align: 'center', width: '160px' },
+  { text: '业务规模', value: 'reciever', align: 'center', width: '180px' },
+  { text: '履约评级', value: 'grade', align: 'center', width: '180px' },
+  { text: '整体评价', value: 'businessSizeName', align: 'center', width: '180px' },
+  { text: '业务内容', value: 'deliverTime', align: 'center', width: '180px' },
+  { text: '公司地址', value: 'fullAddress', align: 'center', width: '180px' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<IRecordList[]>([])
+// 总数
+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
+  // listQuery.value.id = props.orderId
+  getListPage(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 = {
+    businessSize: '', // 业务规模-字典code
+    formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPROVE, // 表单id
+    grade: '', // 	履约评级-字典code
+    ids: [],
+    outsourcerName: '', // 分包方公司名字
+    outsourcerNo: '', // 编号
+    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 clickConfirmProject = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmProject', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择分包方" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.outsourcerNo" placeholder="分包方编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.outsourcerName" placeholder="分包方名称" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
+        :height="260" :is-multi="false" @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmProject">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/subpackage/apply/components/selectProjectNo.vue b/src/views/business/subpackage/apply/components/selectProjectNo.vue
new file mode 100644
index 0000000..9d145a8
--- /dev/null
+++ b/src/views/business/subpackage/apply/components/selectProjectNo.vue
@@ -0,0 +1,158 @@
+<!-- 分包管理项目选择列表 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { IListQueryProject, IProjectList } from '../../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageOutsourceProject } from '@/api/business/subpackage/apply'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  formId: {
+    type: String,
+    default: '',
+  },
+})
+
+const emits = defineEmits(['changeVisible', 'clickConfirmProject'])
+
+// 查询条件
+const listQuery: Ref<IListQueryProject> = ref({
+  formId: props.formId!,
+  projectName: '',
+  projectNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '项目编号', value: 'id', width: '160', align: 'center' },
+  { text: '项目名称', value: 'projectName', width: '120', align: 'center' },
+  { text: '申请时间', value: 'applicantTime', align: 'center' },
+  { text: '备注', value: 'applyRemark', align: 'center' },
+])
+// 表格数据
+const list = ref<IProjectList[]>([])
+// 总数
+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
+  // listQuery.value.id = props.orderId
+  listPageOutsourceProject(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 = {
+    formId: props.formId!,
+    projectName: '',
+    projectNo: '',
+    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 clickConfirmProject = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmProject', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择项目" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.projectNo" placeholder="项目编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.projectName" placeholder="项目名称" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
+        :height="260" :is-multi="false" @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmProject">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/subpackage/apply/components/selectSample.vue b/src/views/business/subpackage/apply/components/selectSample.vue
index e15c8ba..336912a 100644
--- a/src/views/business/subpackage/apply/components/selectSample.vue
+++ b/src/views/business/subpackage/apply/components/selectSample.vue
@@ -1,4 +1,4 @@
-<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<!-- 分包管理样品列表 -->
 <script setup lang="ts" name="SelectSample">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -20,7 +20,12 @@
     type: String,
     default: '',
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
+
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
@@ -147,8 +152,25 @@
       >
         <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"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
             v-model.trim="listQuery.sampleNo"
             placeholder="样品编号"
+            class="short-input"
             clearable
           />
         </search-item>
@@ -156,6 +178,7 @@
           <el-input
             v-model.trim="listQuery.sampleName"
             placeholder="样品名称"
+            class="short-input"
             clearable
           />
         </search-item>
@@ -167,8 +190,7 @@
         :query="listQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
-        :page-sizes="[20]"
+        :is-multi="isMulti"
         :height="260"
         @change="changePage"
         @multi-select="handleSelectionChange"
@@ -177,7 +199,7 @@
         <template #preColumns>
           <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
-              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 542e2aa..94b068f 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -3,9 +3,8 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ref } from 'vue'
-import { filter } from 'lodash'
 import type { IApplyDetail, ISampleList } from '../subpackage-interface'
-// import selectSampleDialog from './components/selectSampleDialog.vue'
+import selectProjectApprove from '../apply/components/selectProjectApprove.vue'
 import selectSample from './components/selectSample.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { detail, save, submit } from '@/api/business/subpackage/apply'
@@ -18,6 +17,7 @@
 const query = $route.query
 const ruleFormRef = ref<FormInstance>() as any
 const detailForm = ref<IApplyDetail>({
+  formId: query.formId as string,
   applicantName: '', // 申请名称
   applicantId: '', // 申请id
   applicantTime: '', // 申请时间
@@ -51,10 +51,10 @@
 })
 // 校验规则
 const formRules = ref({
-  projectName: [{ required: true, message: '分包项目名称必填', trigger: 'blur' }],
+  projectName: [{ required: true, message: '分包项目名称必填', trigger: ['blur', 'change'] }],
   outsourcerId: [{ required: true, message: '分包方编号必填', trigger: ['blur', 'change'] }],
   outsourcerName: [{ required: true, message: '公司名称必填', trigger: ['blur', 'change'] }],
-  outsourceReasonName: [{ required: true, message: '分包原因必填', trigger: ['blur', 'change'] }],
+  outsourceReason: [{ required: true, message: '分包原因必填', trigger: ['blur', 'change'] }],
   preCost: [{ required: true, message: '预计费用必填', trigger: ['blur', 'change'] }],
   preStartTime: [{ required: true, message: '预计开始时间必填', trigger: ['blur', 'change'] }],
   preEndTime: [{ required: true, message: '预计结束时间必填', trigger: ['blur', 'change'] }],
@@ -66,19 +66,13 @@
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '230' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'orderCode', align: 'center' },
-  { text: '委托书编号', value: 'manufacturingNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'customerNo', align: 'center' },
   { text: '委托单位', value: 'customerName', align: 'center' },
 ])
 
 const getDetail = () => {
   detail({ id: $route.params.id }).then((res) => {
-    // let interfaceStr = ''
-    // for (const key in res.data.sampleList[0]) {
-    //   const item = res.data[key]
-    //   interfaceStr += `${key}:${typeof (item)}\n`
-    // }
-    // console.log(interfaceStr)
     detailForm.value = res.data
     list.value = res.data.sampleList.filter((item: ISampleList) => {
       return item !== null
@@ -115,33 +109,29 @@
       const _list = list.value.map((item: any) => {
         return {
           orderId: item.orderId ? item.orderId : 0,
-          sampleId: item.sampleNo,
+          sampleId: item.id,
         }
       })
       const params = {
+        id: detailForm.value.id,
+        projectName: detailForm.value.projectName,
+        outsourcerName: detailForm.value.outsourcerName,
         applicantTime: detailForm.value.applicantTime,
         applyMinioFileName: detailForm.value.applyMinioFileName,
         applyProcessId: detailForm.value.applyProcessId,
         applyRemark: detailForm.value.applyRemark,
         outsourceReason: detailForm.value.outsourceReason,
         outsourceReasonName: detailForm.value.outsourceReasonName,
-        outsourcerId: 0,
+        outsourcerId: detailForm.value.outsourcerId,
+        checkTime: detailForm.value.checkTime,
+        checkConclusion: detailForm.value.checkConclusion,
         preCost: detailForm.value.preCost,
         preEndTime: detailForm.value.preEndTime,
         preStartTime: detailForm.value.preStartTime,
-        projectName: detailForm.value.projectName,
-        projectNo: '',
-        sampleList: [
-          // {
-          //   customerName: '',
-          //   manufacturingNo: '',
-          //   orderCode: '',
-          //   sampleModel: '',
-          //   sampleName: '',
-          //   sampleNo: '',
-          // },
-          ...list.value,
-        ],
+        projectNo: detailForm.value.projectNo,
+        checkMinioFileName: detailForm.value.checkMinioFileName,
+        checkRemark: detailForm.value.checkRemark,
+        checkProcessId: detailForm.value.checkProcessId,
         orderSampleList: [..._list],
       }
       save(params).then((res) => {
@@ -187,15 +177,17 @@
     return
   }
   list.value.push({
-    customerName: '', // 消费名称
-    manufacturingNo: '', // 编号
-    orderCode: '', // 订单code
-    sampleModel: '', // 样品模型
-    sampleName: '', // 样品名称
-    sampleNo: '', // 样品编号
+    orderCode: '',	// 原始记录单编号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    customerNo: '', // 委托方id
+    customerName: '', // 委托方名称
+    startTime: '',
+    endTime: '',
   })
 }
 const sampleVisible = ref(false)
+const projectVisible = ref(false)
 const isMulti = ref(false)
 const selectIndex = ref(0)
 // 点击选择
@@ -217,18 +209,44 @@
 const changeSampleVisible = (val: boolean) => {
   sampleVisible.value = val
 }
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
 // 选好样品
 const clickConfirmSample = (val: any) => {
   if (val && val.length) {
-    const index = list.value.findIndex((i: ISampleList) => val[0].sampleNo === i.sampleNo)
-    if (index !== -1) {
-      ElMessage.warning('此样品已添加过')
-      return
+    if (isMulti.value) {
+      val.forEach((item: ISampleList) => {
+        // 只添加列表里不存在的
+        const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+        if (index === -1) {
+          list.value.push(item)
+        }
+      })
     }
-    list.value.splice(selectIndex.value, 1, val[0])
+    else {
+      const index = list.value.findIndex((i: ISampleList) => val[0].sampleNo === i.sampleNo)
+      if (index !== -1) {
+        ElMessage.warning('此样品已添加过')
+        return
+      }
+      list.value.splice(selectIndex.value, 1, val[0])
+    }
   }
 }
 
+// 选择项目id
+const clickConfirmProject = (val: any) => {
+  // detailForm.value.checkTime = val[0].checkTime
+  // detailForm.value.projectName = val[0].projectName
+  // detailForm.value.outsourcerId = val[0].outsourcerId
+  // detailForm.value.projectNo = val[0].projectNo
+  detailForm.value.outsourcerId = val[0].outsourcerNo
+  detailForm.value.outsourcerName = val[0].outsourcerName
+}
+
 // 选中行
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
@@ -289,7 +307,7 @@
   }
   else {
     // 初始化编号,申请人,申请时间
-    detailForm.value.projectNo = '系统自动生成'
+    detailForm.value.projectNo = ''
     detailForm.value.createUser = window.localStorage.getItem('name')!
     detailForm.value.createTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
@@ -348,10 +366,8 @@
       >
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item label="分包项目编号:" prop="projectNo">
-              <el-input
-                v-model="detailForm.projectNo" disabled
-              />
+            <el-form-item label="分包项目编号:" prop="id">
+              <el-input v-model="detailForm.id" disabled placeholder="系统自动生成" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -380,24 +396,35 @@
             <el-form-item label="分包方编号:" prop="outsourcerId">
               <el-input
                 v-model="detailForm.outsourcerId"
-                :disabled="query.title === '详情'"
-              />
+                disabled
+              >
+                <template v-if="query.title !== '详情'" #append>
+                  <el-button
+                    size="small"
+                    @click="changeProjectVisible(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="公司名称:" prop="outsourcerName">
               <el-input
                 v-model="detailForm.outsourcerName"
-                :disabled="query.title === '详情'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="分包原因:" prop="outsourceReason">
-              <el-input
-                v-model="detailForm.outsourceReason"
-                :disabled="query.title === '详情'"
-              />
+              <el-select
+                v-model="detailForm.outsourceReason" :disabled="query.title === '详情'"
+              >
+                <el-option label="无检测能力" value="无检测能力" />
+                <el-option label="其他" value="其他" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -459,11 +486,11 @@
         </el-row>
       </el-form>
     </detail-page>
-    <detail-block title="样品列表">
+    <detail-block title="样品信息">
       <template v-if="query.title !== '详情'" #btns>
-        <!-- <el-button type="primary" @click="multiAdd">
+        <el-button type="primary" @click="multiAdd">
           批量添加
-        </el-button> -->
+        </el-button>
         <el-button type="primary" @click="addRow">
           增加行
         </el-button>
@@ -471,7 +498,6 @@
           删除行
         </el-button>
       </template>
-
       <el-table
         :data="list"
         border
@@ -506,8 +532,13 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
-    <!-- :order-id="detailForm.orderId" :customer-id="formInline.customerId" -->
-    <select-sample v-model:visible="sampleVisible" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+    <!-- 样品增加弹窗 -->
+    <select-sample v-model:visible="sampleVisible" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+    <!-- 项目选择 -->
+    <select-project-approve
+      v-model:visible="projectVisible" :form-id="detailForm.formId" @clickConfirmProject="clickConfirmProject"
+      @change-visible="changeProjectVisible(false)"
+    />
   </app-container>
 </template>
 
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index 57a789a..0f926af 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -271,7 +271,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" fixed="right" width="120">
+            <el-table-column label="操作" align="center" fixed="right" width="180">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index 0be983d..690b50e 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -256,7 +256,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" fixed="right" width="120">
+            <el-table-column label="操作" align="center" fixed="right" width="180">
               <template #default="{ row }">
                 <el-button
                   size="small"
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index c7730a1..dac01f9 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -1,19 +1,23 @@
 <!-- 分包验收详情 -->
 <script lang="ts" setup>
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ref } from 'vue'
-import { filter } from 'lodash'
-import type { IApplyDetail, IDetailList } from '../subpackage-interface'
+import type { IApplyDetail, ISampleList } from '../subpackage-interface'
+import selectSample from '../apply/components/selectSample.vue'
+import selectProjectNo from '../apply/components/selectProjectNo.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { detail } from '@/api/business/subpackage/check'
+import { detail, save, submit } from '@/api/business/subpackage/check'
 import { fetchApproval, submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 
+const { proxy } = getCurrentInstance() as any
 const $route = useRoute()
 const $router = useRouter()
 const query = $route.query
+const ruleFormRef = ref<FormInstance>() as any
 const detailForm = ref<IApplyDetail>({
+  formId: query.formId as string,
   applicantName: '', // 申请名称
   applicantId: '', // 申请id
   applicantTime: '', // 申请时间
@@ -22,7 +26,7 @@
   applyProcessId: '', // 申请流程id
   applyRemark: '', // 申请备注
   checkApprovalStatus: '', // 申请状态码
-  checkConclusion: '', // 审批结果
+  checkConclusion: '', // 验收结论
   checkMinioFileName: '', // 审核文件名称
   checkProcessId: '', // 审批流程id
   checkRemark: '', // 审核备注
@@ -52,31 +56,25 @@
   outsourcerName: [{ required: true, message: '公司名称必填', trigger: ['blur', 'change'] }],
   outsourceReasonName: [{ required: true, message: '分包原因必填', trigger: ['blur', 'change'] }],
   preCost: [{ required: true, message: '预计费用必填', trigger: ['blur', 'change'] }],
-  preStartTime: [{ required: true, message: '预计开始时间必填', trigger: ['blur', 'change'] }],
-  preEndTime: [{ required: true, message: '预计结束时间必填', trigger: ['blur', 'change'] }],
+  checkTime: [{ required: true, message: '验收时间必填', trigger: ['blur', 'change'] }],
+  checkConclusion: [{ required: true, message: '验收结论必填', trigger: ['blur', 'change'] }],
 })
 
-const list = ref<IDetailList[]>([])// 表格数据
+const list = ref<ISampleList[]>([])// 表格数据
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '230' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'orderCode', align: 'center' },
-  { text: '委托书编号', value: 'manufacturingNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'customerNo', align: 'center' },
   { text: '委托单位', value: 'customerName', align: 'center' },
 ])
 
 const getDetail = () => {
   detail({ id: $route.params.id }).then((res) => {
-    // let interfaceStr = ''
-    // for (const key in res.data.sampleList[0]) {
-    //   const item = res.data[key]
-    //   interfaceStr += `${key}:${typeof (item)}\n`
-    // }
-    // console.log(interfaceStr)
     detailForm.value = res.data
-    list.value = res.data.sampleList.filter((item: IDetailList) => {
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
       return item !== null
     })
   })
@@ -99,6 +97,193 @@
 const close = () => {
   $router.back()
 }
+
+// 保存
+const handleSave = () => {
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      const _list = list.value.map((item: any) => {
+        return {
+          orderId: item.orderId ? item.orderId : 0,
+          sampleId: item.id,
+        }
+      })
+      const params = {
+        id: detailForm.value.id,
+        outsourcerName: detailForm.value.outsourcerName,
+        applicantTime: detailForm.value.applicantTime,
+        applyMinioFileName: detailForm.value.applyMinioFileName,
+        applyProcessId: detailForm.value.applyProcessId,
+        applyRemark: detailForm.value.applyRemark,
+        outsourceReason: detailForm.value.outsourceReason,
+        outsourceReasonName: detailForm.value.outsourceReasonName,
+        outsourcerId: detailForm.value.outsourcerId,
+        checkTime: detailForm.value.checkTime,
+        checkConclusion: detailForm.value.checkConclusion,
+        preCost: detailForm.value.preCost,
+        preEndTime: detailForm.value.preEndTime,
+        preStartTime: detailForm.value.preStartTime,
+        projectName: detailForm.value.projectName,
+        projectNo: detailForm.value.projectNo,
+        checkMinioFileName: detailForm.value.checkMinioFileName,
+        checkRemark: detailForm.value.checkRemark,
+        checkProcessId: detailForm.value.checkProcessId,
+        orderSampleList: [..._list],
+      }
+      save(params).then((res) => {
+        detailForm.value.id = res.data.id
+        ElMessage.success('保存成功')
+        loading.close()
+        close()
+      })
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  console.log(detailForm.value.id)
+  if (detailForm.value.id) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: detailForm.value.id,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存再提交！')
+  }
+}
+
+// 编辑
+const handleEdit = () => {
+
+}
+
+// 编辑
+const handleDel = () => {
+
+}
+
+// 增加行
+const addRow = () => {
+  const index = list.value.findIndex(item => !item.sampleNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  list.value.push({
+    orderCode: '',	// 原始记录单编号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    customerNo: '', // 委托方id
+    customerName: '', // 委托方名称
+    startTime: '',
+    endTime: '',
+  })
+}
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+// 点击批量添加
+const multiAdd = () => {
+  sampleVisible.value = true
+  isMulti.value = true
+}
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+// 选好样品
+const clickConfirmSample = (val: any) => {
+  if (val && val.length) {
+    if (isMulti.value) {
+      val.forEach((item: ISampleList) => {
+        // 只添加列表里不存在的
+        const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+        if (index === -1) {
+          list.value.push(item)
+        }
+      })
+    }
+    else {
+      const index = list.value.findIndex((i: ISampleList) => val[0].sampleNo === i.sampleNo)
+      if (index !== -1) {
+        ElMessage.warning('此样品已添加过')
+        return
+      }
+      list.value.splice(selectIndex.value, 1, val[0])
+    }
+  }
+}
+
+// 选择项目id
+const clickConfirmProject = (val: any) => {
+  detailForm.value.id = val[0].id
+  detailForm.value.checkConclusion = val[0].checkConclusion
+  detailForm.value.checkTime = val[0].checkTime
+  detailForm.value.checkMinioFileName = val[0].checkMinioFileName
+  detailForm.value.checkRemark = val[0].checkRemark
+  detailForm.value.checkProcessId = val[0].checkProcessId
+
+  detailForm.value.projectName = val[0].projectName
+  detailForm.value.outsourcerId = val[0].outsourcerId
+  detailForm.value.projectNo = val[0].projectNo
+}
+
+const checkoutList = ref([])
+// 选中行
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+
+// 删除行
+const delRow = () => {
+  if (checkoutList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutList.value.forEach((item: ISampleList) => {
+      list.value.forEach((element, index) => {
+        if (element.sampleNo === item.sampleNo) {
+          list.value.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
 // 文件上传
 const fileRef = ref()
 const onFileChange = (event: any) => {
@@ -128,6 +313,11 @@
   if (query.title !== '新建') {
     getDetail()
   }
+  else {
+    // 初始化编号,申请人,申请时间
+    detailForm.value.projectNo = '系统自动生成'
+    detailForm.value.checkerName = window.localStorage.getItem('name')!
+  }
 })
 </script>
 
@@ -147,13 +337,13 @@
           </el-button>
         </template>
         <template v-if="['草稿箱', '已取消'].includes(query.approvalStatusName as string)">
-          <el-button type="primary">
+          <el-button type="primary" @click="handleSubmit">
             提交
           </el-button>
-          <el-button type="primary">
+          <el-button type="primary" @click="handleEdit">
             编辑
           </el-button>
-          <el-button type="primary">
+          <el-button type="primary" @click="handleDel">
             删除
           </el-button>
         </template>
@@ -163,10 +353,10 @@
           </el-button>
         </template>
         <template v-if="query.title === '新建'">
-          <el-button type="primary">
+          <el-button type="primary" @click="handleSave">
             保存
           </el-button>
-          <el-button type="primary">
+          <el-button type="primary" @click="handleSubmit">
             提交
           </el-button>
         </template>
@@ -174,83 +364,70 @@
           关闭
         </el-button>
       </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="detailForm"
-        label-width="140"
-        label-position="right"
-        :rules="formRules"
-      >
+      <el-form ref="ruleFormRef" :model="detailForm" label-width="140" label-position="right" :rules="formRules">
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item label="分包项目编号:" prop="projectNo">
-              <el-input
-                v-model="detailForm.projectNo" disabled
-              />
+            <el-form-item label="分包项目编号:" prop="id">
+              <el-input v-model="detailForm.id" disabled>
+                <template v-if="query.title !== '详情'" #append>
+                  <el-button
+                    size="small"
+                    @click="changeProjectVisible(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="分包项目名称:" prop="projectName">
-              <el-input
-                v-model="detailForm.projectName"
-                :disabled="query.title === '详情'"
-              />
+              <el-input v-model="detailForm.projectName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="验收人:" prop="applicantName">
-              <el-input
-                v-model="detailForm.applicantName" disabled
-              />
+            <el-form-item label="验收人:" prop="checkerName">
+              <el-input v-model="detailForm.checkerName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="验收时间:" prop="applicantTime">
-              <el-input
-                v-model="detailForm.applicantTime" disabled
+            <el-form-item label="验收时间:" prop="checkTime">
+              <el-date-picker
+                v-model="detailForm.checkTime" type="datetime" placeholder="请选择验收时间"
+                format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="分包方编号:" prop="outsourcerId">
-              <el-input
-                v-model="detailForm.outsourcerId"
-                :disabled="query.title === '详情'"
-              />
+              <el-input v-model="detailForm.outsourcerId" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="公司名称:" prop="outsourcerName">
-              <el-input
-                v-model="detailForm.outsourcerName"
-                :disabled="query.title === '详情'"
-              />
+              <el-input v-model="detailForm.outsourcerName" :disabled="query.title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="分包原因:" prop="outsourceReasonName">
-              <el-input
-                v-model="detailForm.outsourceReasonName"
-                :disabled="query.title === '详情'"
-              />
+              <el-select
+                v-model="detailForm.outsourceReasonName" :disabled="query.title === '详情'"
+              >
+                <el-option label="无检测能力" value="无检测能力" />
+                <el-option label="其他" value="其他" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6" />
           <el-col :span="12">
-            <el-form-item label="结论:" prop="applyRemark">
-              <el-input
-                v-model="detailForm.applyRemark"
-                :disabled="query.title === '详情'"
-              />
+            <el-form-item label="验收结论:" prop="checkConclusion">
+              <el-input v-model="detailForm.checkConclusion" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12" />
           <el-col :span="12">
             <el-form-item label="备注:" prop="applyRemark">
-              <el-input
-                v-model="detailForm.applyRemark"
-                :disabled="query.title === '详情'"
-              />
+              <el-input v-model="detailForm.applyRemark" :disabled="query.title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="12" />
@@ -259,7 +436,7 @@
               <input v-show="query.title === ''" ref="fileRef" multiple type="file" @change="onFileChange">
               <span v-if="query.title === '详情' && !detailForm.applyMinioFileName">无</span>
               <div v-else style="display: flex;">
-                <show-photo :minio-file-name="detailForm.applyMinioFileName || ''" style="display: inline-block;margin: 10px;" />
+                <show-photo :minio-file-name="detailForm.applyMinioFileName || ''" style="display: inline-block;" />
               </div>
               <el-button v-if="query.title !== '详情'" type="primary" :disabled="query.title === '详情'" @click="upload">
                 {{ detailForm.applyMinioFileName ? '更换' : '上传' }}
@@ -270,30 +447,51 @@
         </el-row>
       </el-form>
     </detail-page>
-    <detail-block title="样品详情">
-      <el-table
-        :data="list"
-        border
-        style="width: 100%;"
-        max-height="600"
-      >
-        <el-table-column type="selection" width="38" />
+    <detail-block title="样品信息">
+      <template v-if="query.title !== '详情'" #btns>
+        <el-button type="primary" @click="multiAdd">
+          批量添加
+        </el-button>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table :data="list" border style="width: 100%;" max-height="600" @selection-change="handleSelectionChange">
+        <el-table-column v-if="query.title !== '详情'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          show-overflow-tooltip
-          align="center"
-        />
+          v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
+          :width="item.width" show-overflow-tooltip align="center"
+        >
+          <template v-if="item.value === 'sampleNo' && ['新建', '编辑'].includes(query.title as string)" #default="scope">
+            <el-input v-model="scope.row.sampleNo" placeholder="请选择设备" class="input">
+              <template #append>
+                <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="query.approvalStatusName !== '草稿箱' && query.title !== '新增'" title="审批流程">
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && query.title !== '新建'" title="审批流程">
       <!-- 审批流程 -->
       <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-project-no
+      v-model:visible="projectVisible" :form-id="detailForm.formId" @clickConfirmProject="clickConfirmProject"
+      @change-visible="changeProjectVisible(false)"
+    />
   </app-container>
 </template>
 
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index a759976..fe7417b 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -120,6 +120,7 @@
     },
     query: {
       title: '新建',
+      formId: listQuery.value.formId,
     },
   })
 }
@@ -149,6 +150,7 @@
     },
     query: {
       title: '详情',
+      formId: listQuery.value.formId,
       approvalStatusName: menu.value.find(item => item.id === active.value)!.name as string,
     },
   })
@@ -164,6 +166,7 @@
     },
     query: {
       title: '编辑',
+      formId: listQuery.value.formId,
       approvalStatusName: menu.value.find(item => item.id === active.value)!.name as string,
     },
   })
@@ -285,7 +288,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" fixed="right" width="120">
+            <el-table-column label="操作" align="center" fixed="right" width="180">
               <template #default="{ row }">
                 <el-button
                   size="small"

diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index f7ac81c..7f6e7ec 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -77,6 +77,7 @@
   })
 }
 
+// 分包页面 样品列表
 export function listPageBySubpackage(data: object) {
   return request({
     url: '/customer/sample/listPageBySubpackage',
@@ -85,3 +86,11 @@
   })
 }
 
+// 分包页面 申请审批通过列表
+export function listPageOutsourceProject(data: object) {
+  return request({
+    url: '/business/outsourceProject/apply/listPage',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 941ee89..49d2fec 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -24,6 +24,6 @@
   BUSINESS_SUBPACKAGE_APPLY = 'ywglfbxmsq', // 分包项目申请
   BUSINESS_SUBPACKAGE_CHECK = 'ywglfbxmys', // 分包项目验收
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
-  BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzgsp', // 分包方资格资格审批
+  BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
 }
diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue
index 18e5ea3..3afcdd3 100644
--- a/src/views/business/lab/components/distributeDialog.vue
+++ b/src/views/business/lab/components/distributeDialog.vue
@@ -65,14 +65,8 @@
       sampleDetail.value = res.data
       sampleDetail.value.laboratoryId = id
       // 证书类别
-      console.log(res.data)
       sampleDetail.value.certifications = [res.data.measureType]
-      // sampleDetail.value.deptName = res.data.measureProcessList[0].measureSegment
-      const ItemInfo = res.data.measureProcessList.filter((item: { measurePerson: any; measureSegmentId: any }) => {
-        return item.measurePerson == localStorage.name
-      })
-      console.log(ItemInfo)
-      sampleDetail.value.deptId = ItemInfo[0].measureSegmentId
+      sampleDetail.value.deptId = res.data.measureProcessList[0].measureSegmentId
       // 延迟使用，因为还没挂载
       nextTick(() => {
         _selectStaffDialog.value.fetchData()
@@ -90,7 +84,6 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string; measurePersonId: string; measureSegmentId: string }) => {
-  console.log(person)
   processNode.value.executivePerson = person.id
   processNode.value.executivePersonName = person.name
   processNode.value.measurePersonId = person.measurePersonId
@@ -113,21 +106,26 @@
     if (res.code == 200) {
       ElMessage.success('分配成功')
     }
+    cancel()
   })
   emit('close')
 }
 
 function cancel() {
   dialogVisible.value = false
+  // 清除之前的选择
+  processNode.value.executivePerson = ''
+  processNode.value.executivePersonName = ''
+  processNode.value.measurePersonId = ''
+  processNode.value.measureSegmentId = ''
 }
 getDict()
-
 // ----------------------- 以下是暴露的方法内容 ----------------------------
-defineExpose({ initDialog })
+defineExpose({ initDialog, choosePerson })
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" title="任务分发" width="700" @close="cancel">
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="任务分发" width="700" @close="cancel">
     <div class="simple-info">
       <div class="simple-info-line">
         <span class="label">样品名称:</span>
@@ -170,8 +168,7 @@
         取消
       </el-button>
     </template>
-    <!-- :dept-id="sampleDetail.deptId" -->
-    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :dept-id="sampleDetail.deptId" :data="[processNode.executivePerson]" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-if="choosePersonShow" ref="_selectStaffDialog" v-model:visible="choosePersonShow" :dept-id="sampleDetail.deptId" :data="[processNode.executivePerson]" :multi="false" @change="choosePersonOver" />
   </el-dialog>
 </template>
 
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index bd9c8ee..d6cc168 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -96,7 +96,7 @@
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
       return item
     })
-    total.value = res.total
+    total.value = res.data.total
     loadingTable.value = false
   })
 }
@@ -128,6 +128,7 @@
   timeRange.value = ['', '']
   fetchData(true)
 }
+const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
   $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index fb6a3f5..d46a204 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -111,7 +111,7 @@
     <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
       批量添加
     </el-button>
-    <process-config v-if="orderId" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
     <template #footer>
       <el-button type="primary" @click="saveProcess">
         确定
diff --git a/src/views/business/subpackage/apply/components/selectProjectApprove.vue b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
new file mode 100644
index 0000000..523ae7b
--- /dev/null
+++ b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
@@ -0,0 +1,169 @@
+<!-- 分包资格审批选择列表 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { IListQueryRecord, IRecordList } from '../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getListPage } from '@/api/business/subpackage/record'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  formId: {
+    type: String,
+    default: '',
+  },
+})
+
+const emits = defineEmits(['changeVisible', 'clickConfirmProject'])
+
+// 查询条件
+const listQuery: Ref<IListQueryRecord> = ref({
+  businessSize: '', // 业务规模-字典code
+  formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPROVE, // 表单id
+  grade: '', // 	履约评级-字典code
+  ids: [],
+  outsourcerName: '', // 分包方公司名字
+  outsourcerNo: '', // 编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '分包项目编号', value: 'outsourcerNo', align: 'center', width: '160px' },
+  { text: '公司名称', value: 'outsourcerName', align: 'center', width: '160px' },
+  { text: '公司规模', value: 'outsourcerSize', align: 'center', width: '160px' },
+  { text: '业务规模', value: 'reciever', align: 'center', width: '180px' },
+  { text: '履约评级', value: 'grade', align: 'center', width: '180px' },
+  { text: '整体评价', value: 'businessSizeName', align: 'center', width: '180px' },
+  { text: '业务内容', value: 'deliverTime', align: 'center', width: '180px' },
+  { text: '公司地址', value: 'fullAddress', align: 'center', width: '180px' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<IRecordList[]>([])
+// 总数
+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
+  // listQuery.value.id = props.orderId
+  getListPage(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 = {
+    businessSize: '', // 业务规模-字典code
+    formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPROVE, // 表单id
+    grade: '', // 	履约评级-字典code
+    ids: [],
+    outsourcerName: '', // 分包方公司名字
+    outsourcerNo: '', // 编号
+    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 clickConfirmProject = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmProject', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择分包方" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.outsourcerNo" placeholder="分包方编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.outsourcerName" placeholder="分包方名称" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
+        :height="260" :is-multi="false" @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmProject">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/subpackage/apply/components/selectProjectNo.vue b/src/views/business/subpackage/apply/components/selectProjectNo.vue
new file mode 100644
index 0000000..9d145a8
--- /dev/null
+++ b/src/views/business/subpackage/apply/components/selectProjectNo.vue
@@ -0,0 +1,158 @@
+<!-- 分包管理项目选择列表 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { IListQueryProject, IProjectList } from '../../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageOutsourceProject } from '@/api/business/subpackage/apply'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  formId: {
+    type: String,
+    default: '',
+  },
+})
+
+const emits = defineEmits(['changeVisible', 'clickConfirmProject'])
+
+// 查询条件
+const listQuery: Ref<IListQueryProject> = ref({
+  formId: props.formId!,
+  projectName: '',
+  projectNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '项目编号', value: 'id', width: '160', align: 'center' },
+  { text: '项目名称', value: 'projectName', width: '120', align: 'center' },
+  { text: '申请时间', value: 'applicantTime', align: 'center' },
+  { text: '备注', value: 'applyRemark', align: 'center' },
+])
+// 表格数据
+const list = ref<IProjectList[]>([])
+// 总数
+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
+  // listQuery.value.id = props.orderId
+  listPageOutsourceProject(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 = {
+    formId: props.formId!,
+    projectName: '',
+    projectNo: '',
+    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 clickConfirmProject = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmProject', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择项目" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.projectNo" placeholder="项目编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.projectName" placeholder="项目名称" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
+        :height="260" :is-multi="false" @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmProject">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/subpackage/apply/components/selectSample.vue b/src/views/business/subpackage/apply/components/selectSample.vue
index e15c8ba..336912a 100644
--- a/src/views/business/subpackage/apply/components/selectSample.vue
+++ b/src/views/business/subpackage/apply/components/selectSample.vue
@@ -1,4 +1,4 @@
-<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<!-- 分包管理样品列表 -->
 <script setup lang="ts" name="SelectSample">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -20,7 +20,12 @@
     type: String,
     default: '',
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
+
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
@@ -147,8 +152,25 @@
       >
         <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"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
             v-model.trim="listQuery.sampleNo"
             placeholder="样品编号"
+            class="short-input"
             clearable
           />
         </search-item>
@@ -156,6 +178,7 @@
           <el-input
             v-model.trim="listQuery.sampleName"
             placeholder="样品名称"
+            class="short-input"
             clearable
           />
         </search-item>
@@ -167,8 +190,7 @@
         :query="listQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
-        :page-sizes="[20]"
+        :is-multi="isMulti"
         :height="260"
         @change="changePage"
         @multi-select="handleSelectionChange"
@@ -177,7 +199,7 @@
         <template #preColumns>
           <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
-              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 542e2aa..94b068f 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -3,9 +3,8 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ref } from 'vue'
-import { filter } from 'lodash'
 import type { IApplyDetail, ISampleList } from '../subpackage-interface'
-// import selectSampleDialog from './components/selectSampleDialog.vue'
+import selectProjectApprove from '../apply/components/selectProjectApprove.vue'
 import selectSample from './components/selectSample.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { detail, save, submit } from '@/api/business/subpackage/apply'
@@ -18,6 +17,7 @@
 const query = $route.query
 const ruleFormRef = ref<FormInstance>() as any
 const detailForm = ref<IApplyDetail>({
+  formId: query.formId as string,
   applicantName: '', // 申请名称
   applicantId: '', // 申请id
   applicantTime: '', // 申请时间
@@ -51,10 +51,10 @@
 })
 // 校验规则
 const formRules = ref({
-  projectName: [{ required: true, message: '分包项目名称必填', trigger: 'blur' }],
+  projectName: [{ required: true, message: '分包项目名称必填', trigger: ['blur', 'change'] }],
   outsourcerId: [{ required: true, message: '分包方编号必填', trigger: ['blur', 'change'] }],
   outsourcerName: [{ required: true, message: '公司名称必填', trigger: ['blur', 'change'] }],
-  outsourceReasonName: [{ required: true, message: '分包原因必填', trigger: ['blur', 'change'] }],
+  outsourceReason: [{ required: true, message: '分包原因必填', trigger: ['blur', 'change'] }],
   preCost: [{ required: true, message: '预计费用必填', trigger: ['blur', 'change'] }],
   preStartTime: [{ required: true, message: '预计开始时间必填', trigger: ['blur', 'change'] }],
   preEndTime: [{ required: true, message: '预计结束时间必填', trigger: ['blur', 'change'] }],
@@ -66,19 +66,13 @@
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '230' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'orderCode', align: 'center' },
-  { text: '委托书编号', value: 'manufacturingNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'customerNo', align: 'center' },
   { text: '委托单位', value: 'customerName', align: 'center' },
 ])
 
 const getDetail = () => {
   detail({ id: $route.params.id }).then((res) => {
-    // let interfaceStr = ''
-    // for (const key in res.data.sampleList[0]) {
-    //   const item = res.data[key]
-    //   interfaceStr += `${key}:${typeof (item)}\n`
-    // }
-    // console.log(interfaceStr)
     detailForm.value = res.data
     list.value = res.data.sampleList.filter((item: ISampleList) => {
       return item !== null
@@ -115,33 +109,29 @@
       const _list = list.value.map((item: any) => {
         return {
           orderId: item.orderId ? item.orderId : 0,
-          sampleId: item.sampleNo,
+          sampleId: item.id,
         }
       })
       const params = {
+        id: detailForm.value.id,
+        projectName: detailForm.value.projectName,
+        outsourcerName: detailForm.value.outsourcerName,
         applicantTime: detailForm.value.applicantTime,
         applyMinioFileName: detailForm.value.applyMinioFileName,
         applyProcessId: detailForm.value.applyProcessId,
         applyRemark: detailForm.value.applyRemark,
         outsourceReason: detailForm.value.outsourceReason,
         outsourceReasonName: detailForm.value.outsourceReasonName,
-        outsourcerId: 0,
+        outsourcerId: detailForm.value.outsourcerId,
+        checkTime: detailForm.value.checkTime,
+        checkConclusion: detailForm.value.checkConclusion,
         preCost: detailForm.value.preCost,
         preEndTime: detailForm.value.preEndTime,
         preStartTime: detailForm.value.preStartTime,
-        projectName: detailForm.value.projectName,
-        projectNo: '',
-        sampleList: [
-          // {
-          //   customerName: '',
-          //   manufacturingNo: '',
-          //   orderCode: '',
-          //   sampleModel: '',
-          //   sampleName: '',
-          //   sampleNo: '',
-          // },
-          ...list.value,
-        ],
+        projectNo: detailForm.value.projectNo,
+        checkMinioFileName: detailForm.value.checkMinioFileName,
+        checkRemark: detailForm.value.checkRemark,
+        checkProcessId: detailForm.value.checkProcessId,
         orderSampleList: [..._list],
       }
       save(params).then((res) => {
@@ -187,15 +177,17 @@
     return
   }
   list.value.push({
-    customerName: '', // 消费名称
-    manufacturingNo: '', // 编号
-    orderCode: '', // 订单code
-    sampleModel: '', // 样品模型
-    sampleName: '', // 样品名称
-    sampleNo: '', // 样品编号
+    orderCode: '',	// 原始记录单编号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    customerNo: '', // 委托方id
+    customerName: '', // 委托方名称
+    startTime: '',
+    endTime: '',
   })
 }
 const sampleVisible = ref(false)
+const projectVisible = ref(false)
 const isMulti = ref(false)
 const selectIndex = ref(0)
 // 点击选择
@@ -217,18 +209,44 @@
 const changeSampleVisible = (val: boolean) => {
   sampleVisible.value = val
 }
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
 // 选好样品
 const clickConfirmSample = (val: any) => {
   if (val && val.length) {
-    const index = list.value.findIndex((i: ISampleList) => val[0].sampleNo === i.sampleNo)
-    if (index !== -1) {
-      ElMessage.warning('此样品已添加过')
-      return
+    if (isMulti.value) {
+      val.forEach((item: ISampleList) => {
+        // 只添加列表里不存在的
+        const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+        if (index === -1) {
+          list.value.push(item)
+        }
+      })
     }
-    list.value.splice(selectIndex.value, 1, val[0])
+    else {
+      const index = list.value.findIndex((i: ISampleList) => val[0].sampleNo === i.sampleNo)
+      if (index !== -1) {
+        ElMessage.warning('此样品已添加过')
+        return
+      }
+      list.value.splice(selectIndex.value, 1, val[0])
+    }
   }
 }
 
+// 选择项目id
+const clickConfirmProject = (val: any) => {
+  // detailForm.value.checkTime = val[0].checkTime
+  // detailForm.value.projectName = val[0].projectName
+  // detailForm.value.outsourcerId = val[0].outsourcerId
+  // detailForm.value.projectNo = val[0].projectNo
+  detailForm.value.outsourcerId = val[0].outsourcerNo
+  detailForm.value.outsourcerName = val[0].outsourcerName
+}
+
 // 选中行
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
@@ -289,7 +307,7 @@
   }
   else {
     // 初始化编号,申请人,申请时间
-    detailForm.value.projectNo = '系统自动生成'
+    detailForm.value.projectNo = ''
     detailForm.value.createUser = window.localStorage.getItem('name')!
     detailForm.value.createTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
@@ -348,10 +366,8 @@
       >
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item label="分包项目编号:" prop="projectNo">
-              <el-input
-                v-model="detailForm.projectNo" disabled
-              />
+            <el-form-item label="分包项目编号:" prop="id">
+              <el-input v-model="detailForm.id" disabled placeholder="系统自动生成" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -380,24 +396,35 @@
             <el-form-item label="分包方编号:" prop="outsourcerId">
               <el-input
                 v-model="detailForm.outsourcerId"
-                :disabled="query.title === '详情'"
-              />
+                disabled
+              >
+                <template v-if="query.title !== '详情'" #append>
+                  <el-button
+                    size="small"
+                    @click="changeProjectVisible(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="公司名称:" prop="outsourcerName">
               <el-input
                 v-model="detailForm.outsourcerName"
-                :disabled="query.title === '详情'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="分包原因:" prop="outsourceReason">
-              <el-input
-                v-model="detailForm.outsourceReason"
-                :disabled="query.title === '详情'"
-              />
+              <el-select
+                v-model="detailForm.outsourceReason" :disabled="query.title === '详情'"
+              >
+                <el-option label="无检测能力" value="无检测能力" />
+                <el-option label="其他" value="其他" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -459,11 +486,11 @@
         </el-row>
       </el-form>
     </detail-page>
-    <detail-block title="样品列表">
+    <detail-block title="样品信息">
       <template v-if="query.title !== '详情'" #btns>
-        <!-- <el-button type="primary" @click="multiAdd">
+        <el-button type="primary" @click="multiAdd">
           批量添加
-        </el-button> -->
+        </el-button>
         <el-button type="primary" @click="addRow">
           增加行
         </el-button>
@@ -471,7 +498,6 @@
           删除行
         </el-button>
       </template>
-
       <el-table
         :data="list"
         border
@@ -506,8 +532,13 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
-    <!-- :order-id="detailForm.orderId" :customer-id="formInline.customerId" -->
-    <select-sample v-model:visible="sampleVisible" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+    <!-- 样品增加弹窗 -->
+    <select-sample v-model:visible="sampleVisible" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+    <!-- 项目选择 -->
+    <select-project-approve
+      v-model:visible="projectVisible" :form-id="detailForm.formId" @clickConfirmProject="clickConfirmProject"
+      @change-visible="changeProjectVisible(false)"
+    />
   </app-container>
 </template>
 
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index 57a789a..0f926af 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -271,7 +271,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" fixed="right" width="120">
+            <el-table-column label="操作" align="center" fixed="right" width="180">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index 0be983d..690b50e 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -256,7 +256,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" fixed="right" width="120">
+            <el-table-column label="操作" align="center" fixed="right" width="180">
               <template #default="{ row }">
                 <el-button
                   size="small"
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index c7730a1..dac01f9 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -1,19 +1,23 @@
 <!-- 分包验收详情 -->
 <script lang="ts" setup>
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ref } from 'vue'
-import { filter } from 'lodash'
-import type { IApplyDetail, IDetailList } from '../subpackage-interface'
+import type { IApplyDetail, ISampleList } from '../subpackage-interface'
+import selectSample from '../apply/components/selectSample.vue'
+import selectProjectNo from '../apply/components/selectProjectNo.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { detail } from '@/api/business/subpackage/check'
+import { detail, save, submit } from '@/api/business/subpackage/check'
 import { fetchApproval, submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 
+const { proxy } = getCurrentInstance() as any
 const $route = useRoute()
 const $router = useRouter()
 const query = $route.query
+const ruleFormRef = ref<FormInstance>() as any
 const detailForm = ref<IApplyDetail>({
+  formId: query.formId as string,
   applicantName: '', // 申请名称
   applicantId: '', // 申请id
   applicantTime: '', // 申请时间
@@ -22,7 +26,7 @@
   applyProcessId: '', // 申请流程id
   applyRemark: '', // 申请备注
   checkApprovalStatus: '', // 申请状态码
-  checkConclusion: '', // 审批结果
+  checkConclusion: '', // 验收结论
   checkMinioFileName: '', // 审核文件名称
   checkProcessId: '', // 审批流程id
   checkRemark: '', // 审核备注
@@ -52,31 +56,25 @@
   outsourcerName: [{ required: true, message: '公司名称必填', trigger: ['blur', 'change'] }],
   outsourceReasonName: [{ required: true, message: '分包原因必填', trigger: ['blur', 'change'] }],
   preCost: [{ required: true, message: '预计费用必填', trigger: ['blur', 'change'] }],
-  preStartTime: [{ required: true, message: '预计开始时间必填', trigger: ['blur', 'change'] }],
-  preEndTime: [{ required: true, message: '预计结束时间必填', trigger: ['blur', 'change'] }],
+  checkTime: [{ required: true, message: '验收时间必填', trigger: ['blur', 'change'] }],
+  checkConclusion: [{ required: true, message: '验收结论必填', trigger: ['blur', 'change'] }],
 })
 
-const list = ref<IDetailList[]>([])// 表格数据
+const list = ref<ISampleList[]>([])// 表格数据
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '230' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'orderCode', align: 'center' },
-  { text: '委托书编号', value: 'manufacturingNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'customerNo', align: 'center' },
   { text: '委托单位', value: 'customerName', align: 'center' },
 ])
 
 const getDetail = () => {
   detail({ id: $route.params.id }).then((res) => {
-    // let interfaceStr = ''
-    // for (const key in res.data.sampleList[0]) {
-    //   const item = res.data[key]
-    //   interfaceStr += `${key}:${typeof (item)}\n`
-    // }
-    // console.log(interfaceStr)
     detailForm.value = res.data
-    list.value = res.data.sampleList.filter((item: IDetailList) => {
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
       return item !== null
     })
   })
@@ -99,6 +97,193 @@
 const close = () => {
   $router.back()
 }
+
+// 保存
+const handleSave = () => {
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      const _list = list.value.map((item: any) => {
+        return {
+          orderId: item.orderId ? item.orderId : 0,
+          sampleId: item.id,
+        }
+      })
+      const params = {
+        id: detailForm.value.id,
+        outsourcerName: detailForm.value.outsourcerName,
+        applicantTime: detailForm.value.applicantTime,
+        applyMinioFileName: detailForm.value.applyMinioFileName,
+        applyProcessId: detailForm.value.applyProcessId,
+        applyRemark: detailForm.value.applyRemark,
+        outsourceReason: detailForm.value.outsourceReason,
+        outsourceReasonName: detailForm.value.outsourceReasonName,
+        outsourcerId: detailForm.value.outsourcerId,
+        checkTime: detailForm.value.checkTime,
+        checkConclusion: detailForm.value.checkConclusion,
+        preCost: detailForm.value.preCost,
+        preEndTime: detailForm.value.preEndTime,
+        preStartTime: detailForm.value.preStartTime,
+        projectName: detailForm.value.projectName,
+        projectNo: detailForm.value.projectNo,
+        checkMinioFileName: detailForm.value.checkMinioFileName,
+        checkRemark: detailForm.value.checkRemark,
+        checkProcessId: detailForm.value.checkProcessId,
+        orderSampleList: [..._list],
+      }
+      save(params).then((res) => {
+        detailForm.value.id = res.data.id
+        ElMessage.success('保存成功')
+        loading.close()
+        close()
+      })
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  console.log(detailForm.value.id)
+  if (detailForm.value.id) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: detailForm.value.id,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存再提交！')
+  }
+}
+
+// 编辑
+const handleEdit = () => {
+
+}
+
+// 编辑
+const handleDel = () => {
+
+}
+
+// 增加行
+const addRow = () => {
+  const index = list.value.findIndex(item => !item.sampleNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  list.value.push({
+    orderCode: '',	// 原始记录单编号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    customerNo: '', // 委托方id
+    customerName: '', // 委托方名称
+    startTime: '',
+    endTime: '',
+  })
+}
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+// 点击批量添加
+const multiAdd = () => {
+  sampleVisible.value = true
+  isMulti.value = true
+}
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+// 选好样品
+const clickConfirmSample = (val: any) => {
+  if (val && val.length) {
+    if (isMulti.value) {
+      val.forEach((item: ISampleList) => {
+        // 只添加列表里不存在的
+        const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+        if (index === -1) {
+          list.value.push(item)
+        }
+      })
+    }
+    else {
+      const index = list.value.findIndex((i: ISampleList) => val[0].sampleNo === i.sampleNo)
+      if (index !== -1) {
+        ElMessage.warning('此样品已添加过')
+        return
+      }
+      list.value.splice(selectIndex.value, 1, val[0])
+    }
+  }
+}
+
+// 选择项目id
+const clickConfirmProject = (val: any) => {
+  detailForm.value.id = val[0].id
+  detailForm.value.checkConclusion = val[0].checkConclusion
+  detailForm.value.checkTime = val[0].checkTime
+  detailForm.value.checkMinioFileName = val[0].checkMinioFileName
+  detailForm.value.checkRemark = val[0].checkRemark
+  detailForm.value.checkProcessId = val[0].checkProcessId
+
+  detailForm.value.projectName = val[0].projectName
+  detailForm.value.outsourcerId = val[0].outsourcerId
+  detailForm.value.projectNo = val[0].projectNo
+}
+
+const checkoutList = ref([])
+// 选中行
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+
+// 删除行
+const delRow = () => {
+  if (checkoutList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutList.value.forEach((item: ISampleList) => {
+      list.value.forEach((element, index) => {
+        if (element.sampleNo === item.sampleNo) {
+          list.value.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
 // 文件上传
 const fileRef = ref()
 const onFileChange = (event: any) => {
@@ -128,6 +313,11 @@
   if (query.title !== '新建') {
     getDetail()
   }
+  else {
+    // 初始化编号,申请人,申请时间
+    detailForm.value.projectNo = '系统自动生成'
+    detailForm.value.checkerName = window.localStorage.getItem('name')!
+  }
 })
 </script>
 
@@ -147,13 +337,13 @@
           </el-button>
         </template>
         <template v-if="['草稿箱', '已取消'].includes(query.approvalStatusName as string)">
-          <el-button type="primary">
+          <el-button type="primary" @click="handleSubmit">
             提交
           </el-button>
-          <el-button type="primary">
+          <el-button type="primary" @click="handleEdit">
             编辑
           </el-button>
-          <el-button type="primary">
+          <el-button type="primary" @click="handleDel">
             删除
           </el-button>
         </template>
@@ -163,10 +353,10 @@
           </el-button>
         </template>
         <template v-if="query.title === '新建'">
-          <el-button type="primary">
+          <el-button type="primary" @click="handleSave">
             保存
           </el-button>
-          <el-button type="primary">
+          <el-button type="primary" @click="handleSubmit">
             提交
           </el-button>
         </template>
@@ -174,83 +364,70 @@
           关闭
         </el-button>
       </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="detailForm"
-        label-width="140"
-        label-position="right"
-        :rules="formRules"
-      >
+      <el-form ref="ruleFormRef" :model="detailForm" label-width="140" label-position="right" :rules="formRules">
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item label="分包项目编号:" prop="projectNo">
-              <el-input
-                v-model="detailForm.projectNo" disabled
-              />
+            <el-form-item label="分包项目编号:" prop="id">
+              <el-input v-model="detailForm.id" disabled>
+                <template v-if="query.title !== '详情'" #append>
+                  <el-button
+                    size="small"
+                    @click="changeProjectVisible(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="分包项目名称:" prop="projectName">
-              <el-input
-                v-model="detailForm.projectName"
-                :disabled="query.title === '详情'"
-              />
+              <el-input v-model="detailForm.projectName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="验收人:" prop="applicantName">
-              <el-input
-                v-model="detailForm.applicantName" disabled
-              />
+            <el-form-item label="验收人:" prop="checkerName">
+              <el-input v-model="detailForm.checkerName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="验收时间:" prop="applicantTime">
-              <el-input
-                v-model="detailForm.applicantTime" disabled
+            <el-form-item label="验收时间:" prop="checkTime">
+              <el-date-picker
+                v-model="detailForm.checkTime" type="datetime" placeholder="请选择验收时间"
+                format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="分包方编号:" prop="outsourcerId">
-              <el-input
-                v-model="detailForm.outsourcerId"
-                :disabled="query.title === '详情'"
-              />
+              <el-input v-model="detailForm.outsourcerId" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="公司名称:" prop="outsourcerName">
-              <el-input
-                v-model="detailForm.outsourcerName"
-                :disabled="query.title === '详情'"
-              />
+              <el-input v-model="detailForm.outsourcerName" :disabled="query.title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="分包原因:" prop="outsourceReasonName">
-              <el-input
-                v-model="detailForm.outsourceReasonName"
-                :disabled="query.title === '详情'"
-              />
+              <el-select
+                v-model="detailForm.outsourceReasonName" :disabled="query.title === '详情'"
+              >
+                <el-option label="无检测能力" value="无检测能力" />
+                <el-option label="其他" value="其他" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6" />
           <el-col :span="12">
-            <el-form-item label="结论:" prop="applyRemark">
-              <el-input
-                v-model="detailForm.applyRemark"
-                :disabled="query.title === '详情'"
-              />
+            <el-form-item label="验收结论:" prop="checkConclusion">
+              <el-input v-model="detailForm.checkConclusion" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12" />
           <el-col :span="12">
             <el-form-item label="备注:" prop="applyRemark">
-              <el-input
-                v-model="detailForm.applyRemark"
-                :disabled="query.title === '详情'"
-              />
+              <el-input v-model="detailForm.applyRemark" :disabled="query.title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="12" />
@@ -259,7 +436,7 @@
               <input v-show="query.title === ''" ref="fileRef" multiple type="file" @change="onFileChange">
               <span v-if="query.title === '详情' && !detailForm.applyMinioFileName">无</span>
               <div v-else style="display: flex;">
-                <show-photo :minio-file-name="detailForm.applyMinioFileName || ''" style="display: inline-block;margin: 10px;" />
+                <show-photo :minio-file-name="detailForm.applyMinioFileName || ''" style="display: inline-block;" />
               </div>
               <el-button v-if="query.title !== '详情'" type="primary" :disabled="query.title === '详情'" @click="upload">
                 {{ detailForm.applyMinioFileName ? '更换' : '上传' }}
@@ -270,30 +447,51 @@
         </el-row>
       </el-form>
     </detail-page>
-    <detail-block title="样品详情">
-      <el-table
-        :data="list"
-        border
-        style="width: 100%;"
-        max-height="600"
-      >
-        <el-table-column type="selection" width="38" />
+    <detail-block title="样品信息">
+      <template v-if="query.title !== '详情'" #btns>
+        <el-button type="primary" @click="multiAdd">
+          批量添加
+        </el-button>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table :data="list" border style="width: 100%;" max-height="600" @selection-change="handleSelectionChange">
+        <el-table-column v-if="query.title !== '详情'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          show-overflow-tooltip
-          align="center"
-        />
+          v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
+          :width="item.width" show-overflow-tooltip align="center"
+        >
+          <template v-if="item.value === 'sampleNo' && ['新建', '编辑'].includes(query.title as string)" #default="scope">
+            <el-input v-model="scope.row.sampleNo" placeholder="请选择设备" class="input">
+              <template #append>
+                <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="query.approvalStatusName !== '草稿箱' && query.title !== '新增'" title="审批流程">
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && query.title !== '新建'" title="审批流程">
       <!-- 审批流程 -->
       <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-project-no
+      v-model:visible="projectVisible" :form-id="detailForm.formId" @clickConfirmProject="clickConfirmProject"
+      @change-visible="changeProjectVisible(false)"
+    />
   </app-container>
 </template>
 
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index a759976..fe7417b 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -120,6 +120,7 @@
     },
     query: {
       title: '新建',
+      formId: listQuery.value.formId,
     },
   })
 }
@@ -149,6 +150,7 @@
     },
     query: {
       title: '详情',
+      formId: listQuery.value.formId,
       approvalStatusName: menu.value.find(item => item.id === active.value)!.name as string,
     },
   })
@@ -164,6 +166,7 @@
     },
     query: {
       title: '编辑',
+      formId: listQuery.value.formId,
       approvalStatusName: menu.value.find(item => item.id === active.value)!.name as string,
     },
   })
@@ -285,7 +288,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" fixed="right" width="120">
+            <el-table-column label="操作" align="center" fixed="right" width="180">
               <template #default="{ row }">
                 <el-button
                   size="small"
diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue
index 126ad4e..9222849 100644
--- a/src/views/business/subpackage/record/list.vue
+++ b/src/views/business/subpackage/record/list.vue
@@ -14,7 +14,7 @@
 // 查询条件
 const listQuery: Ref<IListQueryRecord> = ref({
   businessSize: '', // 业务规模-字典code
-  formId: SCHEDULE.BUSINESS_SUBPACKAGE_RECORD, // 表单id
+  formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPROVE, // 表单id
   grade: '', // 	履约评级-字典code
   ids: [],
   outsourcerName: '', // 分包方公司名字
@@ -25,16 +25,15 @@
 const loadingTable = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '分包项目编号', value: 'interchangeCode', align: 'center', width: '160px' },
-  { text: '公司名称', value: 'customerNo', align: 'center', width: '160px' },
-  { text: '公司规模', value: 'customerName', align: 'center', width: '160px' },
+  { text: '分包项目编号', value: 'outsourcerNo', align: 'center', width: '160px' },
+  { text: '公司名称', value: 'outsourcerName', align: 'center', width: '160px' },
+  { text: '公司规模', value: 'outsourcerSize', align: 'center', width: '160px' },
   { text: '业务规模', value: 'reciever', align: 'center', width: '180px' },
-  { text: '履约评级', value: 'deliverer', align: 'center', width: '180px' },
-  { text: '整体评价', value: 'deliverTime', align: 'center', width: '180px' },
+  { text: '履约评级', value: 'grade', align: 'center', width: '180px' },
+  { text: '整体评价', value: 'businessSizeName', align: 'center', width: '180px' },
   { text: '业务内容', value: 'deliverTime', align: 'center', width: '180px' },
-  { text: '公司地址', value: 'deliverTime', align: 'center', width: '180px' },
-  { text: '创建时间', value: 'deliverTime', align: 'center', width: '180px' },
-  { text: '备注', value: 'deliverTime', align: 'center', width: '180px' },
+  { text: '公司地址', value: 'fullAddress', align: 'center', width: '180px' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
 ])
 const list = ref([])
 const total = ref(0)
@@ -155,7 +154,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" fixed="right" width="120">
+            <el-table-column label="操作" align="center" fixed="right" width="180">
               <template #default="{ row }">
                 <el-button size="small" link type="primary" @click="handleDetail(row)">
                   详情

diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index f7ac81c..7f6e7ec 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -77,6 +77,7 @@
   })
 }
 
+// 分包页面 样品列表
 export function listPageBySubpackage(data: object) {
   return request({
     url: '/customer/sample/listPageBySubpackage',
@@ -85,3 +86,11 @@
   })
 }
 
+// 分包页面 申请审批通过列表
+export function listPageOutsourceProject(data: object) {
+  return request({
+    url: '/business/outsourceProject/apply/listPage',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 941ee89..49d2fec 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -24,6 +24,6 @@
   BUSINESS_SUBPACKAGE_APPLY = 'ywglfbxmsq', // 分包项目申请
   BUSINESS_SUBPACKAGE_CHECK = 'ywglfbxmys', // 分包项目验收
   BUSINESS_SUBPACKAGE_RECORD = 'ywglfbfda', // 分包方档案
-  BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzgsp', // 分包方资格资格审批
+  BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批
   BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理
 }
diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue
index 18e5ea3..3afcdd3 100644
--- a/src/views/business/lab/components/distributeDialog.vue
+++ b/src/views/business/lab/components/distributeDialog.vue
@@ -65,14 +65,8 @@
       sampleDetail.value = res.data
       sampleDetail.value.laboratoryId = id
       // 证书类别
-      console.log(res.data)
       sampleDetail.value.certifications = [res.data.measureType]
-      // sampleDetail.value.deptName = res.data.measureProcessList[0].measureSegment
-      const ItemInfo = res.data.measureProcessList.filter((item: { measurePerson: any; measureSegmentId: any }) => {
-        return item.measurePerson == localStorage.name
-      })
-      console.log(ItemInfo)
-      sampleDetail.value.deptId = ItemInfo[0].measureSegmentId
+      sampleDetail.value.deptId = res.data.measureProcessList[0].measureSegmentId
       // 延迟使用，因为还没挂载
       nextTick(() => {
         _selectStaffDialog.value.fetchData()
@@ -90,7 +84,6 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string; measurePersonId: string; measureSegmentId: string }) => {
-  console.log(person)
   processNode.value.executivePerson = person.id
   processNode.value.executivePersonName = person.name
   processNode.value.measurePersonId = person.measurePersonId
@@ -113,21 +106,26 @@
     if (res.code == 200) {
       ElMessage.success('分配成功')
     }
+    cancel()
   })
   emit('close')
 }
 
 function cancel() {
   dialogVisible.value = false
+  // 清除之前的选择
+  processNode.value.executivePerson = ''
+  processNode.value.executivePersonName = ''
+  processNode.value.measurePersonId = ''
+  processNode.value.measureSegmentId = ''
 }
 getDict()
-
 // ----------------------- 以下是暴露的方法内容 ----------------------------
-defineExpose({ initDialog })
+defineExpose({ initDialog, choosePerson })
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" title="任务分发" width="700" @close="cancel">
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="任务分发" width="700" @close="cancel">
     <div class="simple-info">
       <div class="simple-info-line">
         <span class="label">样品名称:</span>
@@ -170,8 +168,7 @@
         取消
       </el-button>
     </template>
-    <!-- :dept-id="sampleDetail.deptId" -->
-    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :dept-id="sampleDetail.deptId" :data="[processNode.executivePerson]" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-if="choosePersonShow" ref="_selectStaffDialog" v-model:visible="choosePersonShow" :dept-id="sampleDetail.deptId" :data="[processNode.executivePerson]" :multi="false" @change="choosePersonOver" />
   </el-dialog>
 </template>
 
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index bd9c8ee..d6cc168 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -96,7 +96,7 @@
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
       return item
     })
-    total.value = res.total
+    total.value = res.data.total
     loadingTable.value = false
   })
 }
@@ -128,6 +128,7 @@
   timeRange.value = ['', '']
   fetchData(true)
 }
+const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
   $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index fb6a3f5..d46a204 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -111,7 +111,7 @@
     <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
       批量添加
     </el-button>
-    <process-config v-if="orderId" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
     <template #footer>
       <el-button type="primary" @click="saveProcess">
         确定
diff --git a/src/views/business/subpackage/apply/components/selectProjectApprove.vue b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
new file mode 100644
index 0000000..523ae7b
--- /dev/null
+++ b/src/views/business/subpackage/apply/components/selectProjectApprove.vue
@@ -0,0 +1,169 @@
+<!-- 分包资格审批选择列表 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { IListQueryRecord, IRecordList } from '../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getListPage } from '@/api/business/subpackage/record'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  formId: {
+    type: String,
+    default: '',
+  },
+})
+
+const emits = defineEmits(['changeVisible', 'clickConfirmProject'])
+
+// 查询条件
+const listQuery: Ref<IListQueryRecord> = ref({
+  businessSize: '', // 业务规模-字典code
+  formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPROVE, // 表单id
+  grade: '', // 	履约评级-字典code
+  ids: [],
+  outsourcerName: '', // 分包方公司名字
+  outsourcerNo: '', // 编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '分包项目编号', value: 'outsourcerNo', align: 'center', width: '160px' },
+  { text: '公司名称', value: 'outsourcerName', align: 'center', width: '160px' },
+  { text: '公司规模', value: 'outsourcerSize', align: 'center', width: '160px' },
+  { text: '业务规模', value: 'reciever', align: 'center', width: '180px' },
+  { text: '履约评级', value: 'grade', align: 'center', width: '180px' },
+  { text: '整体评价', value: 'businessSizeName', align: 'center', width: '180px' },
+  { text: '业务内容', value: 'deliverTime', align: 'center', width: '180px' },
+  { text: '公司地址', value: 'fullAddress', align: 'center', width: '180px' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<IRecordList[]>([])
+// 总数
+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
+  // listQuery.value.id = props.orderId
+  getListPage(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 = {
+    businessSize: '', // 业务规模-字典code
+    formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPROVE, // 表单id
+    grade: '', // 	履约评级-字典code
+    ids: [],
+    outsourcerName: '', // 分包方公司名字
+    outsourcerNo: '', // 编号
+    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 clickConfirmProject = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmProject', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择分包方" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.outsourcerNo" placeholder="分包方编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.outsourcerName" placeholder="分包方名称" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
+        :height="260" :is-multi="false" @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmProject">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/subpackage/apply/components/selectProjectNo.vue b/src/views/business/subpackage/apply/components/selectProjectNo.vue
new file mode 100644
index 0000000..9d145a8
--- /dev/null
+++ b/src/views/business/subpackage/apply/components/selectProjectNo.vue
@@ -0,0 +1,158 @@
+<!-- 分包管理项目选择列表 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { IListQueryProject, IProjectList } from '../../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageOutsourceProject } from '@/api/business/subpackage/apply'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  formId: {
+    type: String,
+    default: '',
+  },
+})
+
+const emits = defineEmits(['changeVisible', 'clickConfirmProject'])
+
+// 查询条件
+const listQuery: Ref<IListQueryProject> = ref({
+  formId: props.formId!,
+  projectName: '',
+  projectNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '项目编号', value: 'id', width: '160', align: 'center' },
+  { text: '项目名称', value: 'projectName', width: '120', align: 'center' },
+  { text: '申请时间', value: 'applicantTime', align: 'center' },
+  { text: '备注', value: 'applyRemark', align: 'center' },
+])
+// 表格数据
+const list = ref<IProjectList[]>([])
+// 总数
+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
+  // listQuery.value.id = props.orderId
+  listPageOutsourceProject(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 = {
+    formId: props.formId!,
+    projectName: '',
+    projectNo: '',
+    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 clickConfirmProject = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmProject', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择项目" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input v-model.trim="listQuery.projectNo" placeholder="项目编号" class="short-input" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.projectName" placeholder="项目名称" class="short-input" clearable />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
+        :height="260" :is-multi="false" @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmProject">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/subpackage/apply/components/selectSample.vue b/src/views/business/subpackage/apply/components/selectSample.vue
index e15c8ba..336912a 100644
--- a/src/views/business/subpackage/apply/components/selectSample.vue
+++ b/src/views/business/subpackage/apply/components/selectSample.vue
@@ -1,4 +1,4 @@
-<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<!-- 分包管理样品列表 -->
 <script setup lang="ts" name="SelectSample">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -20,7 +20,12 @@
     type: String,
     default: '',
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
+
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
@@ -147,8 +152,25 @@
       >
         <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"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
             v-model.trim="listQuery.sampleNo"
             placeholder="样品编号"
+            class="short-input"
             clearable
           />
         </search-item>
@@ -156,6 +178,7 @@
           <el-input
             v-model.trim="listQuery.sampleName"
             placeholder="样品名称"
+            class="short-input"
             clearable
           />
         </search-item>
@@ -167,8 +190,7 @@
         :query="listQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
-        :page-sizes="[20]"
+        :is-multi="isMulti"
         :height="260"
         @change="changePage"
         @multi-select="handleSelectionChange"
@@ -177,7 +199,7 @@
         <template #preColumns>
           <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
-              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+              {{ (listQuery.offset as number - 1) * (listQuery.limit as number) + scope.$index + 1 }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 542e2aa..94b068f 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -3,9 +3,8 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ref } from 'vue'
-import { filter } from 'lodash'
 import type { IApplyDetail, ISampleList } from '../subpackage-interface'
-// import selectSampleDialog from './components/selectSampleDialog.vue'
+import selectProjectApprove from '../apply/components/selectProjectApprove.vue'
 import selectSample from './components/selectSample.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { detail, save, submit } from '@/api/business/subpackage/apply'
@@ -18,6 +17,7 @@
 const query = $route.query
 const ruleFormRef = ref<FormInstance>() as any
 const detailForm = ref<IApplyDetail>({
+  formId: query.formId as string,
   applicantName: '', // 申请名称
   applicantId: '', // 申请id
   applicantTime: '', // 申请时间
@@ -51,10 +51,10 @@
 })
 // 校验规则
 const formRules = ref({
-  projectName: [{ required: true, message: '分包项目名称必填', trigger: 'blur' }],
+  projectName: [{ required: true, message: '分包项目名称必填', trigger: ['blur', 'change'] }],
   outsourcerId: [{ required: true, message: '分包方编号必填', trigger: ['blur', 'change'] }],
   outsourcerName: [{ required: true, message: '公司名称必填', trigger: ['blur', 'change'] }],
-  outsourceReasonName: [{ required: true, message: '分包原因必填', trigger: ['blur', 'change'] }],
+  outsourceReason: [{ required: true, message: '分包原因必填', trigger: ['blur', 'change'] }],
   preCost: [{ required: true, message: '预计费用必填', trigger: ['blur', 'change'] }],
   preStartTime: [{ required: true, message: '预计开始时间必填', trigger: ['blur', 'change'] }],
   preEndTime: [{ required: true, message: '预计结束时间必填', trigger: ['blur', 'change'] }],
@@ -66,19 +66,13 @@
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '230' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'orderCode', align: 'center' },
-  { text: '委托书编号', value: 'manufacturingNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'customerNo', align: 'center' },
   { text: '委托单位', value: 'customerName', align: 'center' },
 ])
 
 const getDetail = () => {
   detail({ id: $route.params.id }).then((res) => {
-    // let interfaceStr = ''
-    // for (const key in res.data.sampleList[0]) {
-    //   const item = res.data[key]
-    //   interfaceStr += `${key}:${typeof (item)}\n`
-    // }
-    // console.log(interfaceStr)
     detailForm.value = res.data
     list.value = res.data.sampleList.filter((item: ISampleList) => {
       return item !== null
@@ -115,33 +109,29 @@
       const _list = list.value.map((item: any) => {
         return {
           orderId: item.orderId ? item.orderId : 0,
-          sampleId: item.sampleNo,
+          sampleId: item.id,
         }
       })
       const params = {
+        id: detailForm.value.id,
+        projectName: detailForm.value.projectName,
+        outsourcerName: detailForm.value.outsourcerName,
         applicantTime: detailForm.value.applicantTime,
         applyMinioFileName: detailForm.value.applyMinioFileName,
         applyProcessId: detailForm.value.applyProcessId,
         applyRemark: detailForm.value.applyRemark,
         outsourceReason: detailForm.value.outsourceReason,
         outsourceReasonName: detailForm.value.outsourceReasonName,
-        outsourcerId: 0,
+        outsourcerId: detailForm.value.outsourcerId,
+        checkTime: detailForm.value.checkTime,
+        checkConclusion: detailForm.value.checkConclusion,
         preCost: detailForm.value.preCost,
         preEndTime: detailForm.value.preEndTime,
         preStartTime: detailForm.value.preStartTime,
-        projectName: detailForm.value.projectName,
-        projectNo: '',
-        sampleList: [
-          // {
-          //   customerName: '',
-          //   manufacturingNo: '',
-          //   orderCode: '',
-          //   sampleModel: '',
-          //   sampleName: '',
-          //   sampleNo: '',
-          // },
-          ...list.value,
-        ],
+        projectNo: detailForm.value.projectNo,
+        checkMinioFileName: detailForm.value.checkMinioFileName,
+        checkRemark: detailForm.value.checkRemark,
+        checkProcessId: detailForm.value.checkProcessId,
         orderSampleList: [..._list],
       }
       save(params).then((res) => {
@@ -187,15 +177,17 @@
     return
   }
   list.value.push({
-    customerName: '', // 消费名称
-    manufacturingNo: '', // 编号
-    orderCode: '', // 订单code
-    sampleModel: '', // 样品模型
-    sampleName: '', // 样品名称
-    sampleNo: '', // 样品编号
+    orderCode: '',	// 原始记录单编号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    customerNo: '', // 委托方id
+    customerName: '', // 委托方名称
+    startTime: '',
+    endTime: '',
   })
 }
 const sampleVisible = ref(false)
+const projectVisible = ref(false)
 const isMulti = ref(false)
 const selectIndex = ref(0)
 // 点击选择
@@ -217,18 +209,44 @@
 const changeSampleVisible = (val: boolean) => {
   sampleVisible.value = val
 }
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
 // 选好样品
 const clickConfirmSample = (val: any) => {
   if (val && val.length) {
-    const index = list.value.findIndex((i: ISampleList) => val[0].sampleNo === i.sampleNo)
-    if (index !== -1) {
-      ElMessage.warning('此样品已添加过')
-      return
+    if (isMulti.value) {
+      val.forEach((item: ISampleList) => {
+        // 只添加列表里不存在的
+        const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+        if (index === -1) {
+          list.value.push(item)
+        }
+      })
     }
-    list.value.splice(selectIndex.value, 1, val[0])
+    else {
+      const index = list.value.findIndex((i: ISampleList) => val[0].sampleNo === i.sampleNo)
+      if (index !== -1) {
+        ElMessage.warning('此样品已添加过')
+        return
+      }
+      list.value.splice(selectIndex.value, 1, val[0])
+    }
   }
 }
 
+// 选择项目id
+const clickConfirmProject = (val: any) => {
+  // detailForm.value.checkTime = val[0].checkTime
+  // detailForm.value.projectName = val[0].projectName
+  // detailForm.value.outsourcerId = val[0].outsourcerId
+  // detailForm.value.projectNo = val[0].projectNo
+  detailForm.value.outsourcerId = val[0].outsourcerNo
+  detailForm.value.outsourcerName = val[0].outsourcerName
+}
+
 // 选中行
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
@@ -289,7 +307,7 @@
   }
   else {
     // 初始化编号,申请人,申请时间
-    detailForm.value.projectNo = '系统自动生成'
+    detailForm.value.projectNo = ''
     detailForm.value.createUser = window.localStorage.getItem('name')!
     detailForm.value.createTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
@@ -348,10 +366,8 @@
       >
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item label="分包项目编号:" prop="projectNo">
-              <el-input
-                v-model="detailForm.projectNo" disabled
-              />
+            <el-form-item label="分包项目编号:" prop="id">
+              <el-input v-model="detailForm.id" disabled placeholder="系统自动生成" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -380,24 +396,35 @@
             <el-form-item label="分包方编号:" prop="outsourcerId">
               <el-input
                 v-model="detailForm.outsourcerId"
-                :disabled="query.title === '详情'"
-              />
+                disabled
+              >
+                <template v-if="query.title !== '详情'" #append>
+                  <el-button
+                    size="small"
+                    @click="changeProjectVisible(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="公司名称:" prop="outsourcerName">
               <el-input
                 v-model="detailForm.outsourcerName"
-                :disabled="query.title === '详情'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="分包原因:" prop="outsourceReason">
-              <el-input
-                v-model="detailForm.outsourceReason"
-                :disabled="query.title === '详情'"
-              />
+              <el-select
+                v-model="detailForm.outsourceReason" :disabled="query.title === '详情'"
+              >
+                <el-option label="无检测能力" value="无检测能力" />
+                <el-option label="其他" value="其他" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -459,11 +486,11 @@
         </el-row>
       </el-form>
     </detail-page>
-    <detail-block title="样品列表">
+    <detail-block title="样品信息">
       <template v-if="query.title !== '详情'" #btns>
-        <!-- <el-button type="primary" @click="multiAdd">
+        <el-button type="primary" @click="multiAdd">
           批量添加
-        </el-button> -->
+        </el-button>
         <el-button type="primary" @click="addRow">
           增加行
         </el-button>
@@ -471,7 +498,6 @@
           删除行
         </el-button>
       </template>
-
       <el-table
         :data="list"
         border
@@ -506,8 +532,13 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
-    <!-- :order-id="detailForm.orderId" :customer-id="formInline.customerId" -->
-    <select-sample v-model:visible="sampleVisible" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+    <!-- 样品增加弹窗 -->
+    <select-sample v-model:visible="sampleVisible" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+    <!-- 项目选择 -->
+    <select-project-approve
+      v-model:visible="projectVisible" :form-id="detailForm.formId" @clickConfirmProject="clickConfirmProject"
+      @change-visible="changeProjectVisible(false)"
+    />
   </app-container>
 </template>
 
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index 57a789a..0f926af 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -271,7 +271,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" fixed="right" width="120">
+            <el-table-column label="操作" align="center" fixed="right" width="180">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index 0be983d..690b50e 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -256,7 +256,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" fixed="right" width="120">
+            <el-table-column label="操作" align="center" fixed="right" width="180">
               <template #default="{ row }">
                 <el-button
                   size="small"
diff --git a/src/views/business/subpackage/check/edit.vue b/src/views/business/subpackage/check/edit.vue
index c7730a1..dac01f9 100644
--- a/src/views/business/subpackage/check/edit.vue
+++ b/src/views/business/subpackage/check/edit.vue
@@ -1,19 +1,23 @@
 <!-- 分包验收详情 -->
 <script lang="ts" setup>
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ref } from 'vue'
-import { filter } from 'lodash'
-import type { IApplyDetail, IDetailList } from '../subpackage-interface'
+import type { IApplyDetail, ISampleList } from '../subpackage-interface'
+import selectSample from '../apply/components/selectSample.vue'
+import selectProjectNo from '../apply/components/selectProjectNo.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { detail } from '@/api/business/subpackage/check'
+import { detail, save, submit } from '@/api/business/subpackage/check'
 import { fetchApproval, submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 
+const { proxy } = getCurrentInstance() as any
 const $route = useRoute()
 const $router = useRouter()
 const query = $route.query
+const ruleFormRef = ref<FormInstance>() as any
 const detailForm = ref<IApplyDetail>({
+  formId: query.formId as string,
   applicantName: '', // 申请名称
   applicantId: '', // 申请id
   applicantTime: '', // 申请时间
@@ -22,7 +26,7 @@
   applyProcessId: '', // 申请流程id
   applyRemark: '', // 申请备注
   checkApprovalStatus: '', // 申请状态码
-  checkConclusion: '', // 审批结果
+  checkConclusion: '', // 验收结论
   checkMinioFileName: '', // 审核文件名称
   checkProcessId: '', // 审批流程id
   checkRemark: '', // 审核备注
@@ -52,31 +56,25 @@
   outsourcerName: [{ required: true, message: '公司名称必填', trigger: ['blur', 'change'] }],
   outsourceReasonName: [{ required: true, message: '分包原因必填', trigger: ['blur', 'change'] }],
   preCost: [{ required: true, message: '预计费用必填', trigger: ['blur', 'change'] }],
-  preStartTime: [{ required: true, message: '预计开始时间必填', trigger: ['blur', 'change'] }],
-  preEndTime: [{ required: true, message: '预计结束时间必填', trigger: ['blur', 'change'] }],
+  checkTime: [{ required: true, message: '验收时间必填', trigger: ['blur', 'change'] }],
+  checkConclusion: [{ required: true, message: '验收结论必填', trigger: ['blur', 'change'] }],
 })
 
-const list = ref<IDetailList[]>([])// 表格数据
+const list = ref<ISampleList[]>([])// 表格数据
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '230' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'orderCode', align: 'center' },
-  { text: '委托书编号', value: 'manufacturingNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'customerNo', align: 'center' },
   { text: '委托单位', value: 'customerName', align: 'center' },
 ])
 
 const getDetail = () => {
   detail({ id: $route.params.id }).then((res) => {
-    // let interfaceStr = ''
-    // for (const key in res.data.sampleList[0]) {
-    //   const item = res.data[key]
-    //   interfaceStr += `${key}:${typeof (item)}\n`
-    // }
-    // console.log(interfaceStr)
     detailForm.value = res.data
-    list.value = res.data.sampleList.filter((item: IDetailList) => {
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
       return item !== null
     })
   })
@@ -99,6 +97,193 @@
 const close = () => {
   $router.back()
 }
+
+// 保存
+const handleSave = () => {
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      const _list = list.value.map((item: any) => {
+        return {
+          orderId: item.orderId ? item.orderId : 0,
+          sampleId: item.id,
+        }
+      })
+      const params = {
+        id: detailForm.value.id,
+        outsourcerName: detailForm.value.outsourcerName,
+        applicantTime: detailForm.value.applicantTime,
+        applyMinioFileName: detailForm.value.applyMinioFileName,
+        applyProcessId: detailForm.value.applyProcessId,
+        applyRemark: detailForm.value.applyRemark,
+        outsourceReason: detailForm.value.outsourceReason,
+        outsourceReasonName: detailForm.value.outsourceReasonName,
+        outsourcerId: detailForm.value.outsourcerId,
+        checkTime: detailForm.value.checkTime,
+        checkConclusion: detailForm.value.checkConclusion,
+        preCost: detailForm.value.preCost,
+        preEndTime: detailForm.value.preEndTime,
+        preStartTime: detailForm.value.preStartTime,
+        projectName: detailForm.value.projectName,
+        projectNo: detailForm.value.projectNo,
+        checkMinioFileName: detailForm.value.checkMinioFileName,
+        checkRemark: detailForm.value.checkRemark,
+        checkProcessId: detailForm.value.checkProcessId,
+        orderSampleList: [..._list],
+      }
+      save(params).then((res) => {
+        detailForm.value.id = res.data.id
+        ElMessage.success('保存成功')
+        loading.close()
+        close()
+      })
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  console.log(detailForm.value.id)
+  if (detailForm.value.id) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: detailForm.value.id,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存再提交！')
+  }
+}
+
+// 编辑
+const handleEdit = () => {
+
+}
+
+// 编辑
+const handleDel = () => {
+
+}
+
+// 增加行
+const addRow = () => {
+  const index = list.value.findIndex(item => !item.sampleNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  list.value.push({
+    orderCode: '',	// 原始记录单编号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    customerNo: '', // 委托方id
+    customerName: '', // 委托方名称
+    startTime: '',
+    endTime: '',
+  })
+}
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+// 点击批量添加
+const multiAdd = () => {
+  sampleVisible.value = true
+  isMulti.value = true
+}
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+// 选好样品
+const clickConfirmSample = (val: any) => {
+  if (val && val.length) {
+    if (isMulti.value) {
+      val.forEach((item: ISampleList) => {
+        // 只添加列表里不存在的
+        const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+        if (index === -1) {
+          list.value.push(item)
+        }
+      })
+    }
+    else {
+      const index = list.value.findIndex((i: ISampleList) => val[0].sampleNo === i.sampleNo)
+      if (index !== -1) {
+        ElMessage.warning('此样品已添加过')
+        return
+      }
+      list.value.splice(selectIndex.value, 1, val[0])
+    }
+  }
+}
+
+// 选择项目id
+const clickConfirmProject = (val: any) => {
+  detailForm.value.id = val[0].id
+  detailForm.value.checkConclusion = val[0].checkConclusion
+  detailForm.value.checkTime = val[0].checkTime
+  detailForm.value.checkMinioFileName = val[0].checkMinioFileName
+  detailForm.value.checkRemark = val[0].checkRemark
+  detailForm.value.checkProcessId = val[0].checkProcessId
+
+  detailForm.value.projectName = val[0].projectName
+  detailForm.value.outsourcerId = val[0].outsourcerId
+  detailForm.value.projectNo = val[0].projectNo
+}
+
+const checkoutList = ref([])
+// 选中行
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+
+// 删除行
+const delRow = () => {
+  if (checkoutList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutList.value.forEach((item: ISampleList) => {
+      list.value.forEach((element, index) => {
+        if (element.sampleNo === item.sampleNo) {
+          list.value.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
 // 文件上传
 const fileRef = ref()
 const onFileChange = (event: any) => {
@@ -128,6 +313,11 @@
   if (query.title !== '新建') {
     getDetail()
   }
+  else {
+    // 初始化编号,申请人,申请时间
+    detailForm.value.projectNo = '系统自动生成'
+    detailForm.value.checkerName = window.localStorage.getItem('name')!
+  }
 })
 </script>
 
@@ -147,13 +337,13 @@
           </el-button>
         </template>
         <template v-if="['草稿箱', '已取消'].includes(query.approvalStatusName as string)">
-          <el-button type="primary">
+          <el-button type="primary" @click="handleSubmit">
             提交
           </el-button>
-          <el-button type="primary">
+          <el-button type="primary" @click="handleEdit">
             编辑
           </el-button>
-          <el-button type="primary">
+          <el-button type="primary" @click="handleDel">
             删除
           </el-button>
         </template>
@@ -163,10 +353,10 @@
           </el-button>
         </template>
         <template v-if="query.title === '新建'">
-          <el-button type="primary">
+          <el-button type="primary" @click="handleSave">
             保存
           </el-button>
-          <el-button type="primary">
+          <el-button type="primary" @click="handleSubmit">
             提交
           </el-button>
         </template>
@@ -174,83 +364,70 @@
           关闭
         </el-button>
       </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="detailForm"
-        label-width="140"
-        label-position="right"
-        :rules="formRules"
-      >
+      <el-form ref="ruleFormRef" :model="detailForm" label-width="140" label-position="right" :rules="formRules">
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item label="分包项目编号:" prop="projectNo">
-              <el-input
-                v-model="detailForm.projectNo" disabled
-              />
+            <el-form-item label="分包项目编号:" prop="id">
+              <el-input v-model="detailForm.id" disabled>
+                <template v-if="query.title !== '详情'" #append>
+                  <el-button
+                    size="small"
+                    @click="changeProjectVisible(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="分包项目名称:" prop="projectName">
-              <el-input
-                v-model="detailForm.projectName"
-                :disabled="query.title === '详情'"
-              />
+              <el-input v-model="detailForm.projectName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="验收人:" prop="applicantName">
-              <el-input
-                v-model="detailForm.applicantName" disabled
-              />
+            <el-form-item label="验收人:" prop="checkerName">
+              <el-input v-model="detailForm.checkerName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="验收时间:" prop="applicantTime">
-              <el-input
-                v-model="detailForm.applicantTime" disabled
+            <el-form-item label="验收时间:" prop="checkTime">
+              <el-date-picker
+                v-model="detailForm.checkTime" type="datetime" placeholder="请选择验收时间"
+                format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="分包方编号:" prop="outsourcerId">
-              <el-input
-                v-model="detailForm.outsourcerId"
-                :disabled="query.title === '详情'"
-              />
+              <el-input v-model="detailForm.outsourcerId" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="公司名称:" prop="outsourcerName">
-              <el-input
-                v-model="detailForm.outsourcerName"
-                :disabled="query.title === '详情'"
-              />
+              <el-input v-model="detailForm.outsourcerName" :disabled="query.title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="分包原因:" prop="outsourceReasonName">
-              <el-input
-                v-model="detailForm.outsourceReasonName"
-                :disabled="query.title === '详情'"
-              />
+              <el-select
+                v-model="detailForm.outsourceReasonName" :disabled="query.title === '详情'"
+              >
+                <el-option label="无检测能力" value="无检测能力" />
+                <el-option label="其他" value="其他" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6" />
           <el-col :span="12">
-            <el-form-item label="结论:" prop="applyRemark">
-              <el-input
-                v-model="detailForm.applyRemark"
-                :disabled="query.title === '详情'"
-              />
+            <el-form-item label="验收结论:" prop="checkConclusion">
+              <el-input v-model="detailForm.checkConclusion" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12" />
           <el-col :span="12">
             <el-form-item label="备注:" prop="applyRemark">
-              <el-input
-                v-model="detailForm.applyRemark"
-                :disabled="query.title === '详情'"
-              />
+              <el-input v-model="detailForm.applyRemark" :disabled="query.title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="12" />
@@ -259,7 +436,7 @@
               <input v-show="query.title === ''" ref="fileRef" multiple type="file" @change="onFileChange">
               <span v-if="query.title === '详情' && !detailForm.applyMinioFileName">无</span>
               <div v-else style="display: flex;">
-                <show-photo :minio-file-name="detailForm.applyMinioFileName || ''" style="display: inline-block;margin: 10px;" />
+                <show-photo :minio-file-name="detailForm.applyMinioFileName || ''" style="display: inline-block;" />
               </div>
               <el-button v-if="query.title !== '详情'" type="primary" :disabled="query.title === '详情'" @click="upload">
                 {{ detailForm.applyMinioFileName ? '更换' : '上传' }}
@@ -270,30 +447,51 @@
         </el-row>
       </el-form>
     </detail-page>
-    <detail-block title="样品详情">
-      <el-table
-        :data="list"
-        border
-        style="width: 100%;"
-        max-height="600"
-      >
-        <el-table-column type="selection" width="38" />
+    <detail-block title="样品信息">
+      <template v-if="query.title !== '详情'" #btns>
+        <el-button type="primary" @click="multiAdd">
+          批量添加
+        </el-button>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table :data="list" border style="width: 100%;" max-height="600" @selection-change="handleSelectionChange">
+        <el-table-column v-if="query.title !== '详情'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          show-overflow-tooltip
-          align="center"
-        />
+          v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
+          :width="item.width" show-overflow-tooltip align="center"
+        >
+          <template v-if="item.value === 'sampleNo' && ['新建', '编辑'].includes(query.title as string)" #default="scope">
+            <el-input v-model="scope.row.sampleNo" placeholder="请选择设备" class="input">
+              <template #append>
+                <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="query.approvalStatusName !== '草稿箱' && query.title !== '新增'" title="审批流程">
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && query.title !== '新建'" title="审批流程">
       <!-- 审批流程 -->
       <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-project-no
+      v-model:visible="projectVisible" :form-id="detailForm.formId" @clickConfirmProject="clickConfirmProject"
+      @change-visible="changeProjectVisible(false)"
+    />
   </app-container>
 </template>
 
diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue
index a759976..fe7417b 100644
--- a/src/views/business/subpackage/check/list.vue
+++ b/src/views/business/subpackage/check/list.vue
@@ -120,6 +120,7 @@
     },
     query: {
       title: '新建',
+      formId: listQuery.value.formId,
     },
   })
 }
@@ -149,6 +150,7 @@
     },
     query: {
       title: '详情',
+      formId: listQuery.value.formId,
       approvalStatusName: menu.value.find(item => item.id === active.value)!.name as string,
     },
   })
@@ -164,6 +166,7 @@
     },
     query: {
       title: '编辑',
+      formId: listQuery.value.formId,
       approvalStatusName: menu.value.find(item => item.id === active.value)!.name as string,
     },
   })
@@ -285,7 +288,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" fixed="right" width="120">
+            <el-table-column label="操作" align="center" fixed="right" width="180">
               <template #default="{ row }">
                 <el-button
                   size="small"
diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue
index 126ad4e..9222849 100644
--- a/src/views/business/subpackage/record/list.vue
+++ b/src/views/business/subpackage/record/list.vue
@@ -14,7 +14,7 @@
 // 查询条件
 const listQuery: Ref<IListQueryRecord> = ref({
   businessSize: '', // 业务规模-字典code
-  formId: SCHEDULE.BUSINESS_SUBPACKAGE_RECORD, // 表单id
+  formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPROVE, // 表单id
   grade: '', // 	履约评级-字典code
   ids: [],
   outsourcerName: '', // 分包方公司名字
@@ -25,16 +25,15 @@
 const loadingTable = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '分包项目编号', value: 'interchangeCode', align: 'center', width: '160px' },
-  { text: '公司名称', value: 'customerNo', align: 'center', width: '160px' },
-  { text: '公司规模', value: 'customerName', align: 'center', width: '160px' },
+  { text: '分包项目编号', value: 'outsourcerNo', align: 'center', width: '160px' },
+  { text: '公司名称', value: 'outsourcerName', align: 'center', width: '160px' },
+  { text: '公司规模', value: 'outsourcerSize', align: 'center', width: '160px' },
   { text: '业务规模', value: 'reciever', align: 'center', width: '180px' },
-  { text: '履约评级', value: 'deliverer', align: 'center', width: '180px' },
-  { text: '整体评价', value: 'deliverTime', align: 'center', width: '180px' },
+  { text: '履约评级', value: 'grade', align: 'center', width: '180px' },
+  { text: '整体评价', value: 'businessSizeName', align: 'center', width: '180px' },
   { text: '业务内容', value: 'deliverTime', align: 'center', width: '180px' },
-  { text: '公司地址', value: 'deliverTime', align: 'center', width: '180px' },
-  { text: '创建时间', value: 'deliverTime', align: 'center', width: '180px' },
-  { text: '备注', value: 'deliverTime', align: 'center', width: '180px' },
+  { text: '公司地址', value: 'fullAddress', align: 'center', width: '180px' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
 ])
 const list = ref([])
 const total = ref(0)
@@ -155,7 +154,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" fixed="right" width="120">
+            <el-table-column label="操作" align="center" fixed="right" width="180">
               <template #default="{ row }">
                 <el-button size="small" link type="primary" @click="handleDetail(row)">
                   详情
diff --git a/src/views/business/subpackage/subpackage-interface.ts b/src/views/business/subpackage/subpackage-interface.ts
index 23962d2..c09d859 100644
--- a/src/views/business/subpackage/subpackage-interface.ts
+++ b/src/views/business/subpackage/subpackage-interface.ts
@@ -36,6 +36,7 @@
 
 // 申请列表详情参数
 export interface IApplyDetail {
+  formId?: string // 表单id
   applicantName: string // 申请名称
   applicantId: string // 申请id
   applicantTime: string // 申请时间
@@ -75,15 +76,40 @@
   limit?: string | number
   customerName: string // 委托方名称
   customerNo: string 	// 委托方代码
-  manufacturingNo: string // 编号
   orderCode: string // 订单code
-  sampleModel: string // 样品模型
   sampleName: string // 样品名称
   sampleNo: string // 样品编号
   startTime: string // 开始时间
   endTime: string // 结束时间
 }
 
+// 项目选择查询参数
+export interface IListQueryProject {
+  formId: string
+  projectName: string
+  projectNo: string
+  offset?: string | number
+  limit?: string | number
+}
+
+// 项目选择列表参数
+export interface IProjectList {
+  applicantTime: string // 申请时间
+  applyMinioFileName: string // 项目申请文件-minio存储文件名
+  applyProcessId: string // 流程实例id（未通过申请编辑接口必传参数）
+  applyRemark: string // 项目申请备注
+  id: string | number // 主键id（列表、更新、详情接口参数）
+  orderSampleList: [] // 样品&委托书列表（保存/编辑草稿接口入参使用）
+  outsourceReason: string // 分包原因-字典code
+  outsourceReasonName: string // 分包原因-字典value
+  outsourcerId: string | number // 分包方id
+  preCost: string // 预计费用
+  preEndTime: string // 预计结束时间
+  preStartTime: string // 预计开始时间
+  projectName: string // 分包项目名称
+  projectNo: string // 分包项目编号（列表、更新接口参数）
+  sampleList: [] // 样品列表（详情接口出参使用）
+}
 // 分包方审批查询参数
 export interface IListQueryApprove {
   projectName: string // 分包项目名称