diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
new file mode 100644
index 0000000..d6827e4
--- /dev/null
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts" name="DistributeDialog">
+import processConfig from './processConfig.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { getTaskDetail } from '@/api/business/task'
+// 任务分发弹窗
+
+// 自定义方法：close关闭弹窗
+const emit = defineEmits(['close'])
+const dialogVisible = ref(false) // 弹窗显示
+const sampleId = ref('') // 样品id
+const orderId = ref('') // 委托单id
+
+// 委托书-证书类别列表
+const certificationTypes = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  getDictByCode('certificationType').then((response) => {
+    certificationTypes.value = response.data
+  })
+}
+
+getDict()
+// 样品详情
+const sampleDetail = ref({
+  sampleName: '压力表',
+  mesureContent: '压力、ip68',
+  certifications: ['1', '2'],
+  remark: '这是备注',
+  measureProcessList: [],
+  measureSendBackList: [],
+})
+
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    sampleDetail.value.sampleName = res.data.sampleName
+    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.remark = res.data.remark
+    sampleDetail.value.certifications = res.data.certifications
+    sampleDetail.value.measureProcessList = res.data.measureProcessList
+    sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+  })
+}
+// 初始化弹窗
+const initDialog = (orderid: string, sampleid: string) => {
+  dialogVisible.value = true
+  sampleId.value = sampleid
+  orderId.value = orderid
+  getInfo()
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+  emit('close')
+}
+function cancel() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="任务分发" width="1000" @close="cancel">
+    <div class="simple-info">
+      <div class="simple-info-line">
+        <span class="label">样品名称:</span>
+        <el-input v-model="sampleDetail.sampleName" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">证书类别:</span>
+        <el-checkbox-group v-model="sampleDetail.certifications" disabled>
+          <el-checkbox v-for="item in certificationTypes" :key="item.value" :label="item.value">
+            {{ item.name }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="simple-info-line">
+        <span class="label">检定项目:</span>
+        <el-input v-model="sampleDetail.mesureContent" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">备注:</span>
+        <el-input v-model="sampleDetail.remark" disabled />
+      </div>
+    </div>
+    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+      批量添加
+    </el-button>
+    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <template #footer>
+      <el-button type="primary" @click="saveProcess">
+        确定
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//  样式
+.simple-info {
+  margin-top: -10px;
+  margin-bottom: 10px;
+
+  .simple-info-line {
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    .label {
+      width: 90px;
+    }
+  }
+}
+</style>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
new file mode 100644
index 0000000..d6827e4
--- /dev/null
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts" name="DistributeDialog">
+import processConfig from './processConfig.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { getTaskDetail } from '@/api/business/task'
+// 任务分发弹窗
+
+// 自定义方法：close关闭弹窗
+const emit = defineEmits(['close'])
+const dialogVisible = ref(false) // 弹窗显示
+const sampleId = ref('') // 样品id
+const orderId = ref('') // 委托单id
+
+// 委托书-证书类别列表
+const certificationTypes = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  getDictByCode('certificationType').then((response) => {
+    certificationTypes.value = response.data
+  })
+}
+
+getDict()
+// 样品详情
+const sampleDetail = ref({
+  sampleName: '压力表',
+  mesureContent: '压力、ip68',
+  certifications: ['1', '2'],
+  remark: '这是备注',
+  measureProcessList: [],
+  measureSendBackList: [],
+})
+
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    sampleDetail.value.sampleName = res.data.sampleName
+    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.remark = res.data.remark
+    sampleDetail.value.certifications = res.data.certifications
+    sampleDetail.value.measureProcessList = res.data.measureProcessList
+    sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+  })
+}
+// 初始化弹窗
+const initDialog = (orderid: string, sampleid: string) => {
+  dialogVisible.value = true
+  sampleId.value = sampleid
+  orderId.value = orderid
+  getInfo()
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+  emit('close')
+}
+function cancel() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="任务分发" width="1000" @close="cancel">
+    <div class="simple-info">
+      <div class="simple-info-line">
+        <span class="label">样品名称:</span>
+        <el-input v-model="sampleDetail.sampleName" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">证书类别:</span>
+        <el-checkbox-group v-model="sampleDetail.certifications" disabled>
+          <el-checkbox v-for="item in certificationTypes" :key="item.value" :label="item.value">
+            {{ item.name }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="simple-info-line">
+        <span class="label">检定项目:</span>
+        <el-input v-model="sampleDetail.mesureContent" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">备注:</span>
+        <el-input v-model="sampleDetail.remark" disabled />
+      </div>
+    </div>
+    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+      批量添加
+    </el-button>
+    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <template #footer>
+      <el-button type="primary" @click="saveProcess">
+        确定
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//  样式
+.simple-info {
+  margin-top: -10px;
+  margin-bottom: 10px;
+
+  .simple-info-line {
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    .label {
+      width: 90px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/components/lab-interface.ts b/src/views/business/schedule/task/components/lab-interface.ts
index d6355c6..02b0d1d 100644
--- a/src/views/business/schedule/task/components/lab-interface.ts
+++ b/src/views/business/schedule/task/components/lab-interface.ts
@@ -6,7 +6,8 @@
   isLab: '1' // 是否是实验室
   director: string // 负责人
   meterMajor: string // 专业
-  measureItems: string// 检测能力
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
 }
 
 // 部门返回值对象类型

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
new file mode 100644
index 0000000..d6827e4
--- /dev/null
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts" name="DistributeDialog">
+import processConfig from './processConfig.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { getTaskDetail } from '@/api/business/task'
+// 任务分发弹窗
+
+// 自定义方法：close关闭弹窗
+const emit = defineEmits(['close'])
+const dialogVisible = ref(false) // 弹窗显示
+const sampleId = ref('') // 样品id
+const orderId = ref('') // 委托单id
+
+// 委托书-证书类别列表
+const certificationTypes = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  getDictByCode('certificationType').then((response) => {
+    certificationTypes.value = response.data
+  })
+}
+
+getDict()
+// 样品详情
+const sampleDetail = ref({
+  sampleName: '压力表',
+  mesureContent: '压力、ip68',
+  certifications: ['1', '2'],
+  remark: '这是备注',
+  measureProcessList: [],
+  measureSendBackList: [],
+})
+
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    sampleDetail.value.sampleName = res.data.sampleName
+    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.remark = res.data.remark
+    sampleDetail.value.certifications = res.data.certifications
+    sampleDetail.value.measureProcessList = res.data.measureProcessList
+    sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+  })
+}
+// 初始化弹窗
+const initDialog = (orderid: string, sampleid: string) => {
+  dialogVisible.value = true
+  sampleId.value = sampleid
+  orderId.value = orderid
+  getInfo()
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+  emit('close')
+}
+function cancel() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="任务分发" width="1000" @close="cancel">
+    <div class="simple-info">
+      <div class="simple-info-line">
+        <span class="label">样品名称:</span>
+        <el-input v-model="sampleDetail.sampleName" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">证书类别:</span>
+        <el-checkbox-group v-model="sampleDetail.certifications" disabled>
+          <el-checkbox v-for="item in certificationTypes" :key="item.value" :label="item.value">
+            {{ item.name }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="simple-info-line">
+        <span class="label">检定项目:</span>
+        <el-input v-model="sampleDetail.mesureContent" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">备注:</span>
+        <el-input v-model="sampleDetail.remark" disabled />
+      </div>
+    </div>
+    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+      批量添加
+    </el-button>
+    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <template #footer>
+      <el-button type="primary" @click="saveProcess">
+        确定
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//  样式
+.simple-info {
+  margin-top: -10px;
+  margin-bottom: 10px;
+
+  .simple-info-line {
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    .label {
+      width: 90px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/components/lab-interface.ts b/src/views/business/schedule/task/components/lab-interface.ts
index d6355c6..02b0d1d 100644
--- a/src/views/business/schedule/task/components/lab-interface.ts
+++ b/src/views/business/schedule/task/components/lab-interface.ts
@@ -6,7 +6,8 @@
   isLab: '1' // 是否是实验室
   director: string // 负责人
   meterMajor: string // 专业
-  measureItems: string// 检测能力
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
 }
 
 // 部门返回值对象类型
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 4ccab04..1efb8a9 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -1,11 +1,18 @@
 <script setup lang="ts" name="ProcessConfig">
 import { ref } from 'vue'
 import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
 import ProcessNode from './processNode.vue'
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/task'
 const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
   // 是否为详情展示页面
   detail: {
     type: Boolean,
@@ -21,81 +28,35 @@
     type: String,
     required: true,
   },
+  list: {
+    type: Array,
+    default: () => [],
+  },
 })
 const emits = defineEmits(['saveOver'])
 // 默认流程节点
-const defaultProcess = {
-  id: '', // 检测节点id
-  executiveItem: '', // 检测项目
-  executiveDept: '', // 检测部门
-  executiveDeptName: '', // 检测部门
-  executivePerson: '', // 检测人员
-  executivePersonName: '', // 检测人员
-  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-  measureStateName: '', // 检测状态
-  currentCertifications: '', // 当前证书数
-  requireCertifications: '', // 应出具证书数
-  updateTime: '', // 更新时间
-  backPerson: '', // 退回人
-  backReason: '', // 退回原因
-  backTime: '', // 退回时间
-  distributePerson: '', // 分配人
-  distributeTime: '', // 分配时间
-  startTime: '', // 检测开始时间
-  overTime: '', // 检测结束时间
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
 }
 // 检定流程列表
-const processList = ref([
+const processList = ref<IScheduleSet[]>([
   { ...defaultProcess },
 ])
 
-// 获取当前样品检测流程，参数待定
-const fetchProcess = () => {
-  // TODO: 模拟数据
-  processList.value = [
-    {
-      id: '1', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423635973935106', // 检测部门
-      executiveDeptName: '力学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '张三', // 检测人员
-      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待检测', // 检测状态
-      currentCertifications: '0', // 当前证书数
-      requireCertifications: '2', // 应出具证书数
-      updateTime: '2023-02-01 09:00:05', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-    {
-      id: '2', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423577505337346', // 检测部门
-      executiveDeptName: '热学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待分配', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-  ]
-}
-fetchProcess()
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+})
 
 // 点击添加流程
 const processAdd = () => {
@@ -121,25 +82,17 @@
 // 批量添加实验室
 const batchChooseOver = (labs: ILabList[]) => {
   for (const item of labs) {
-    const processTemp = {
-      id: '',
-      executiveItem: '', // 检测项目
-      executiveDept: item.deptId, // 检测部门
-      executiveDeptName: item.organizeName, // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
     }
     processList.value.push(processTemp)
   }
@@ -147,9 +100,24 @@
 
 // 保存流程
 const saveProcess = () => {
-  // TODO: 保存流程
-  console.log(processList.value)
-  emits('saveOver')
+  const form = {
+    measureProcessList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  console.log(form)
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
 }
 // 删除流程
 const deleteProcess = (index: number) => {

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
new file mode 100644
index 0000000..d6827e4
--- /dev/null
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts" name="DistributeDialog">
+import processConfig from './processConfig.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { getTaskDetail } from '@/api/business/task'
+// 任务分发弹窗
+
+// 自定义方法：close关闭弹窗
+const emit = defineEmits(['close'])
+const dialogVisible = ref(false) // 弹窗显示
+const sampleId = ref('') // 样品id
+const orderId = ref('') // 委托单id
+
+// 委托书-证书类别列表
+const certificationTypes = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  getDictByCode('certificationType').then((response) => {
+    certificationTypes.value = response.data
+  })
+}
+
+getDict()
+// 样品详情
+const sampleDetail = ref({
+  sampleName: '压力表',
+  mesureContent: '压力、ip68',
+  certifications: ['1', '2'],
+  remark: '这是备注',
+  measureProcessList: [],
+  measureSendBackList: [],
+})
+
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    sampleDetail.value.sampleName = res.data.sampleName
+    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.remark = res.data.remark
+    sampleDetail.value.certifications = res.data.certifications
+    sampleDetail.value.measureProcessList = res.data.measureProcessList
+    sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+  })
+}
+// 初始化弹窗
+const initDialog = (orderid: string, sampleid: string) => {
+  dialogVisible.value = true
+  sampleId.value = sampleid
+  orderId.value = orderid
+  getInfo()
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+  emit('close')
+}
+function cancel() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="任务分发" width="1000" @close="cancel">
+    <div class="simple-info">
+      <div class="simple-info-line">
+        <span class="label">样品名称:</span>
+        <el-input v-model="sampleDetail.sampleName" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">证书类别:</span>
+        <el-checkbox-group v-model="sampleDetail.certifications" disabled>
+          <el-checkbox v-for="item in certificationTypes" :key="item.value" :label="item.value">
+            {{ item.name }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="simple-info-line">
+        <span class="label">检定项目:</span>
+        <el-input v-model="sampleDetail.mesureContent" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">备注:</span>
+        <el-input v-model="sampleDetail.remark" disabled />
+      </div>
+    </div>
+    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+      批量添加
+    </el-button>
+    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <template #footer>
+      <el-button type="primary" @click="saveProcess">
+        确定
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//  样式
+.simple-info {
+  margin-top: -10px;
+  margin-bottom: 10px;
+
+  .simple-info-line {
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    .label {
+      width: 90px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/components/lab-interface.ts b/src/views/business/schedule/task/components/lab-interface.ts
index d6355c6..02b0d1d 100644
--- a/src/views/business/schedule/task/components/lab-interface.ts
+++ b/src/views/business/schedule/task/components/lab-interface.ts
@@ -6,7 +6,8 @@
   isLab: '1' // 是否是实验室
   director: string // 负责人
   meterMajor: string // 专业
-  measureItems: string// 检测能力
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
 }
 
 // 部门返回值对象类型
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 4ccab04..1efb8a9 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -1,11 +1,18 @@
 <script setup lang="ts" name="ProcessConfig">
 import { ref } from 'vue'
 import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
 import ProcessNode from './processNode.vue'
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/task'
 const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
   // 是否为详情展示页面
   detail: {
     type: Boolean,
@@ -21,81 +28,35 @@
     type: String,
     required: true,
   },
+  list: {
+    type: Array,
+    default: () => [],
+  },
 })
 const emits = defineEmits(['saveOver'])
 // 默认流程节点
-const defaultProcess = {
-  id: '', // 检测节点id
-  executiveItem: '', // 检测项目
-  executiveDept: '', // 检测部门
-  executiveDeptName: '', // 检测部门
-  executivePerson: '', // 检测人员
-  executivePersonName: '', // 检测人员
-  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-  measureStateName: '', // 检测状态
-  currentCertifications: '', // 当前证书数
-  requireCertifications: '', // 应出具证书数
-  updateTime: '', // 更新时间
-  backPerson: '', // 退回人
-  backReason: '', // 退回原因
-  backTime: '', // 退回时间
-  distributePerson: '', // 分配人
-  distributeTime: '', // 分配时间
-  startTime: '', // 检测开始时间
-  overTime: '', // 检测结束时间
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
 }
 // 检定流程列表
-const processList = ref([
+const processList = ref<IScheduleSet[]>([
   { ...defaultProcess },
 ])
 
-// 获取当前样品检测流程，参数待定
-const fetchProcess = () => {
-  // TODO: 模拟数据
-  processList.value = [
-    {
-      id: '1', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423635973935106', // 检测部门
-      executiveDeptName: '力学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '张三', // 检测人员
-      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待检测', // 检测状态
-      currentCertifications: '0', // 当前证书数
-      requireCertifications: '2', // 应出具证书数
-      updateTime: '2023-02-01 09:00:05', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-    {
-      id: '2', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423577505337346', // 检测部门
-      executiveDeptName: '热学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待分配', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-  ]
-}
-fetchProcess()
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+})
 
 // 点击添加流程
 const processAdd = () => {
@@ -121,25 +82,17 @@
 // 批量添加实验室
 const batchChooseOver = (labs: ILabList[]) => {
   for (const item of labs) {
-    const processTemp = {
-      id: '',
-      executiveItem: '', // 检测项目
-      executiveDept: item.deptId, // 检测部门
-      executiveDeptName: item.organizeName, // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
     }
     processList.value.push(processTemp)
   }
@@ -147,9 +100,24 @@
 
 // 保存流程
 const saveProcess = () => {
-  // TODO: 保存流程
-  console.log(processList.value)
-  emits('saveOver')
+  const form = {
+    measureProcessList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  console.log(form)
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
 }
 // 删除流程
 const deleteProcess = (index: number) => {
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index 6cbdf10..31dfae4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -12,24 +12,16 @@
     type: Object,
     default: () => {
       return {
-        id: '', // 检测节点id
-        executiveItem: '', // 检测项目
-        executiveDept: '', // 检测部门
-        executiveDeptName: '', // 检测部门
-        executivePerson: '', // 检测人员
-        executivePersonName: '', // 检测人员
-        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-        measureStateName: '', // 检测状态
-        currentCertifications: '', // 当前证书数
-        requireCertifications: '', // 应出具证书数
-        updateTime: '', // 更新时间
-        backPerson: '', // 退回人
-        backReason: '', // 退回原因
-        backTime: '', // 退回时间
-        distributePerson: '', // 分配人
-        distributeTime: '', // 分配时间
-        startTime: '', // 检测开始时间
-        overTime: '', // 检测结束时间
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
       }
     },
   },
@@ -56,22 +48,23 @@
 })
 // 检定环节可编辑-只有待分发状态可编辑
 const deptEdit = computed(() => {
-  return processNodeData.value.measureState == '0'
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 检定人可编辑-待分配状态可编辑
 const personEdit = computed(() => {
-  const editStates = ['0', '1']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 证书可编辑-待分发、待分配、待检测状态可编辑
 const certificationEdit = computed(() => {
-  const editStates = ['0', '1', '2']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 节点可移动
 const canMove = computed(() => {
-  const editStates = ['0']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 
 // 选择实验室
@@ -82,8 +75,8 @@
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
   console.log(lab)
-  processNodeData.value.executiveDept = lab.deptId
-  processNodeData.value.executiveDeptName = lab.organizeName
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
 }
 
 // 选择人员
@@ -93,8 +86,8 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
-  processNodeData.value.executivePerson = person.id
-  processNodeData.value.executivePersonName = person.name
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
 }
 
@@ -122,7 +115,7 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit">
           <template v-if="deptEdit" #append>
             <el-button :icon="Aim" size="small" link @click="clickChoose" />
           </template>
@@ -130,7 +123,7 @@
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit">
           <template v-if="personEdit" #append>
             <el-button :icon="Aim" size="small" link @click="choosePerson" />
           </template>
@@ -140,7 +133,7 @@
         <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
       <div class="line">
-        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
       </div>
       <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
@@ -149,7 +142,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
new file mode 100644
index 0000000..d6827e4
--- /dev/null
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts" name="DistributeDialog">
+import processConfig from './processConfig.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { getTaskDetail } from '@/api/business/task'
+// 任务分发弹窗
+
+// 自定义方法：close关闭弹窗
+const emit = defineEmits(['close'])
+const dialogVisible = ref(false) // 弹窗显示
+const sampleId = ref('') // 样品id
+const orderId = ref('') // 委托单id
+
+// 委托书-证书类别列表
+const certificationTypes = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  getDictByCode('certificationType').then((response) => {
+    certificationTypes.value = response.data
+  })
+}
+
+getDict()
+// 样品详情
+const sampleDetail = ref({
+  sampleName: '压力表',
+  mesureContent: '压力、ip68',
+  certifications: ['1', '2'],
+  remark: '这是备注',
+  measureProcessList: [],
+  measureSendBackList: [],
+})
+
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    sampleDetail.value.sampleName = res.data.sampleName
+    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.remark = res.data.remark
+    sampleDetail.value.certifications = res.data.certifications
+    sampleDetail.value.measureProcessList = res.data.measureProcessList
+    sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+  })
+}
+// 初始化弹窗
+const initDialog = (orderid: string, sampleid: string) => {
+  dialogVisible.value = true
+  sampleId.value = sampleid
+  orderId.value = orderid
+  getInfo()
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+  emit('close')
+}
+function cancel() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="任务分发" width="1000" @close="cancel">
+    <div class="simple-info">
+      <div class="simple-info-line">
+        <span class="label">样品名称:</span>
+        <el-input v-model="sampleDetail.sampleName" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">证书类别:</span>
+        <el-checkbox-group v-model="sampleDetail.certifications" disabled>
+          <el-checkbox v-for="item in certificationTypes" :key="item.value" :label="item.value">
+            {{ item.name }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="simple-info-line">
+        <span class="label">检定项目:</span>
+        <el-input v-model="sampleDetail.mesureContent" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">备注:</span>
+        <el-input v-model="sampleDetail.remark" disabled />
+      </div>
+    </div>
+    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+      批量添加
+    </el-button>
+    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <template #footer>
+      <el-button type="primary" @click="saveProcess">
+        确定
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//  样式
+.simple-info {
+  margin-top: -10px;
+  margin-bottom: 10px;
+
+  .simple-info-line {
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    .label {
+      width: 90px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/components/lab-interface.ts b/src/views/business/schedule/task/components/lab-interface.ts
index d6355c6..02b0d1d 100644
--- a/src/views/business/schedule/task/components/lab-interface.ts
+++ b/src/views/business/schedule/task/components/lab-interface.ts
@@ -6,7 +6,8 @@
   isLab: '1' // 是否是实验室
   director: string // 负责人
   meterMajor: string // 专业
-  measureItems: string// 检测能力
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
 }
 
 // 部门返回值对象类型
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 4ccab04..1efb8a9 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -1,11 +1,18 @@
 <script setup lang="ts" name="ProcessConfig">
 import { ref } from 'vue'
 import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
 import ProcessNode from './processNode.vue'
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/task'
 const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
   // 是否为详情展示页面
   detail: {
     type: Boolean,
@@ -21,81 +28,35 @@
     type: String,
     required: true,
   },
+  list: {
+    type: Array,
+    default: () => [],
+  },
 })
 const emits = defineEmits(['saveOver'])
 // 默认流程节点
-const defaultProcess = {
-  id: '', // 检测节点id
-  executiveItem: '', // 检测项目
-  executiveDept: '', // 检测部门
-  executiveDeptName: '', // 检测部门
-  executivePerson: '', // 检测人员
-  executivePersonName: '', // 检测人员
-  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-  measureStateName: '', // 检测状态
-  currentCertifications: '', // 当前证书数
-  requireCertifications: '', // 应出具证书数
-  updateTime: '', // 更新时间
-  backPerson: '', // 退回人
-  backReason: '', // 退回原因
-  backTime: '', // 退回时间
-  distributePerson: '', // 分配人
-  distributeTime: '', // 分配时间
-  startTime: '', // 检测开始时间
-  overTime: '', // 检测结束时间
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
 }
 // 检定流程列表
-const processList = ref([
+const processList = ref<IScheduleSet[]>([
   { ...defaultProcess },
 ])
 
-// 获取当前样品检测流程，参数待定
-const fetchProcess = () => {
-  // TODO: 模拟数据
-  processList.value = [
-    {
-      id: '1', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423635973935106', // 检测部门
-      executiveDeptName: '力学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '张三', // 检测人员
-      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待检测', // 检测状态
-      currentCertifications: '0', // 当前证书数
-      requireCertifications: '2', // 应出具证书数
-      updateTime: '2023-02-01 09:00:05', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-    {
-      id: '2', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423577505337346', // 检测部门
-      executiveDeptName: '热学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待分配', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-  ]
-}
-fetchProcess()
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+})
 
 // 点击添加流程
 const processAdd = () => {
@@ -121,25 +82,17 @@
 // 批量添加实验室
 const batchChooseOver = (labs: ILabList[]) => {
   for (const item of labs) {
-    const processTemp = {
-      id: '',
-      executiveItem: '', // 检测项目
-      executiveDept: item.deptId, // 检测部门
-      executiveDeptName: item.organizeName, // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
     }
     processList.value.push(processTemp)
   }
@@ -147,9 +100,24 @@
 
 // 保存流程
 const saveProcess = () => {
-  // TODO: 保存流程
-  console.log(processList.value)
-  emits('saveOver')
+  const form = {
+    measureProcessList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  console.log(form)
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
 }
 // 删除流程
 const deleteProcess = (index: number) => {
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index 6cbdf10..31dfae4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -12,24 +12,16 @@
     type: Object,
     default: () => {
       return {
-        id: '', // 检测节点id
-        executiveItem: '', // 检测项目
-        executiveDept: '', // 检测部门
-        executiveDeptName: '', // 检测部门
-        executivePerson: '', // 检测人员
-        executivePersonName: '', // 检测人员
-        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-        measureStateName: '', // 检测状态
-        currentCertifications: '', // 当前证书数
-        requireCertifications: '', // 应出具证书数
-        updateTime: '', // 更新时间
-        backPerson: '', // 退回人
-        backReason: '', // 退回原因
-        backTime: '', // 退回时间
-        distributePerson: '', // 分配人
-        distributeTime: '', // 分配时间
-        startTime: '', // 检测开始时间
-        overTime: '', // 检测结束时间
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
       }
     },
   },
@@ -56,22 +48,23 @@
 })
 // 检定环节可编辑-只有待分发状态可编辑
 const deptEdit = computed(() => {
-  return processNodeData.value.measureState == '0'
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 检定人可编辑-待分配状态可编辑
 const personEdit = computed(() => {
-  const editStates = ['0', '1']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 证书可编辑-待分发、待分配、待检测状态可编辑
 const certificationEdit = computed(() => {
-  const editStates = ['0', '1', '2']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 节点可移动
 const canMove = computed(() => {
-  const editStates = ['0']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 
 // 选择实验室
@@ -82,8 +75,8 @@
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
   console.log(lab)
-  processNodeData.value.executiveDept = lab.deptId
-  processNodeData.value.executiveDeptName = lab.organizeName
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
 }
 
 // 选择人员
@@ -93,8 +86,8 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
-  processNodeData.value.executivePerson = person.id
-  processNodeData.value.executivePersonName = person.name
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
 }
 
@@ -122,7 +115,7 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit">
           <template v-if="deptEdit" #append>
             <el-button :icon="Aim" size="small" link @click="clickChoose" />
           </template>
@@ -130,7 +123,7 @@
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit">
           <template v-if="personEdit" #append>
             <el-button :icon="Aim" size="small" link @click="choosePerson" />
           </template>
@@ -140,7 +133,7 @@
         <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
       <div class="line">
-        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
       </div>
       <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
@@ -149,7 +142,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 1d02839..493fbba 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,5 +1,3 @@
-import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
-
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -8,12 +6,29 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
   offset: number
 }
 
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
 // 任务列表-返回值
 export interface ITaskList {
   orderId: string // 委托书编号
@@ -25,41 +40,127 @@
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  isUrgent: string // 是否加急
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
   requireOverTime: string // 应检完时间
-  sampleAttr: string // 样品属性
-  sampleAttrName: string // 样品属性
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
   currentMeasureState: string // 当前检定环节
   currentMeasureStateName: string // 当前检定环节
-  currentCertifications: number // 已出具证书总数
+  alreadyCertifications: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
-  distributeStateName: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
 }
 
-// 检测流程节点
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+}
+
+// 全部检测流程节点
 export interface ISchedule {
-  executivePerson: string // 执行人
-  executivePersonName: string // 执行人名称
-  executiveDept: string // 执行部门
-  executiveDeptName: string // 执行部门名称
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
   executiveItem: string // 检定项目
-  currentCertifications?: number // 已出具证书总数
+  alreadyCertifications?: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  measureState: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
   updateTime: string // 流程更新时间
-  backTime: string // 退回时间
-  backReason: string // 退回原因
-  backPerson: string // 退回人
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
   distributePerson: string // 分配人
   distributeTime: string // 分配时间
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
 
 // 样品检测信息
-export interface ISampleMeasure extends ISampleEdit {
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
   orderId: string // 委托单id
+  orderCode: string // 委托单编号
   certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
 }

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
new file mode 100644
index 0000000..d6827e4
--- /dev/null
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts" name="DistributeDialog">
+import processConfig from './processConfig.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { getTaskDetail } from '@/api/business/task'
+// 任务分发弹窗
+
+// 自定义方法：close关闭弹窗
+const emit = defineEmits(['close'])
+const dialogVisible = ref(false) // 弹窗显示
+const sampleId = ref('') // 样品id
+const orderId = ref('') // 委托单id
+
+// 委托书-证书类别列表
+const certificationTypes = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  getDictByCode('certificationType').then((response) => {
+    certificationTypes.value = response.data
+  })
+}
+
+getDict()
+// 样品详情
+const sampleDetail = ref({
+  sampleName: '压力表',
+  mesureContent: '压力、ip68',
+  certifications: ['1', '2'],
+  remark: '这是备注',
+  measureProcessList: [],
+  measureSendBackList: [],
+})
+
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    sampleDetail.value.sampleName = res.data.sampleName
+    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.remark = res.data.remark
+    sampleDetail.value.certifications = res.data.certifications
+    sampleDetail.value.measureProcessList = res.data.measureProcessList
+    sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+  })
+}
+// 初始化弹窗
+const initDialog = (orderid: string, sampleid: string) => {
+  dialogVisible.value = true
+  sampleId.value = sampleid
+  orderId.value = orderid
+  getInfo()
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+  emit('close')
+}
+function cancel() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="任务分发" width="1000" @close="cancel">
+    <div class="simple-info">
+      <div class="simple-info-line">
+        <span class="label">样品名称:</span>
+        <el-input v-model="sampleDetail.sampleName" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">证书类别:</span>
+        <el-checkbox-group v-model="sampleDetail.certifications" disabled>
+          <el-checkbox v-for="item in certificationTypes" :key="item.value" :label="item.value">
+            {{ item.name }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="simple-info-line">
+        <span class="label">检定项目:</span>
+        <el-input v-model="sampleDetail.mesureContent" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">备注:</span>
+        <el-input v-model="sampleDetail.remark" disabled />
+      </div>
+    </div>
+    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+      批量添加
+    </el-button>
+    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <template #footer>
+      <el-button type="primary" @click="saveProcess">
+        确定
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//  样式
+.simple-info {
+  margin-top: -10px;
+  margin-bottom: 10px;
+
+  .simple-info-line {
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    .label {
+      width: 90px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/components/lab-interface.ts b/src/views/business/schedule/task/components/lab-interface.ts
index d6355c6..02b0d1d 100644
--- a/src/views/business/schedule/task/components/lab-interface.ts
+++ b/src/views/business/schedule/task/components/lab-interface.ts
@@ -6,7 +6,8 @@
   isLab: '1' // 是否是实验室
   director: string // 负责人
   meterMajor: string // 专业
-  measureItems: string// 检测能力
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
 }
 
 // 部门返回值对象类型
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 4ccab04..1efb8a9 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -1,11 +1,18 @@
 <script setup lang="ts" name="ProcessConfig">
 import { ref } from 'vue'
 import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
 import ProcessNode from './processNode.vue'
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/task'
 const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
   // 是否为详情展示页面
   detail: {
     type: Boolean,
@@ -21,81 +28,35 @@
     type: String,
     required: true,
   },
+  list: {
+    type: Array,
+    default: () => [],
+  },
 })
 const emits = defineEmits(['saveOver'])
 // 默认流程节点
-const defaultProcess = {
-  id: '', // 检测节点id
-  executiveItem: '', // 检测项目
-  executiveDept: '', // 检测部门
-  executiveDeptName: '', // 检测部门
-  executivePerson: '', // 检测人员
-  executivePersonName: '', // 检测人员
-  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-  measureStateName: '', // 检测状态
-  currentCertifications: '', // 当前证书数
-  requireCertifications: '', // 应出具证书数
-  updateTime: '', // 更新时间
-  backPerson: '', // 退回人
-  backReason: '', // 退回原因
-  backTime: '', // 退回时间
-  distributePerson: '', // 分配人
-  distributeTime: '', // 分配时间
-  startTime: '', // 检测开始时间
-  overTime: '', // 检测结束时间
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
 }
 // 检定流程列表
-const processList = ref([
+const processList = ref<IScheduleSet[]>([
   { ...defaultProcess },
 ])
 
-// 获取当前样品检测流程，参数待定
-const fetchProcess = () => {
-  // TODO: 模拟数据
-  processList.value = [
-    {
-      id: '1', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423635973935106', // 检测部门
-      executiveDeptName: '力学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '张三', // 检测人员
-      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待检测', // 检测状态
-      currentCertifications: '0', // 当前证书数
-      requireCertifications: '2', // 应出具证书数
-      updateTime: '2023-02-01 09:00:05', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-    {
-      id: '2', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423577505337346', // 检测部门
-      executiveDeptName: '热学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待分配', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-  ]
-}
-fetchProcess()
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+})
 
 // 点击添加流程
 const processAdd = () => {
@@ -121,25 +82,17 @@
 // 批量添加实验室
 const batchChooseOver = (labs: ILabList[]) => {
   for (const item of labs) {
-    const processTemp = {
-      id: '',
-      executiveItem: '', // 检测项目
-      executiveDept: item.deptId, // 检测部门
-      executiveDeptName: item.organizeName, // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
     }
     processList.value.push(processTemp)
   }
@@ -147,9 +100,24 @@
 
 // 保存流程
 const saveProcess = () => {
-  // TODO: 保存流程
-  console.log(processList.value)
-  emits('saveOver')
+  const form = {
+    measureProcessList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  console.log(form)
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
 }
 // 删除流程
 const deleteProcess = (index: number) => {
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index 6cbdf10..31dfae4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -12,24 +12,16 @@
     type: Object,
     default: () => {
       return {
-        id: '', // 检测节点id
-        executiveItem: '', // 检测项目
-        executiveDept: '', // 检测部门
-        executiveDeptName: '', // 检测部门
-        executivePerson: '', // 检测人员
-        executivePersonName: '', // 检测人员
-        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-        measureStateName: '', // 检测状态
-        currentCertifications: '', // 当前证书数
-        requireCertifications: '', // 应出具证书数
-        updateTime: '', // 更新时间
-        backPerson: '', // 退回人
-        backReason: '', // 退回原因
-        backTime: '', // 退回时间
-        distributePerson: '', // 分配人
-        distributeTime: '', // 分配时间
-        startTime: '', // 检测开始时间
-        overTime: '', // 检测结束时间
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
       }
     },
   },
@@ -56,22 +48,23 @@
 })
 // 检定环节可编辑-只有待分发状态可编辑
 const deptEdit = computed(() => {
-  return processNodeData.value.measureState == '0'
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 检定人可编辑-待分配状态可编辑
 const personEdit = computed(() => {
-  const editStates = ['0', '1']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 证书可编辑-待分发、待分配、待检测状态可编辑
 const certificationEdit = computed(() => {
-  const editStates = ['0', '1', '2']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 节点可移动
 const canMove = computed(() => {
-  const editStates = ['0']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 
 // 选择实验室
@@ -82,8 +75,8 @@
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
   console.log(lab)
-  processNodeData.value.executiveDept = lab.deptId
-  processNodeData.value.executiveDeptName = lab.organizeName
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
 }
 
 // 选择人员
@@ -93,8 +86,8 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
-  processNodeData.value.executivePerson = person.id
-  processNodeData.value.executivePersonName = person.name
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
 }
 
@@ -122,7 +115,7 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit">
           <template v-if="deptEdit" #append>
             <el-button :icon="Aim" size="small" link @click="clickChoose" />
           </template>
@@ -130,7 +123,7 @@
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit">
           <template v-if="personEdit" #append>
             <el-button :icon="Aim" size="small" link @click="choosePerson" />
           </template>
@@ -140,7 +133,7 @@
         <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
       <div class="line">
-        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
       </div>
       <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
@@ -149,7 +142,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 1d02839..493fbba 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,5 +1,3 @@
-import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
-
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -8,12 +6,29 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
   offset: number
 }
 
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
 // 任务列表-返回值
 export interface ITaskList {
   orderId: string // 委托书编号
@@ -25,41 +40,127 @@
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  isUrgent: string // 是否加急
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
   requireOverTime: string // 应检完时间
-  sampleAttr: string // 样品属性
-  sampleAttrName: string // 样品属性
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
   currentMeasureState: string // 当前检定环节
   currentMeasureStateName: string // 当前检定环节
-  currentCertifications: number // 已出具证书总数
+  alreadyCertifications: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
-  distributeStateName: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
 }
 
-// 检测流程节点
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+}
+
+// 全部检测流程节点
 export interface ISchedule {
-  executivePerson: string // 执行人
-  executivePersonName: string // 执行人名称
-  executiveDept: string // 执行部门
-  executiveDeptName: string // 执行部门名称
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
   executiveItem: string // 检定项目
-  currentCertifications?: number // 已出具证书总数
+  alreadyCertifications?: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  measureState: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
   updateTime: string // 流程更新时间
-  backTime: string // 退回时间
-  backReason: string // 退回原因
-  backPerson: string // 退回人
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
   distributePerson: string // 分配人
   distributeTime: string // 分配时间
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
 
 // 样品检测信息
-export interface ISampleMeasure extends ISampleEdit {
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
   orderId: string // 委托单id
+  orderCode: string // 委托单编号
   certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
 }
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 465b2e7..547ee3e 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,28 +1,27 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
-import type { ISampleMeasure } from './task-interface'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
 import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getTaskDetail } from '@/api/business/task'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // 样品详情id
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -39,32 +38,49 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleMeasure> = ref({
-  id: '',
-  orderId: '', // 委托单id
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
   postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
   manufacturer: '', // 生产厂家
   manufacturerCountry: '', // 厂家国别
   manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
   remark: '', // 备注
   minioFileName: '', // 说明书
   labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-  certifications: '',
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
 })
 const ruleFormRef = ref<FormInstance>()
 
@@ -143,14 +159,6 @@
   return menu.find(item => item.name === currentMenu.value)
 })
 
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
 const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
@@ -181,11 +189,9 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(dataForm.value).then((res) => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -195,42 +201,23 @@
     }
   })
 }
-
-// 获取样品详情
+//
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
 const getInfo = () => {
-  // getSapmleDetail({ id: infoId.value }).then((res) => {
-  dataForm.value = {
-    orderId: '123',
-    ABC: 'A',
-    companyAddress: '北京/北京市',
-    customerName: '京东集团',
-    customerNo: 'sygf202211290001',
-    id: '111111',
-    labelBind: '11222',
-    manufacturer: '北京某厂家',
-    manufacturerCountry: 'CN',
-    manufacturingDate: '2023-03',
-    manufacturingNo: '123121',
-    mesureCategory: '',
-    mesureContent: '项目1',
-    mesurePeriod: '1',
-    mesureType: '',
-    minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-    phone: '950618',
-    postalCode: 'test',
-    remark: '无备注',
-    sampleModel: '型号1',
-    sampleName: '样品1',
-    sampleNo: '123456',
-    measureResultCode: 'bhg',
-    deliverer: '张三',
-    delivererTel: '156254577545',
-    certifications: '1',
-  }
-  // for (const item of menu) {
-  //   item.searchFunc()
-  // }
-  // })
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList
+    taskForm.value.measureSendBackList = res.data.measureSendBackList
+  })
 }
 
 // 点击标签绑定的扫描
@@ -260,7 +247,7 @@
     fd.append('multipartFile', event.target.files[0])
     // UploadFile(fd).then((res) => {
     //   if (res.code === 200) {
-    //     dataForm.value.minioFileName = res.data[0]
+    //     sampleForm.value.minioFileName = res.data[0]
     //     // 重置当前验证
     //     ElMessage.success('文件上传成功')
     //   }
@@ -273,18 +260,30 @@
 const upload = () => {
   fileRef.value.click()
 }
-// 获取样品详情
-getInfo()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.role) {
+  roleType.value = $route.params.role as string // 使用角色
+
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+    getSampleInfo()
+  }
+}
 </script>
 
 <template>
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -294,7 +293,7 @@
       <div id="form">
         <el-form
           ref="ruleFormRef"
-          :model="dataForm"
+          :model="sampleForm"
           :label-width="120"
           label-position="right"
           :rules="rules"
@@ -303,9 +302,9 @@
             <el-col :span="6">
               <el-form-item label="样品编号:" prop="sampleNo">
                 <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -313,9 +312,9 @@
             <el-col :span="6">
               <el-form-item label="样品名称:" prop="sampleName">
                 <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -323,9 +322,9 @@
             <el-col :span="6">
               <el-form-item label="样品型号:" prop="sampleModel">
                 <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -333,9 +332,9 @@
             <el-col :span="6">
               <el-form-item label="出厂编号:" prop="manufacturingNo">
                 <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -343,9 +342,9 @@
             <el-col :span="6">
               <el-form-item label="委托方代码" prop="customerNo">
                 <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -353,9 +352,9 @@
             <el-col :span="6">
               <el-form-item label="委托方名称" prop="customerName">
                 <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -363,9 +362,9 @@
             <el-col :span="6">
               <el-form-item label="委托方电话" prop="phone">
                 <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -373,9 +372,9 @@
             <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -383,11 +382,11 @@
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
-                  v-model="dataForm.companyAddress"
+                  v-model="sampleForm.customerAddress"
                   type="textarea"
                   autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -395,9 +394,9 @@
             <el-col :span="6">
               <el-form-item label="校检类别:">
                 <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
@@ -407,19 +406,19 @@
             <el-col :span="6">
               <el-form-item label="生产厂家:">
                 <el-input
-                  v-model="dataForm.manufacturer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="厂家国别:">
                 <el-select
-                  v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
@@ -429,23 +428,23 @@
             <el-col :span="6">
               <el-form-item label="出厂年月:">
                 <el-date-picker
-                  v-model="dataForm.manufacturingDate"
+                  v-model="sampleForm.manufacturingDate"
                   type="month"
                   format="YYYY-MM"
                   value-format="YYYY-MM"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="ABC:">
                 <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
@@ -455,9 +454,9 @@
             <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -465,9 +464,9 @@
             <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
-                  v-model="dataForm.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -475,49 +474,20 @@
             <el-col :span="24">
               <el-form-item label="检定项目:" prop="mesureContent">
                 <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定周期（月）:">
                 <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="上次检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  disabled
-                  class="full-width-input"
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
@@ -526,21 +496,21 @@
             <el-col :span="24">
               <el-form-item label="备注:">
                 <el-input
-                  v-model="dataForm.remark"
+                  v-model="sampleForm.remark"
                   type="textarea"
                   :rows="2"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
-                  v-model="dataForm.mesureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
@@ -550,10 +520,10 @@
             <el-col :span="6">
               <el-form-item label="标签绑定:">
                 <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 >
                   <template #append>
                     <el-button>扫描</el-button>
@@ -565,11 +535,11 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="14">
               <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
             </el-col>
@@ -586,7 +556,7 @@
           保存
         </el-button>
       </template>
-      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
@@ -604,11 +574,11 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="dataForm.id!" :order-id="dataForm.orderId" />
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
       <!-- 检定记录 -->
-      <measure-records v-if="currentMenu === '检定记录'" :sample-id="dataForm.id!" />
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
-      <certification-records v-if="currentMenu === '检定证书'" :sample-id="dataForm.id!" />
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
     </detail-block-switch>
   </app-container>
 </template>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
new file mode 100644
index 0000000..d6827e4
--- /dev/null
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts" name="DistributeDialog">
+import processConfig from './processConfig.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { getTaskDetail } from '@/api/business/task'
+// 任务分发弹窗
+
+// 自定义方法：close关闭弹窗
+const emit = defineEmits(['close'])
+const dialogVisible = ref(false) // 弹窗显示
+const sampleId = ref('') // 样品id
+const orderId = ref('') // 委托单id
+
+// 委托书-证书类别列表
+const certificationTypes = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  getDictByCode('certificationType').then((response) => {
+    certificationTypes.value = response.data
+  })
+}
+
+getDict()
+// 样品详情
+const sampleDetail = ref({
+  sampleName: '压力表',
+  mesureContent: '压力、ip68',
+  certifications: ['1', '2'],
+  remark: '这是备注',
+  measureProcessList: [],
+  measureSendBackList: [],
+})
+
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    sampleDetail.value.sampleName = res.data.sampleName
+    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.remark = res.data.remark
+    sampleDetail.value.certifications = res.data.certifications
+    sampleDetail.value.measureProcessList = res.data.measureProcessList
+    sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+  })
+}
+// 初始化弹窗
+const initDialog = (orderid: string, sampleid: string) => {
+  dialogVisible.value = true
+  sampleId.value = sampleid
+  orderId.value = orderid
+  getInfo()
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+  emit('close')
+}
+function cancel() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="任务分发" width="1000" @close="cancel">
+    <div class="simple-info">
+      <div class="simple-info-line">
+        <span class="label">样品名称:</span>
+        <el-input v-model="sampleDetail.sampleName" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">证书类别:</span>
+        <el-checkbox-group v-model="sampleDetail.certifications" disabled>
+          <el-checkbox v-for="item in certificationTypes" :key="item.value" :label="item.value">
+            {{ item.name }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="simple-info-line">
+        <span class="label">检定项目:</span>
+        <el-input v-model="sampleDetail.mesureContent" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">备注:</span>
+        <el-input v-model="sampleDetail.remark" disabled />
+      </div>
+    </div>
+    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+      批量添加
+    </el-button>
+    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <template #footer>
+      <el-button type="primary" @click="saveProcess">
+        确定
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//  样式
+.simple-info {
+  margin-top: -10px;
+  margin-bottom: 10px;
+
+  .simple-info-line {
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    .label {
+      width: 90px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/components/lab-interface.ts b/src/views/business/schedule/task/components/lab-interface.ts
index d6355c6..02b0d1d 100644
--- a/src/views/business/schedule/task/components/lab-interface.ts
+++ b/src/views/business/schedule/task/components/lab-interface.ts
@@ -6,7 +6,8 @@
   isLab: '1' // 是否是实验室
   director: string // 负责人
   meterMajor: string // 专业
-  measureItems: string// 检测能力
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
 }
 
 // 部门返回值对象类型
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 4ccab04..1efb8a9 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -1,11 +1,18 @@
 <script setup lang="ts" name="ProcessConfig">
 import { ref } from 'vue'
 import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
 import ProcessNode from './processNode.vue'
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/task'
 const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
   // 是否为详情展示页面
   detail: {
     type: Boolean,
@@ -21,81 +28,35 @@
     type: String,
     required: true,
   },
+  list: {
+    type: Array,
+    default: () => [],
+  },
 })
 const emits = defineEmits(['saveOver'])
 // 默认流程节点
-const defaultProcess = {
-  id: '', // 检测节点id
-  executiveItem: '', // 检测项目
-  executiveDept: '', // 检测部门
-  executiveDeptName: '', // 检测部门
-  executivePerson: '', // 检测人员
-  executivePersonName: '', // 检测人员
-  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-  measureStateName: '', // 检测状态
-  currentCertifications: '', // 当前证书数
-  requireCertifications: '', // 应出具证书数
-  updateTime: '', // 更新时间
-  backPerson: '', // 退回人
-  backReason: '', // 退回原因
-  backTime: '', // 退回时间
-  distributePerson: '', // 分配人
-  distributeTime: '', // 分配时间
-  startTime: '', // 检测开始时间
-  overTime: '', // 检测结束时间
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
 }
 // 检定流程列表
-const processList = ref([
+const processList = ref<IScheduleSet[]>([
   { ...defaultProcess },
 ])
 
-// 获取当前样品检测流程，参数待定
-const fetchProcess = () => {
-  // TODO: 模拟数据
-  processList.value = [
-    {
-      id: '1', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423635973935106', // 检测部门
-      executiveDeptName: '力学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '张三', // 检测人员
-      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待检测', // 检测状态
-      currentCertifications: '0', // 当前证书数
-      requireCertifications: '2', // 应出具证书数
-      updateTime: '2023-02-01 09:00:05', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-    {
-      id: '2', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423577505337346', // 检测部门
-      executiveDeptName: '热学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待分配', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-  ]
-}
-fetchProcess()
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+})
 
 // 点击添加流程
 const processAdd = () => {
@@ -121,25 +82,17 @@
 // 批量添加实验室
 const batchChooseOver = (labs: ILabList[]) => {
   for (const item of labs) {
-    const processTemp = {
-      id: '',
-      executiveItem: '', // 检测项目
-      executiveDept: item.deptId, // 检测部门
-      executiveDeptName: item.organizeName, // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
     }
     processList.value.push(processTemp)
   }
@@ -147,9 +100,24 @@
 
 // 保存流程
 const saveProcess = () => {
-  // TODO: 保存流程
-  console.log(processList.value)
-  emits('saveOver')
+  const form = {
+    measureProcessList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  console.log(form)
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
 }
 // 删除流程
 const deleteProcess = (index: number) => {
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index 6cbdf10..31dfae4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -12,24 +12,16 @@
     type: Object,
     default: () => {
       return {
-        id: '', // 检测节点id
-        executiveItem: '', // 检测项目
-        executiveDept: '', // 检测部门
-        executiveDeptName: '', // 检测部门
-        executivePerson: '', // 检测人员
-        executivePersonName: '', // 检测人员
-        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-        measureStateName: '', // 检测状态
-        currentCertifications: '', // 当前证书数
-        requireCertifications: '', // 应出具证书数
-        updateTime: '', // 更新时间
-        backPerson: '', // 退回人
-        backReason: '', // 退回原因
-        backTime: '', // 退回时间
-        distributePerson: '', // 分配人
-        distributeTime: '', // 分配时间
-        startTime: '', // 检测开始时间
-        overTime: '', // 检测结束时间
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
       }
     },
   },
@@ -56,22 +48,23 @@
 })
 // 检定环节可编辑-只有待分发状态可编辑
 const deptEdit = computed(() => {
-  return processNodeData.value.measureState == '0'
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 检定人可编辑-待分配状态可编辑
 const personEdit = computed(() => {
-  const editStates = ['0', '1']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 证书可编辑-待分发、待分配、待检测状态可编辑
 const certificationEdit = computed(() => {
-  const editStates = ['0', '1', '2']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 节点可移动
 const canMove = computed(() => {
-  const editStates = ['0']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 
 // 选择实验室
@@ -82,8 +75,8 @@
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
   console.log(lab)
-  processNodeData.value.executiveDept = lab.deptId
-  processNodeData.value.executiveDeptName = lab.organizeName
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
 }
 
 // 选择人员
@@ -93,8 +86,8 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
-  processNodeData.value.executivePerson = person.id
-  processNodeData.value.executivePersonName = person.name
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
 }
 
@@ -122,7 +115,7 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit">
           <template v-if="deptEdit" #append>
             <el-button :icon="Aim" size="small" link @click="clickChoose" />
           </template>
@@ -130,7 +123,7 @@
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit">
           <template v-if="personEdit" #append>
             <el-button :icon="Aim" size="small" link @click="choosePerson" />
           </template>
@@ -140,7 +133,7 @@
         <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
       <div class="line">
-        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
       </div>
       <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
@@ -149,7 +142,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 1d02839..493fbba 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,5 +1,3 @@
-import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
-
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -8,12 +6,29 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
   offset: number
 }
 
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
 // 任务列表-返回值
 export interface ITaskList {
   orderId: string // 委托书编号
@@ -25,41 +40,127 @@
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  isUrgent: string // 是否加急
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
   requireOverTime: string // 应检完时间
-  sampleAttr: string // 样品属性
-  sampleAttrName: string // 样品属性
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
   currentMeasureState: string // 当前检定环节
   currentMeasureStateName: string // 当前检定环节
-  currentCertifications: number // 已出具证书总数
+  alreadyCertifications: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
-  distributeStateName: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
 }
 
-// 检测流程节点
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+}
+
+// 全部检测流程节点
 export interface ISchedule {
-  executivePerson: string // 执行人
-  executivePersonName: string // 执行人名称
-  executiveDept: string // 执行部门
-  executiveDeptName: string // 执行部门名称
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
   executiveItem: string // 检定项目
-  currentCertifications?: number // 已出具证书总数
+  alreadyCertifications?: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  measureState: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
   updateTime: string // 流程更新时间
-  backTime: string // 退回时间
-  backReason: string // 退回原因
-  backPerson: string // 退回人
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
   distributePerson: string // 分配人
   distributeTime: string // 分配时间
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
 
 // 样品检测信息
-export interface ISampleMeasure extends ISampleEdit {
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
   orderId: string // 委托单id
+  orderCode: string // 委托单编号
   certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
 }
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 465b2e7..547ee3e 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,28 +1,27 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
-import type { ISampleMeasure } from './task-interface'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
 import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getTaskDetail } from '@/api/business/task'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // 样品详情id
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -39,32 +38,49 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleMeasure> = ref({
-  id: '',
-  orderId: '', // 委托单id
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
   postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
   manufacturer: '', // 生产厂家
   manufacturerCountry: '', // 厂家国别
   manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
   remark: '', // 备注
   minioFileName: '', // 说明书
   labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-  certifications: '',
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
 })
 const ruleFormRef = ref<FormInstance>()
 
@@ -143,14 +159,6 @@
   return menu.find(item => item.name === currentMenu.value)
 })
 
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
 const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
@@ -181,11 +189,9 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(dataForm.value).then((res) => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -195,42 +201,23 @@
     }
   })
 }
-
-// 获取样品详情
+//
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
 const getInfo = () => {
-  // getSapmleDetail({ id: infoId.value }).then((res) => {
-  dataForm.value = {
-    orderId: '123',
-    ABC: 'A',
-    companyAddress: '北京/北京市',
-    customerName: '京东集团',
-    customerNo: 'sygf202211290001',
-    id: '111111',
-    labelBind: '11222',
-    manufacturer: '北京某厂家',
-    manufacturerCountry: 'CN',
-    manufacturingDate: '2023-03',
-    manufacturingNo: '123121',
-    mesureCategory: '',
-    mesureContent: '项目1',
-    mesurePeriod: '1',
-    mesureType: '',
-    minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-    phone: '950618',
-    postalCode: 'test',
-    remark: '无备注',
-    sampleModel: '型号1',
-    sampleName: '样品1',
-    sampleNo: '123456',
-    measureResultCode: 'bhg',
-    deliverer: '张三',
-    delivererTel: '156254577545',
-    certifications: '1',
-  }
-  // for (const item of menu) {
-  //   item.searchFunc()
-  // }
-  // })
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList
+    taskForm.value.measureSendBackList = res.data.measureSendBackList
+  })
 }
 
 // 点击标签绑定的扫描
@@ -260,7 +247,7 @@
     fd.append('multipartFile', event.target.files[0])
     // UploadFile(fd).then((res) => {
     //   if (res.code === 200) {
-    //     dataForm.value.minioFileName = res.data[0]
+    //     sampleForm.value.minioFileName = res.data[0]
     //     // 重置当前验证
     //     ElMessage.success('文件上传成功')
     //   }
@@ -273,18 +260,30 @@
 const upload = () => {
   fileRef.value.click()
 }
-// 获取样品详情
-getInfo()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.role) {
+  roleType.value = $route.params.role as string // 使用角色
+
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+    getSampleInfo()
+  }
+}
 </script>
 
 <template>
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -294,7 +293,7 @@
       <div id="form">
         <el-form
           ref="ruleFormRef"
-          :model="dataForm"
+          :model="sampleForm"
           :label-width="120"
           label-position="right"
           :rules="rules"
@@ -303,9 +302,9 @@
             <el-col :span="6">
               <el-form-item label="样品编号:" prop="sampleNo">
                 <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -313,9 +312,9 @@
             <el-col :span="6">
               <el-form-item label="样品名称:" prop="sampleName">
                 <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -323,9 +322,9 @@
             <el-col :span="6">
               <el-form-item label="样品型号:" prop="sampleModel">
                 <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -333,9 +332,9 @@
             <el-col :span="6">
               <el-form-item label="出厂编号:" prop="manufacturingNo">
                 <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -343,9 +342,9 @@
             <el-col :span="6">
               <el-form-item label="委托方代码" prop="customerNo">
                 <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -353,9 +352,9 @@
             <el-col :span="6">
               <el-form-item label="委托方名称" prop="customerName">
                 <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -363,9 +362,9 @@
             <el-col :span="6">
               <el-form-item label="委托方电话" prop="phone">
                 <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -373,9 +372,9 @@
             <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -383,11 +382,11 @@
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
-                  v-model="dataForm.companyAddress"
+                  v-model="sampleForm.customerAddress"
                   type="textarea"
                   autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -395,9 +394,9 @@
             <el-col :span="6">
               <el-form-item label="校检类别:">
                 <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
@@ -407,19 +406,19 @@
             <el-col :span="6">
               <el-form-item label="生产厂家:">
                 <el-input
-                  v-model="dataForm.manufacturer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="厂家国别:">
                 <el-select
-                  v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
@@ -429,23 +428,23 @@
             <el-col :span="6">
               <el-form-item label="出厂年月:">
                 <el-date-picker
-                  v-model="dataForm.manufacturingDate"
+                  v-model="sampleForm.manufacturingDate"
                   type="month"
                   format="YYYY-MM"
                   value-format="YYYY-MM"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="ABC:">
                 <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
@@ -455,9 +454,9 @@
             <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -465,9 +464,9 @@
             <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
-                  v-model="dataForm.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -475,49 +474,20 @@
             <el-col :span="24">
               <el-form-item label="检定项目:" prop="mesureContent">
                 <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定周期（月）:">
                 <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="上次检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  disabled
-                  class="full-width-input"
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
@@ -526,21 +496,21 @@
             <el-col :span="24">
               <el-form-item label="备注:">
                 <el-input
-                  v-model="dataForm.remark"
+                  v-model="sampleForm.remark"
                   type="textarea"
                   :rows="2"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
-                  v-model="dataForm.mesureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
@@ -550,10 +520,10 @@
             <el-col :span="6">
               <el-form-item label="标签绑定:">
                 <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 >
                   <template #append>
                     <el-button>扫描</el-button>
@@ -565,11 +535,11 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="14">
               <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
             </el-col>
@@ -586,7 +556,7 @@
           保存
         </el-button>
       </template>
-      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
@@ -604,11 +574,11 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="dataForm.id!" :order-id="dataForm.orderId" />
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
       <!-- 检定记录 -->
-      <measure-records v-if="currentMenu === '检定记录'" :sample-id="dataForm.id!" />
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
-      <certification-records v-if="currentMenu === '检定证书'" :sample-id="dataForm.id!" />
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index f784804..461c518 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -31,7 +31,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
@@ -39,30 +39,30 @@
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
-  { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center' },
-  { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
-  { text: '分发性质', value: 'distributeState', align: 'center', width: '90px' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return row.alreadyCertifications ? `${row.alreadyCertifications}/${row.requireCertifications}` : '0/0' } },
+  { text: '分发性质', value: 'handOutProperty', align: 'center', width: '90px' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -80,15 +80,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // // 模拟数据
-  // list.value = [
-  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  // ]
-  // loadingTable.value = false
-  // console.log(listQuery.value)
   getTaskList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -111,15 +107,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
+    sampleBelong: '', // 样品属性
     sampleStatus: '2', // 分发状态
+    startTime: '', //	应检定开始时间
+    endTime: '', //	应检定结束时间
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -271,8 +269,8 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
new file mode 100644
index 0000000..d6827e4
--- /dev/null
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts" name="DistributeDialog">
+import processConfig from './processConfig.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { getTaskDetail } from '@/api/business/task'
+// 任务分发弹窗
+
+// 自定义方法：close关闭弹窗
+const emit = defineEmits(['close'])
+const dialogVisible = ref(false) // 弹窗显示
+const sampleId = ref('') // 样品id
+const orderId = ref('') // 委托单id
+
+// 委托书-证书类别列表
+const certificationTypes = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  getDictByCode('certificationType').then((response) => {
+    certificationTypes.value = response.data
+  })
+}
+
+getDict()
+// 样品详情
+const sampleDetail = ref({
+  sampleName: '压力表',
+  mesureContent: '压力、ip68',
+  certifications: ['1', '2'],
+  remark: '这是备注',
+  measureProcessList: [],
+  measureSendBackList: [],
+})
+
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    sampleDetail.value.sampleName = res.data.sampleName
+    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.remark = res.data.remark
+    sampleDetail.value.certifications = res.data.certifications
+    sampleDetail.value.measureProcessList = res.data.measureProcessList
+    sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+  })
+}
+// 初始化弹窗
+const initDialog = (orderid: string, sampleid: string) => {
+  dialogVisible.value = true
+  sampleId.value = sampleid
+  orderId.value = orderid
+  getInfo()
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+  emit('close')
+}
+function cancel() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="任务分发" width="1000" @close="cancel">
+    <div class="simple-info">
+      <div class="simple-info-line">
+        <span class="label">样品名称:</span>
+        <el-input v-model="sampleDetail.sampleName" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">证书类别:</span>
+        <el-checkbox-group v-model="sampleDetail.certifications" disabled>
+          <el-checkbox v-for="item in certificationTypes" :key="item.value" :label="item.value">
+            {{ item.name }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="simple-info-line">
+        <span class="label">检定项目:</span>
+        <el-input v-model="sampleDetail.mesureContent" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">备注:</span>
+        <el-input v-model="sampleDetail.remark" disabled />
+      </div>
+    </div>
+    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+      批量添加
+    </el-button>
+    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <template #footer>
+      <el-button type="primary" @click="saveProcess">
+        确定
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//  样式
+.simple-info {
+  margin-top: -10px;
+  margin-bottom: 10px;
+
+  .simple-info-line {
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    .label {
+      width: 90px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/components/lab-interface.ts b/src/views/business/schedule/task/components/lab-interface.ts
index d6355c6..02b0d1d 100644
--- a/src/views/business/schedule/task/components/lab-interface.ts
+++ b/src/views/business/schedule/task/components/lab-interface.ts
@@ -6,7 +6,8 @@
   isLab: '1' // 是否是实验室
   director: string // 负责人
   meterMajor: string // 专业
-  measureItems: string// 检测能力
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
 }
 
 // 部门返回值对象类型
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 4ccab04..1efb8a9 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -1,11 +1,18 @@
 <script setup lang="ts" name="ProcessConfig">
 import { ref } from 'vue'
 import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
 import ProcessNode from './processNode.vue'
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/task'
 const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
   // 是否为详情展示页面
   detail: {
     type: Boolean,
@@ -21,81 +28,35 @@
     type: String,
     required: true,
   },
+  list: {
+    type: Array,
+    default: () => [],
+  },
 })
 const emits = defineEmits(['saveOver'])
 // 默认流程节点
-const defaultProcess = {
-  id: '', // 检测节点id
-  executiveItem: '', // 检测项目
-  executiveDept: '', // 检测部门
-  executiveDeptName: '', // 检测部门
-  executivePerson: '', // 检测人员
-  executivePersonName: '', // 检测人员
-  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-  measureStateName: '', // 检测状态
-  currentCertifications: '', // 当前证书数
-  requireCertifications: '', // 应出具证书数
-  updateTime: '', // 更新时间
-  backPerson: '', // 退回人
-  backReason: '', // 退回原因
-  backTime: '', // 退回时间
-  distributePerson: '', // 分配人
-  distributeTime: '', // 分配时间
-  startTime: '', // 检测开始时间
-  overTime: '', // 检测结束时间
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
 }
 // 检定流程列表
-const processList = ref([
+const processList = ref<IScheduleSet[]>([
   { ...defaultProcess },
 ])
 
-// 获取当前样品检测流程，参数待定
-const fetchProcess = () => {
-  // TODO: 模拟数据
-  processList.value = [
-    {
-      id: '1', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423635973935106', // 检测部门
-      executiveDeptName: '力学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '张三', // 检测人员
-      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待检测', // 检测状态
-      currentCertifications: '0', // 当前证书数
-      requireCertifications: '2', // 应出具证书数
-      updateTime: '2023-02-01 09:00:05', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-    {
-      id: '2', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423577505337346', // 检测部门
-      executiveDeptName: '热学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待分配', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-  ]
-}
-fetchProcess()
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+})
 
 // 点击添加流程
 const processAdd = () => {
@@ -121,25 +82,17 @@
 // 批量添加实验室
 const batchChooseOver = (labs: ILabList[]) => {
   for (const item of labs) {
-    const processTemp = {
-      id: '',
-      executiveItem: '', // 检测项目
-      executiveDept: item.deptId, // 检测部门
-      executiveDeptName: item.organizeName, // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
     }
     processList.value.push(processTemp)
   }
@@ -147,9 +100,24 @@
 
 // 保存流程
 const saveProcess = () => {
-  // TODO: 保存流程
-  console.log(processList.value)
-  emits('saveOver')
+  const form = {
+    measureProcessList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  console.log(form)
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
 }
 // 删除流程
 const deleteProcess = (index: number) => {
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index 6cbdf10..31dfae4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -12,24 +12,16 @@
     type: Object,
     default: () => {
       return {
-        id: '', // 检测节点id
-        executiveItem: '', // 检测项目
-        executiveDept: '', // 检测部门
-        executiveDeptName: '', // 检测部门
-        executivePerson: '', // 检测人员
-        executivePersonName: '', // 检测人员
-        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-        measureStateName: '', // 检测状态
-        currentCertifications: '', // 当前证书数
-        requireCertifications: '', // 应出具证书数
-        updateTime: '', // 更新时间
-        backPerson: '', // 退回人
-        backReason: '', // 退回原因
-        backTime: '', // 退回时间
-        distributePerson: '', // 分配人
-        distributeTime: '', // 分配时间
-        startTime: '', // 检测开始时间
-        overTime: '', // 检测结束时间
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
       }
     },
   },
@@ -56,22 +48,23 @@
 })
 // 检定环节可编辑-只有待分发状态可编辑
 const deptEdit = computed(() => {
-  return processNodeData.value.measureState == '0'
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 检定人可编辑-待分配状态可编辑
 const personEdit = computed(() => {
-  const editStates = ['0', '1']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 证书可编辑-待分发、待分配、待检测状态可编辑
 const certificationEdit = computed(() => {
-  const editStates = ['0', '1', '2']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 节点可移动
 const canMove = computed(() => {
-  const editStates = ['0']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 
 // 选择实验室
@@ -82,8 +75,8 @@
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
   console.log(lab)
-  processNodeData.value.executiveDept = lab.deptId
-  processNodeData.value.executiveDeptName = lab.organizeName
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
 }
 
 // 选择人员
@@ -93,8 +86,8 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
-  processNodeData.value.executivePerson = person.id
-  processNodeData.value.executivePersonName = person.name
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
 }
 
@@ -122,7 +115,7 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit">
           <template v-if="deptEdit" #append>
             <el-button :icon="Aim" size="small" link @click="clickChoose" />
           </template>
@@ -130,7 +123,7 @@
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit">
           <template v-if="personEdit" #append>
             <el-button :icon="Aim" size="small" link @click="choosePerson" />
           </template>
@@ -140,7 +133,7 @@
         <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
       <div class="line">
-        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
       </div>
       <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
@@ -149,7 +142,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 1d02839..493fbba 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,5 +1,3 @@
-import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
-
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -8,12 +6,29 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
   offset: number
 }
 
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
 // 任务列表-返回值
 export interface ITaskList {
   orderId: string // 委托书编号
@@ -25,41 +40,127 @@
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  isUrgent: string // 是否加急
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
   requireOverTime: string // 应检完时间
-  sampleAttr: string // 样品属性
-  sampleAttrName: string // 样品属性
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
   currentMeasureState: string // 当前检定环节
   currentMeasureStateName: string // 当前检定环节
-  currentCertifications: number // 已出具证书总数
+  alreadyCertifications: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
-  distributeStateName: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
 }
 
-// 检测流程节点
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+}
+
+// 全部检测流程节点
 export interface ISchedule {
-  executivePerson: string // 执行人
-  executivePersonName: string // 执行人名称
-  executiveDept: string // 执行部门
-  executiveDeptName: string // 执行部门名称
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
   executiveItem: string // 检定项目
-  currentCertifications?: number // 已出具证书总数
+  alreadyCertifications?: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  measureState: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
   updateTime: string // 流程更新时间
-  backTime: string // 退回时间
-  backReason: string // 退回原因
-  backPerson: string // 退回人
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
   distributePerson: string // 分配人
   distributeTime: string // 分配时间
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
 
 // 样品检测信息
-export interface ISampleMeasure extends ISampleEdit {
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
   orderId: string // 委托单id
+  orderCode: string // 委托单编号
   certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
 }
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 465b2e7..547ee3e 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,28 +1,27 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
-import type { ISampleMeasure } from './task-interface'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
 import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getTaskDetail } from '@/api/business/task'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // 样品详情id
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -39,32 +38,49 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleMeasure> = ref({
-  id: '',
-  orderId: '', // 委托单id
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
   postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
   manufacturer: '', // 生产厂家
   manufacturerCountry: '', // 厂家国别
   manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
   remark: '', // 备注
   minioFileName: '', // 说明书
   labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-  certifications: '',
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
 })
 const ruleFormRef = ref<FormInstance>()
 
@@ -143,14 +159,6 @@
   return menu.find(item => item.name === currentMenu.value)
 })
 
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
 const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
@@ -181,11 +189,9 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(dataForm.value).then((res) => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -195,42 +201,23 @@
     }
   })
 }
-
-// 获取样品详情
+//
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
 const getInfo = () => {
-  // getSapmleDetail({ id: infoId.value }).then((res) => {
-  dataForm.value = {
-    orderId: '123',
-    ABC: 'A',
-    companyAddress: '北京/北京市',
-    customerName: '京东集团',
-    customerNo: 'sygf202211290001',
-    id: '111111',
-    labelBind: '11222',
-    manufacturer: '北京某厂家',
-    manufacturerCountry: 'CN',
-    manufacturingDate: '2023-03',
-    manufacturingNo: '123121',
-    mesureCategory: '',
-    mesureContent: '项目1',
-    mesurePeriod: '1',
-    mesureType: '',
-    minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-    phone: '950618',
-    postalCode: 'test',
-    remark: '无备注',
-    sampleModel: '型号1',
-    sampleName: '样品1',
-    sampleNo: '123456',
-    measureResultCode: 'bhg',
-    deliverer: '张三',
-    delivererTel: '156254577545',
-    certifications: '1',
-  }
-  // for (const item of menu) {
-  //   item.searchFunc()
-  // }
-  // })
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList
+    taskForm.value.measureSendBackList = res.data.measureSendBackList
+  })
 }
 
 // 点击标签绑定的扫描
@@ -260,7 +247,7 @@
     fd.append('multipartFile', event.target.files[0])
     // UploadFile(fd).then((res) => {
     //   if (res.code === 200) {
-    //     dataForm.value.minioFileName = res.data[0]
+    //     sampleForm.value.minioFileName = res.data[0]
     //     // 重置当前验证
     //     ElMessage.success('文件上传成功')
     //   }
@@ -273,18 +260,30 @@
 const upload = () => {
   fileRef.value.click()
 }
-// 获取样品详情
-getInfo()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.role) {
+  roleType.value = $route.params.role as string // 使用角色
+
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+    getSampleInfo()
+  }
+}
 </script>
 
 <template>
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -294,7 +293,7 @@
       <div id="form">
         <el-form
           ref="ruleFormRef"
-          :model="dataForm"
+          :model="sampleForm"
           :label-width="120"
           label-position="right"
           :rules="rules"
@@ -303,9 +302,9 @@
             <el-col :span="6">
               <el-form-item label="样品编号:" prop="sampleNo">
                 <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -313,9 +312,9 @@
             <el-col :span="6">
               <el-form-item label="样品名称:" prop="sampleName">
                 <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -323,9 +322,9 @@
             <el-col :span="6">
               <el-form-item label="样品型号:" prop="sampleModel">
                 <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -333,9 +332,9 @@
             <el-col :span="6">
               <el-form-item label="出厂编号:" prop="manufacturingNo">
                 <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -343,9 +342,9 @@
             <el-col :span="6">
               <el-form-item label="委托方代码" prop="customerNo">
                 <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -353,9 +352,9 @@
             <el-col :span="6">
               <el-form-item label="委托方名称" prop="customerName">
                 <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -363,9 +362,9 @@
             <el-col :span="6">
               <el-form-item label="委托方电话" prop="phone">
                 <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -373,9 +372,9 @@
             <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -383,11 +382,11 @@
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
-                  v-model="dataForm.companyAddress"
+                  v-model="sampleForm.customerAddress"
                   type="textarea"
                   autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -395,9 +394,9 @@
             <el-col :span="6">
               <el-form-item label="校检类别:">
                 <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
@@ -407,19 +406,19 @@
             <el-col :span="6">
               <el-form-item label="生产厂家:">
                 <el-input
-                  v-model="dataForm.manufacturer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="厂家国别:">
                 <el-select
-                  v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
@@ -429,23 +428,23 @@
             <el-col :span="6">
               <el-form-item label="出厂年月:">
                 <el-date-picker
-                  v-model="dataForm.manufacturingDate"
+                  v-model="sampleForm.manufacturingDate"
                   type="month"
                   format="YYYY-MM"
                   value-format="YYYY-MM"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="ABC:">
                 <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
@@ -455,9 +454,9 @@
             <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -465,9 +464,9 @@
             <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
-                  v-model="dataForm.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -475,49 +474,20 @@
             <el-col :span="24">
               <el-form-item label="检定项目:" prop="mesureContent">
                 <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定周期（月）:">
                 <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="上次检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  disabled
-                  class="full-width-input"
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
@@ -526,21 +496,21 @@
             <el-col :span="24">
               <el-form-item label="备注:">
                 <el-input
-                  v-model="dataForm.remark"
+                  v-model="sampleForm.remark"
                   type="textarea"
                   :rows="2"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
-                  v-model="dataForm.mesureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
@@ -550,10 +520,10 @@
             <el-col :span="6">
               <el-form-item label="标签绑定:">
                 <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 >
                   <template #append>
                     <el-button>扫描</el-button>
@@ -565,11 +535,11 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="14">
               <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
             </el-col>
@@ -586,7 +556,7 @@
           保存
         </el-button>
       </template>
-      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
@@ -604,11 +574,11 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="dataForm.id!" :order-id="dataForm.orderId" />
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
       <!-- 检定记录 -->
-      <measure-records v-if="currentMenu === '检定记录'" :sample-id="dataForm.id!" />
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
-      <certification-records v-if="currentMenu === '检定证书'" :sample-id="dataForm.id!" />
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index f784804..461c518 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -31,7 +31,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
@@ -39,30 +39,30 @@
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
-  { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center' },
-  { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
-  { text: '分发性质', value: 'distributeState', align: 'center', width: '90px' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return row.alreadyCertifications ? `${row.alreadyCertifications}/${row.requireCertifications}` : '0/0' } },
+  { text: '分发性质', value: 'handOutProperty', align: 'center', width: '90px' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -80,15 +80,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // // 模拟数据
-  // list.value = [
-  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  // ]
-  // loadingTable.value = false
-  // console.log(listQuery.value)
   getTaskList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -111,15 +107,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
+    sampleBelong: '', // 样品属性
     sampleStatus: '2', // 分发状态
+    startTime: '', //	应检定开始时间
+    endTime: '', //	应检定结束时间
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -271,8 +269,8 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue
index 629b33c..2300f4c 100644
--- a/src/views/customer/advice/adviceEdit.vue
+++ b/src/views/customer/advice/adviceEdit.vue
@@ -51,7 +51,7 @@
 const companyInfo: SimpleCompany = reactive({
   customerName: '', // 公司名称
   customerNo: '', //	客户编号
-  customerId: '', // 客户id
+  id: '', // 客户id
   grade: '', // 履约评级
   gradeName: '', // 履约评级
   companySize: '', // 公司规模
@@ -121,12 +121,13 @@
   const item = select as SimpleCompany
   companyInfo.customerName = item.customerName
   companyInfo.customerNo = item.customerNo
-  companyInfo.customerId = item.customerId
+  companyInfo.id = item.id
   companyInfo.gradeName = item.gradeName
   companyInfo.companySizeName = item.companySizeName
   companyInfo.businessSizeName = item.businessSizeName
   companyInfo.evaluationName = item.evaluationName
   dataForm.value.customerNo = item.customerNo
+  dataForm.value.customerId = item.id
 }
 // 打印表单
 const printObj = ref({
@@ -154,8 +155,6 @@
         if (dataForm.value.id) {
           updateAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -164,8 +163,6 @@
         else {
           addAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
new file mode 100644
index 0000000..d6827e4
--- /dev/null
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts" name="DistributeDialog">
+import processConfig from './processConfig.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { getTaskDetail } from '@/api/business/task'
+// 任务分发弹窗
+
+// 自定义方法：close关闭弹窗
+const emit = defineEmits(['close'])
+const dialogVisible = ref(false) // 弹窗显示
+const sampleId = ref('') // 样品id
+const orderId = ref('') // 委托单id
+
+// 委托书-证书类别列表
+const certificationTypes = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  getDictByCode('certificationType').then((response) => {
+    certificationTypes.value = response.data
+  })
+}
+
+getDict()
+// 样品详情
+const sampleDetail = ref({
+  sampleName: '压力表',
+  mesureContent: '压力、ip68',
+  certifications: ['1', '2'],
+  remark: '这是备注',
+  measureProcessList: [],
+  measureSendBackList: [],
+})
+
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    sampleDetail.value.sampleName = res.data.sampleName
+    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.remark = res.data.remark
+    sampleDetail.value.certifications = res.data.certifications
+    sampleDetail.value.measureProcessList = res.data.measureProcessList
+    sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+  })
+}
+// 初始化弹窗
+const initDialog = (orderid: string, sampleid: string) => {
+  dialogVisible.value = true
+  sampleId.value = sampleid
+  orderId.value = orderid
+  getInfo()
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+  emit('close')
+}
+function cancel() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="任务分发" width="1000" @close="cancel">
+    <div class="simple-info">
+      <div class="simple-info-line">
+        <span class="label">样品名称:</span>
+        <el-input v-model="sampleDetail.sampleName" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">证书类别:</span>
+        <el-checkbox-group v-model="sampleDetail.certifications" disabled>
+          <el-checkbox v-for="item in certificationTypes" :key="item.value" :label="item.value">
+            {{ item.name }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="simple-info-line">
+        <span class="label">检定项目:</span>
+        <el-input v-model="sampleDetail.mesureContent" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">备注:</span>
+        <el-input v-model="sampleDetail.remark" disabled />
+      </div>
+    </div>
+    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+      批量添加
+    </el-button>
+    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <template #footer>
+      <el-button type="primary" @click="saveProcess">
+        确定
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//  样式
+.simple-info {
+  margin-top: -10px;
+  margin-bottom: 10px;
+
+  .simple-info-line {
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    .label {
+      width: 90px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/components/lab-interface.ts b/src/views/business/schedule/task/components/lab-interface.ts
index d6355c6..02b0d1d 100644
--- a/src/views/business/schedule/task/components/lab-interface.ts
+++ b/src/views/business/schedule/task/components/lab-interface.ts
@@ -6,7 +6,8 @@
   isLab: '1' // 是否是实验室
   director: string // 负责人
   meterMajor: string // 专业
-  measureItems: string// 检测能力
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
 }
 
 // 部门返回值对象类型
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 4ccab04..1efb8a9 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -1,11 +1,18 @@
 <script setup lang="ts" name="ProcessConfig">
 import { ref } from 'vue'
 import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
 import ProcessNode from './processNode.vue'
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/task'
 const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
   // 是否为详情展示页面
   detail: {
     type: Boolean,
@@ -21,81 +28,35 @@
     type: String,
     required: true,
   },
+  list: {
+    type: Array,
+    default: () => [],
+  },
 })
 const emits = defineEmits(['saveOver'])
 // 默认流程节点
-const defaultProcess = {
-  id: '', // 检测节点id
-  executiveItem: '', // 检测项目
-  executiveDept: '', // 检测部门
-  executiveDeptName: '', // 检测部门
-  executivePerson: '', // 检测人员
-  executivePersonName: '', // 检测人员
-  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-  measureStateName: '', // 检测状态
-  currentCertifications: '', // 当前证书数
-  requireCertifications: '', // 应出具证书数
-  updateTime: '', // 更新时间
-  backPerson: '', // 退回人
-  backReason: '', // 退回原因
-  backTime: '', // 退回时间
-  distributePerson: '', // 分配人
-  distributeTime: '', // 分配时间
-  startTime: '', // 检测开始时间
-  overTime: '', // 检测结束时间
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
 }
 // 检定流程列表
-const processList = ref([
+const processList = ref<IScheduleSet[]>([
   { ...defaultProcess },
 ])
 
-// 获取当前样品检测流程，参数待定
-const fetchProcess = () => {
-  // TODO: 模拟数据
-  processList.value = [
-    {
-      id: '1', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423635973935106', // 检测部门
-      executiveDeptName: '力学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '张三', // 检测人员
-      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待检测', // 检测状态
-      currentCertifications: '0', // 当前证书数
-      requireCertifications: '2', // 应出具证书数
-      updateTime: '2023-02-01 09:00:05', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-    {
-      id: '2', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423577505337346', // 检测部门
-      executiveDeptName: '热学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待分配', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-  ]
-}
-fetchProcess()
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+})
 
 // 点击添加流程
 const processAdd = () => {
@@ -121,25 +82,17 @@
 // 批量添加实验室
 const batchChooseOver = (labs: ILabList[]) => {
   for (const item of labs) {
-    const processTemp = {
-      id: '',
-      executiveItem: '', // 检测项目
-      executiveDept: item.deptId, // 检测部门
-      executiveDeptName: item.organizeName, // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
     }
     processList.value.push(processTemp)
   }
@@ -147,9 +100,24 @@
 
 // 保存流程
 const saveProcess = () => {
-  // TODO: 保存流程
-  console.log(processList.value)
-  emits('saveOver')
+  const form = {
+    measureProcessList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  console.log(form)
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
 }
 // 删除流程
 const deleteProcess = (index: number) => {
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index 6cbdf10..31dfae4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -12,24 +12,16 @@
     type: Object,
     default: () => {
       return {
-        id: '', // 检测节点id
-        executiveItem: '', // 检测项目
-        executiveDept: '', // 检测部门
-        executiveDeptName: '', // 检测部门
-        executivePerson: '', // 检测人员
-        executivePersonName: '', // 检测人员
-        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-        measureStateName: '', // 检测状态
-        currentCertifications: '', // 当前证书数
-        requireCertifications: '', // 应出具证书数
-        updateTime: '', // 更新时间
-        backPerson: '', // 退回人
-        backReason: '', // 退回原因
-        backTime: '', // 退回时间
-        distributePerson: '', // 分配人
-        distributeTime: '', // 分配时间
-        startTime: '', // 检测开始时间
-        overTime: '', // 检测结束时间
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
       }
     },
   },
@@ -56,22 +48,23 @@
 })
 // 检定环节可编辑-只有待分发状态可编辑
 const deptEdit = computed(() => {
-  return processNodeData.value.measureState == '0'
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 检定人可编辑-待分配状态可编辑
 const personEdit = computed(() => {
-  const editStates = ['0', '1']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 证书可编辑-待分发、待分配、待检测状态可编辑
 const certificationEdit = computed(() => {
-  const editStates = ['0', '1', '2']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 节点可移动
 const canMove = computed(() => {
-  const editStates = ['0']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 
 // 选择实验室
@@ -82,8 +75,8 @@
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
   console.log(lab)
-  processNodeData.value.executiveDept = lab.deptId
-  processNodeData.value.executiveDeptName = lab.organizeName
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
 }
 
 // 选择人员
@@ -93,8 +86,8 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
-  processNodeData.value.executivePerson = person.id
-  processNodeData.value.executivePersonName = person.name
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
 }
 
@@ -122,7 +115,7 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit">
           <template v-if="deptEdit" #append>
             <el-button :icon="Aim" size="small" link @click="clickChoose" />
           </template>
@@ -130,7 +123,7 @@
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit">
           <template v-if="personEdit" #append>
             <el-button :icon="Aim" size="small" link @click="choosePerson" />
           </template>
@@ -140,7 +133,7 @@
         <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
       <div class="line">
-        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
       </div>
       <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
@@ -149,7 +142,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 1d02839..493fbba 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,5 +1,3 @@
-import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
-
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -8,12 +6,29 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
   offset: number
 }
 
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
 // 任务列表-返回值
 export interface ITaskList {
   orderId: string // 委托书编号
@@ -25,41 +40,127 @@
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  isUrgent: string // 是否加急
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
   requireOverTime: string // 应检完时间
-  sampleAttr: string // 样品属性
-  sampleAttrName: string // 样品属性
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
   currentMeasureState: string // 当前检定环节
   currentMeasureStateName: string // 当前检定环节
-  currentCertifications: number // 已出具证书总数
+  alreadyCertifications: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
-  distributeStateName: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
 }
 
-// 检测流程节点
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+}
+
+// 全部检测流程节点
 export interface ISchedule {
-  executivePerson: string // 执行人
-  executivePersonName: string // 执行人名称
-  executiveDept: string // 执行部门
-  executiveDeptName: string // 执行部门名称
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
   executiveItem: string // 检定项目
-  currentCertifications?: number // 已出具证书总数
+  alreadyCertifications?: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  measureState: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
   updateTime: string // 流程更新时间
-  backTime: string // 退回时间
-  backReason: string // 退回原因
-  backPerson: string // 退回人
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
   distributePerson: string // 分配人
   distributeTime: string // 分配时间
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
 
 // 样品检测信息
-export interface ISampleMeasure extends ISampleEdit {
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
   orderId: string // 委托单id
+  orderCode: string // 委托单编号
   certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
 }
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 465b2e7..547ee3e 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,28 +1,27 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
-import type { ISampleMeasure } from './task-interface'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
 import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getTaskDetail } from '@/api/business/task'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // 样品详情id
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -39,32 +38,49 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleMeasure> = ref({
-  id: '',
-  orderId: '', // 委托单id
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
   postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
   manufacturer: '', // 生产厂家
   manufacturerCountry: '', // 厂家国别
   manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
   remark: '', // 备注
   minioFileName: '', // 说明书
   labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-  certifications: '',
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
 })
 const ruleFormRef = ref<FormInstance>()
 
@@ -143,14 +159,6 @@
   return menu.find(item => item.name === currentMenu.value)
 })
 
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
 const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
@@ -181,11 +189,9 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(dataForm.value).then((res) => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -195,42 +201,23 @@
     }
   })
 }
-
-// 获取样品详情
+//
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
 const getInfo = () => {
-  // getSapmleDetail({ id: infoId.value }).then((res) => {
-  dataForm.value = {
-    orderId: '123',
-    ABC: 'A',
-    companyAddress: '北京/北京市',
-    customerName: '京东集团',
-    customerNo: 'sygf202211290001',
-    id: '111111',
-    labelBind: '11222',
-    manufacturer: '北京某厂家',
-    manufacturerCountry: 'CN',
-    manufacturingDate: '2023-03',
-    manufacturingNo: '123121',
-    mesureCategory: '',
-    mesureContent: '项目1',
-    mesurePeriod: '1',
-    mesureType: '',
-    minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-    phone: '950618',
-    postalCode: 'test',
-    remark: '无备注',
-    sampleModel: '型号1',
-    sampleName: '样品1',
-    sampleNo: '123456',
-    measureResultCode: 'bhg',
-    deliverer: '张三',
-    delivererTel: '156254577545',
-    certifications: '1',
-  }
-  // for (const item of menu) {
-  //   item.searchFunc()
-  // }
-  // })
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList
+    taskForm.value.measureSendBackList = res.data.measureSendBackList
+  })
 }
 
 // 点击标签绑定的扫描
@@ -260,7 +247,7 @@
     fd.append('multipartFile', event.target.files[0])
     // UploadFile(fd).then((res) => {
     //   if (res.code === 200) {
-    //     dataForm.value.minioFileName = res.data[0]
+    //     sampleForm.value.minioFileName = res.data[0]
     //     // 重置当前验证
     //     ElMessage.success('文件上传成功')
     //   }
@@ -273,18 +260,30 @@
 const upload = () => {
   fileRef.value.click()
 }
-// 获取样品详情
-getInfo()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.role) {
+  roleType.value = $route.params.role as string // 使用角色
+
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+    getSampleInfo()
+  }
+}
 </script>
 
 <template>
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -294,7 +293,7 @@
       <div id="form">
         <el-form
           ref="ruleFormRef"
-          :model="dataForm"
+          :model="sampleForm"
           :label-width="120"
           label-position="right"
           :rules="rules"
@@ -303,9 +302,9 @@
             <el-col :span="6">
               <el-form-item label="样品编号:" prop="sampleNo">
                 <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -313,9 +312,9 @@
             <el-col :span="6">
               <el-form-item label="样品名称:" prop="sampleName">
                 <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -323,9 +322,9 @@
             <el-col :span="6">
               <el-form-item label="样品型号:" prop="sampleModel">
                 <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -333,9 +332,9 @@
             <el-col :span="6">
               <el-form-item label="出厂编号:" prop="manufacturingNo">
                 <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -343,9 +342,9 @@
             <el-col :span="6">
               <el-form-item label="委托方代码" prop="customerNo">
                 <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -353,9 +352,9 @@
             <el-col :span="6">
               <el-form-item label="委托方名称" prop="customerName">
                 <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -363,9 +362,9 @@
             <el-col :span="6">
               <el-form-item label="委托方电话" prop="phone">
                 <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -373,9 +372,9 @@
             <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -383,11 +382,11 @@
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
-                  v-model="dataForm.companyAddress"
+                  v-model="sampleForm.customerAddress"
                   type="textarea"
                   autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -395,9 +394,9 @@
             <el-col :span="6">
               <el-form-item label="校检类别:">
                 <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
@@ -407,19 +406,19 @@
             <el-col :span="6">
               <el-form-item label="生产厂家:">
                 <el-input
-                  v-model="dataForm.manufacturer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="厂家国别:">
                 <el-select
-                  v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
@@ -429,23 +428,23 @@
             <el-col :span="6">
               <el-form-item label="出厂年月:">
                 <el-date-picker
-                  v-model="dataForm.manufacturingDate"
+                  v-model="sampleForm.manufacturingDate"
                   type="month"
                   format="YYYY-MM"
                   value-format="YYYY-MM"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="ABC:">
                 <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
@@ -455,9 +454,9 @@
             <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -465,9 +464,9 @@
             <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
-                  v-model="dataForm.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -475,49 +474,20 @@
             <el-col :span="24">
               <el-form-item label="检定项目:" prop="mesureContent">
                 <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定周期（月）:">
                 <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="上次检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  disabled
-                  class="full-width-input"
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
@@ -526,21 +496,21 @@
             <el-col :span="24">
               <el-form-item label="备注:">
                 <el-input
-                  v-model="dataForm.remark"
+                  v-model="sampleForm.remark"
                   type="textarea"
                   :rows="2"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
-                  v-model="dataForm.mesureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
@@ -550,10 +520,10 @@
             <el-col :span="6">
               <el-form-item label="标签绑定:">
                 <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 >
                   <template #append>
                     <el-button>扫描</el-button>
@@ -565,11 +535,11 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="14">
               <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
             </el-col>
@@ -586,7 +556,7 @@
           保存
         </el-button>
       </template>
-      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
@@ -604,11 +574,11 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="dataForm.id!" :order-id="dataForm.orderId" />
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
       <!-- 检定记录 -->
-      <measure-records v-if="currentMenu === '检定记录'" :sample-id="dataForm.id!" />
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
-      <certification-records v-if="currentMenu === '检定证书'" :sample-id="dataForm.id!" />
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index f784804..461c518 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -31,7 +31,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
@@ -39,30 +39,30 @@
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
-  { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center' },
-  { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
-  { text: '分发性质', value: 'distributeState', align: 'center', width: '90px' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return row.alreadyCertifications ? `${row.alreadyCertifications}/${row.requireCertifications}` : '0/0' } },
+  { text: '分发性质', value: 'handOutProperty', align: 'center', width: '90px' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -80,15 +80,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // // 模拟数据
-  // list.value = [
-  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  // ]
-  // loadingTable.value = false
-  // console.log(listQuery.value)
   getTaskList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -111,15 +107,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
+    sampleBelong: '', // 样品属性
     sampleStatus: '2', // 分发状态
+    startTime: '', //	应检定开始时间
+    endTime: '', //	应检定结束时间
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -271,8 +269,8 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue
index 629b33c..2300f4c 100644
--- a/src/views/customer/advice/adviceEdit.vue
+++ b/src/views/customer/advice/adviceEdit.vue
@@ -51,7 +51,7 @@
 const companyInfo: SimpleCompany = reactive({
   customerName: '', // 公司名称
   customerNo: '', //	客户编号
-  customerId: '', // 客户id
+  id: '', // 客户id
   grade: '', // 履约评级
   gradeName: '', // 履约评级
   companySize: '', // 公司规模
@@ -121,12 +121,13 @@
   const item = select as SimpleCompany
   companyInfo.customerName = item.customerName
   companyInfo.customerNo = item.customerNo
-  companyInfo.customerId = item.customerId
+  companyInfo.id = item.id
   companyInfo.gradeName = item.gradeName
   companyInfo.companySizeName = item.companySizeName
   companyInfo.businessSizeName = item.businessSizeName
   companyInfo.evaluationName = item.evaluationName
   dataForm.value.customerNo = item.customerNo
+  dataForm.value.customerId = item.id
 }
 // 打印表单
 const printObj = ref({
@@ -154,8 +155,6 @@
         if (dataForm.value.id) {
           updateAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -164,8 +163,6 @@
         else {
           addAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
diff --git a/src/views/customer/advice/advice_interface.ts b/src/views/customer/advice/advice_interface.ts
index b08f85b..a8bf311 100644
--- a/src/views/customer/advice/advice_interface.ts
+++ b/src/views/customer/advice/advice_interface.ts
@@ -40,9 +40,10 @@
 
 // 公司简易
 export interface SimpleCompany {
+  id: string // 客户id
   customerName: string // 公司名称
   customerNo: string //	客户编号
-  customerId: string // 客户id
+  grade: string // 履约评级
   gradeName: string // 履约评级
   companySizeName: string // 公司规模
   businessSizeName: string // 业务规模

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
new file mode 100644
index 0000000..d6827e4
--- /dev/null
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts" name="DistributeDialog">
+import processConfig from './processConfig.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { getTaskDetail } from '@/api/business/task'
+// 任务分发弹窗
+
+// 自定义方法：close关闭弹窗
+const emit = defineEmits(['close'])
+const dialogVisible = ref(false) // 弹窗显示
+const sampleId = ref('') // 样品id
+const orderId = ref('') // 委托单id
+
+// 委托书-证书类别列表
+const certificationTypes = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  getDictByCode('certificationType').then((response) => {
+    certificationTypes.value = response.data
+  })
+}
+
+getDict()
+// 样品详情
+const sampleDetail = ref({
+  sampleName: '压力表',
+  mesureContent: '压力、ip68',
+  certifications: ['1', '2'],
+  remark: '这是备注',
+  measureProcessList: [],
+  measureSendBackList: [],
+})
+
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    sampleDetail.value.sampleName = res.data.sampleName
+    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.remark = res.data.remark
+    sampleDetail.value.certifications = res.data.certifications
+    sampleDetail.value.measureProcessList = res.data.measureProcessList
+    sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+  })
+}
+// 初始化弹窗
+const initDialog = (orderid: string, sampleid: string) => {
+  dialogVisible.value = true
+  sampleId.value = sampleid
+  orderId.value = orderid
+  getInfo()
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+  emit('close')
+}
+function cancel() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="任务分发" width="1000" @close="cancel">
+    <div class="simple-info">
+      <div class="simple-info-line">
+        <span class="label">样品名称:</span>
+        <el-input v-model="sampleDetail.sampleName" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">证书类别:</span>
+        <el-checkbox-group v-model="sampleDetail.certifications" disabled>
+          <el-checkbox v-for="item in certificationTypes" :key="item.value" :label="item.value">
+            {{ item.name }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="simple-info-line">
+        <span class="label">检定项目:</span>
+        <el-input v-model="sampleDetail.mesureContent" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">备注:</span>
+        <el-input v-model="sampleDetail.remark" disabled />
+      </div>
+    </div>
+    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+      批量添加
+    </el-button>
+    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <template #footer>
+      <el-button type="primary" @click="saveProcess">
+        确定
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//  样式
+.simple-info {
+  margin-top: -10px;
+  margin-bottom: 10px;
+
+  .simple-info-line {
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    .label {
+      width: 90px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/components/lab-interface.ts b/src/views/business/schedule/task/components/lab-interface.ts
index d6355c6..02b0d1d 100644
--- a/src/views/business/schedule/task/components/lab-interface.ts
+++ b/src/views/business/schedule/task/components/lab-interface.ts
@@ -6,7 +6,8 @@
   isLab: '1' // 是否是实验室
   director: string // 负责人
   meterMajor: string // 专业
-  measureItems: string// 检测能力
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
 }
 
 // 部门返回值对象类型
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 4ccab04..1efb8a9 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -1,11 +1,18 @@
 <script setup lang="ts" name="ProcessConfig">
 import { ref } from 'vue'
 import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
 import ProcessNode from './processNode.vue'
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/task'
 const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
   // 是否为详情展示页面
   detail: {
     type: Boolean,
@@ -21,81 +28,35 @@
     type: String,
     required: true,
   },
+  list: {
+    type: Array,
+    default: () => [],
+  },
 })
 const emits = defineEmits(['saveOver'])
 // 默认流程节点
-const defaultProcess = {
-  id: '', // 检测节点id
-  executiveItem: '', // 检测项目
-  executiveDept: '', // 检测部门
-  executiveDeptName: '', // 检测部门
-  executivePerson: '', // 检测人员
-  executivePersonName: '', // 检测人员
-  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-  measureStateName: '', // 检测状态
-  currentCertifications: '', // 当前证书数
-  requireCertifications: '', // 应出具证书数
-  updateTime: '', // 更新时间
-  backPerson: '', // 退回人
-  backReason: '', // 退回原因
-  backTime: '', // 退回时间
-  distributePerson: '', // 分配人
-  distributeTime: '', // 分配时间
-  startTime: '', // 检测开始时间
-  overTime: '', // 检测结束时间
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
 }
 // 检定流程列表
-const processList = ref([
+const processList = ref<IScheduleSet[]>([
   { ...defaultProcess },
 ])
 
-// 获取当前样品检测流程，参数待定
-const fetchProcess = () => {
-  // TODO: 模拟数据
-  processList.value = [
-    {
-      id: '1', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423635973935106', // 检测部门
-      executiveDeptName: '力学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '张三', // 检测人员
-      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待检测', // 检测状态
-      currentCertifications: '0', // 当前证书数
-      requireCertifications: '2', // 应出具证书数
-      updateTime: '2023-02-01 09:00:05', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-    {
-      id: '2', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423577505337346', // 检测部门
-      executiveDeptName: '热学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待分配', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-  ]
-}
-fetchProcess()
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+})
 
 // 点击添加流程
 const processAdd = () => {
@@ -121,25 +82,17 @@
 // 批量添加实验室
 const batchChooseOver = (labs: ILabList[]) => {
   for (const item of labs) {
-    const processTemp = {
-      id: '',
-      executiveItem: '', // 检测项目
-      executiveDept: item.deptId, // 检测部门
-      executiveDeptName: item.organizeName, // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
     }
     processList.value.push(processTemp)
   }
@@ -147,9 +100,24 @@
 
 // 保存流程
 const saveProcess = () => {
-  // TODO: 保存流程
-  console.log(processList.value)
-  emits('saveOver')
+  const form = {
+    measureProcessList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  console.log(form)
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
 }
 // 删除流程
 const deleteProcess = (index: number) => {
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index 6cbdf10..31dfae4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -12,24 +12,16 @@
     type: Object,
     default: () => {
       return {
-        id: '', // 检测节点id
-        executiveItem: '', // 检测项目
-        executiveDept: '', // 检测部门
-        executiveDeptName: '', // 检测部门
-        executivePerson: '', // 检测人员
-        executivePersonName: '', // 检测人员
-        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-        measureStateName: '', // 检测状态
-        currentCertifications: '', // 当前证书数
-        requireCertifications: '', // 应出具证书数
-        updateTime: '', // 更新时间
-        backPerson: '', // 退回人
-        backReason: '', // 退回原因
-        backTime: '', // 退回时间
-        distributePerson: '', // 分配人
-        distributeTime: '', // 分配时间
-        startTime: '', // 检测开始时间
-        overTime: '', // 检测结束时间
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
       }
     },
   },
@@ -56,22 +48,23 @@
 })
 // 检定环节可编辑-只有待分发状态可编辑
 const deptEdit = computed(() => {
-  return processNodeData.value.measureState == '0'
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 检定人可编辑-待分配状态可编辑
 const personEdit = computed(() => {
-  const editStates = ['0', '1']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 证书可编辑-待分发、待分配、待检测状态可编辑
 const certificationEdit = computed(() => {
-  const editStates = ['0', '1', '2']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 节点可移动
 const canMove = computed(() => {
-  const editStates = ['0']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 
 // 选择实验室
@@ -82,8 +75,8 @@
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
   console.log(lab)
-  processNodeData.value.executiveDept = lab.deptId
-  processNodeData.value.executiveDeptName = lab.organizeName
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
 }
 
 // 选择人员
@@ -93,8 +86,8 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
-  processNodeData.value.executivePerson = person.id
-  processNodeData.value.executivePersonName = person.name
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
 }
 
@@ -122,7 +115,7 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit">
           <template v-if="deptEdit" #append>
             <el-button :icon="Aim" size="small" link @click="clickChoose" />
           </template>
@@ -130,7 +123,7 @@
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit">
           <template v-if="personEdit" #append>
             <el-button :icon="Aim" size="small" link @click="choosePerson" />
           </template>
@@ -140,7 +133,7 @@
         <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
       <div class="line">
-        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
       </div>
       <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
@@ -149,7 +142,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 1d02839..493fbba 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,5 +1,3 @@
-import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
-
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -8,12 +6,29 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
   offset: number
 }
 
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
 // 任务列表-返回值
 export interface ITaskList {
   orderId: string // 委托书编号
@@ -25,41 +40,127 @@
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  isUrgent: string // 是否加急
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
   requireOverTime: string // 应检完时间
-  sampleAttr: string // 样品属性
-  sampleAttrName: string // 样品属性
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
   currentMeasureState: string // 当前检定环节
   currentMeasureStateName: string // 当前检定环节
-  currentCertifications: number // 已出具证书总数
+  alreadyCertifications: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
-  distributeStateName: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
 }
 
-// 检测流程节点
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+}
+
+// 全部检测流程节点
 export interface ISchedule {
-  executivePerson: string // 执行人
-  executivePersonName: string // 执行人名称
-  executiveDept: string // 执行部门
-  executiveDeptName: string // 执行部门名称
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
   executiveItem: string // 检定项目
-  currentCertifications?: number // 已出具证书总数
+  alreadyCertifications?: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  measureState: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
   updateTime: string // 流程更新时间
-  backTime: string // 退回时间
-  backReason: string // 退回原因
-  backPerson: string // 退回人
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
   distributePerson: string // 分配人
   distributeTime: string // 分配时间
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
 
 // 样品检测信息
-export interface ISampleMeasure extends ISampleEdit {
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
   orderId: string // 委托单id
+  orderCode: string // 委托单编号
   certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
 }
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 465b2e7..547ee3e 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,28 +1,27 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
-import type { ISampleMeasure } from './task-interface'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
 import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getTaskDetail } from '@/api/business/task'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // 样品详情id
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -39,32 +38,49 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleMeasure> = ref({
-  id: '',
-  orderId: '', // 委托单id
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
   postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
   manufacturer: '', // 生产厂家
   manufacturerCountry: '', // 厂家国别
   manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
   remark: '', // 备注
   minioFileName: '', // 说明书
   labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-  certifications: '',
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
 })
 const ruleFormRef = ref<FormInstance>()
 
@@ -143,14 +159,6 @@
   return menu.find(item => item.name === currentMenu.value)
 })
 
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
 const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
@@ -181,11 +189,9 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(dataForm.value).then((res) => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -195,42 +201,23 @@
     }
   })
 }
-
-// 获取样品详情
+//
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
 const getInfo = () => {
-  // getSapmleDetail({ id: infoId.value }).then((res) => {
-  dataForm.value = {
-    orderId: '123',
-    ABC: 'A',
-    companyAddress: '北京/北京市',
-    customerName: '京东集团',
-    customerNo: 'sygf202211290001',
-    id: '111111',
-    labelBind: '11222',
-    manufacturer: '北京某厂家',
-    manufacturerCountry: 'CN',
-    manufacturingDate: '2023-03',
-    manufacturingNo: '123121',
-    mesureCategory: '',
-    mesureContent: '项目1',
-    mesurePeriod: '1',
-    mesureType: '',
-    minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-    phone: '950618',
-    postalCode: 'test',
-    remark: '无备注',
-    sampleModel: '型号1',
-    sampleName: '样品1',
-    sampleNo: '123456',
-    measureResultCode: 'bhg',
-    deliverer: '张三',
-    delivererTel: '156254577545',
-    certifications: '1',
-  }
-  // for (const item of menu) {
-  //   item.searchFunc()
-  // }
-  // })
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList
+    taskForm.value.measureSendBackList = res.data.measureSendBackList
+  })
 }
 
 // 点击标签绑定的扫描
@@ -260,7 +247,7 @@
     fd.append('multipartFile', event.target.files[0])
     // UploadFile(fd).then((res) => {
     //   if (res.code === 200) {
-    //     dataForm.value.minioFileName = res.data[0]
+    //     sampleForm.value.minioFileName = res.data[0]
     //     // 重置当前验证
     //     ElMessage.success('文件上传成功')
     //   }
@@ -273,18 +260,30 @@
 const upload = () => {
   fileRef.value.click()
 }
-// 获取样品详情
-getInfo()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.role) {
+  roleType.value = $route.params.role as string // 使用角色
+
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+    getSampleInfo()
+  }
+}
 </script>
 
 <template>
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -294,7 +293,7 @@
       <div id="form">
         <el-form
           ref="ruleFormRef"
-          :model="dataForm"
+          :model="sampleForm"
           :label-width="120"
           label-position="right"
           :rules="rules"
@@ -303,9 +302,9 @@
             <el-col :span="6">
               <el-form-item label="样品编号:" prop="sampleNo">
                 <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -313,9 +312,9 @@
             <el-col :span="6">
               <el-form-item label="样品名称:" prop="sampleName">
                 <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -323,9 +322,9 @@
             <el-col :span="6">
               <el-form-item label="样品型号:" prop="sampleModel">
                 <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -333,9 +332,9 @@
             <el-col :span="6">
               <el-form-item label="出厂编号:" prop="manufacturingNo">
                 <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -343,9 +342,9 @@
             <el-col :span="6">
               <el-form-item label="委托方代码" prop="customerNo">
                 <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -353,9 +352,9 @@
             <el-col :span="6">
               <el-form-item label="委托方名称" prop="customerName">
                 <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -363,9 +362,9 @@
             <el-col :span="6">
               <el-form-item label="委托方电话" prop="phone">
                 <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -373,9 +372,9 @@
             <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -383,11 +382,11 @@
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
-                  v-model="dataForm.companyAddress"
+                  v-model="sampleForm.customerAddress"
                   type="textarea"
                   autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -395,9 +394,9 @@
             <el-col :span="6">
               <el-form-item label="校检类别:">
                 <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
@@ -407,19 +406,19 @@
             <el-col :span="6">
               <el-form-item label="生产厂家:">
                 <el-input
-                  v-model="dataForm.manufacturer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="厂家国别:">
                 <el-select
-                  v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
@@ -429,23 +428,23 @@
             <el-col :span="6">
               <el-form-item label="出厂年月:">
                 <el-date-picker
-                  v-model="dataForm.manufacturingDate"
+                  v-model="sampleForm.manufacturingDate"
                   type="month"
                   format="YYYY-MM"
                   value-format="YYYY-MM"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="ABC:">
                 <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
@@ -455,9 +454,9 @@
             <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -465,9 +464,9 @@
             <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
-                  v-model="dataForm.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -475,49 +474,20 @@
             <el-col :span="24">
               <el-form-item label="检定项目:" prop="mesureContent">
                 <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定周期（月）:">
                 <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="上次检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  disabled
-                  class="full-width-input"
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
@@ -526,21 +496,21 @@
             <el-col :span="24">
               <el-form-item label="备注:">
                 <el-input
-                  v-model="dataForm.remark"
+                  v-model="sampleForm.remark"
                   type="textarea"
                   :rows="2"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
-                  v-model="dataForm.mesureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
@@ -550,10 +520,10 @@
             <el-col :span="6">
               <el-form-item label="标签绑定:">
                 <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 >
                   <template #append>
                     <el-button>扫描</el-button>
@@ -565,11 +535,11 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="14">
               <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
             </el-col>
@@ -586,7 +556,7 @@
           保存
         </el-button>
       </template>
-      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
@@ -604,11 +574,11 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="dataForm.id!" :order-id="dataForm.orderId" />
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
       <!-- 检定记录 -->
-      <measure-records v-if="currentMenu === '检定记录'" :sample-id="dataForm.id!" />
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
-      <certification-records v-if="currentMenu === '检定证书'" :sample-id="dataForm.id!" />
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index f784804..461c518 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -31,7 +31,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
@@ -39,30 +39,30 @@
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
-  { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center' },
-  { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
-  { text: '分发性质', value: 'distributeState', align: 'center', width: '90px' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return row.alreadyCertifications ? `${row.alreadyCertifications}/${row.requireCertifications}` : '0/0' } },
+  { text: '分发性质', value: 'handOutProperty', align: 'center', width: '90px' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -80,15 +80,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // // 模拟数据
-  // list.value = [
-  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  // ]
-  // loadingTable.value = false
-  // console.log(listQuery.value)
   getTaskList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -111,15 +107,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
+    sampleBelong: '', // 样品属性
     sampleStatus: '2', // 分发状态
+    startTime: '', //	应检定开始时间
+    endTime: '', //	应检定结束时间
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -271,8 +269,8 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue
index 629b33c..2300f4c 100644
--- a/src/views/customer/advice/adviceEdit.vue
+++ b/src/views/customer/advice/adviceEdit.vue
@@ -51,7 +51,7 @@
 const companyInfo: SimpleCompany = reactive({
   customerName: '', // 公司名称
   customerNo: '', //	客户编号
-  customerId: '', // 客户id
+  id: '', // 客户id
   grade: '', // 履约评级
   gradeName: '', // 履约评级
   companySize: '', // 公司规模
@@ -121,12 +121,13 @@
   const item = select as SimpleCompany
   companyInfo.customerName = item.customerName
   companyInfo.customerNo = item.customerNo
-  companyInfo.customerId = item.customerId
+  companyInfo.id = item.id
   companyInfo.gradeName = item.gradeName
   companyInfo.companySizeName = item.companySizeName
   companyInfo.businessSizeName = item.businessSizeName
   companyInfo.evaluationName = item.evaluationName
   dataForm.value.customerNo = item.customerNo
+  dataForm.value.customerId = item.id
 }
 // 打印表单
 const printObj = ref({
@@ -154,8 +155,6 @@
         if (dataForm.value.id) {
           updateAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -164,8 +163,6 @@
         else {
           addAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
diff --git a/src/views/customer/advice/advice_interface.ts b/src/views/customer/advice/advice_interface.ts
index b08f85b..a8bf311 100644
--- a/src/views/customer/advice/advice_interface.ts
+++ b/src/views/customer/advice/advice_interface.ts
@@ -40,9 +40,10 @@
 
 // 公司简易
 export interface SimpleCompany {
+  id: string // 客户id
   customerName: string // 公司名称
   customerNo: string //	客户编号
-  customerId: string // 客户id
+  grade: string // 履约评级
   gradeName: string // 履约评级
   companySizeName: string // 公司规模
   businessSizeName: string // 业务规模
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index f9ee314..4893c4f 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -26,6 +26,7 @@
 const visible = ref(false) // 控制对话框显隐
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -54,17 +55,7 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
-})
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
+})// 表单
 const ruleFormRef = ref<FormInstance>()
 
 // 自定义校验规则--检定周期为正整数
@@ -111,6 +102,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -479,7 +474,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
new file mode 100644
index 0000000..d6827e4
--- /dev/null
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts" name="DistributeDialog">
+import processConfig from './processConfig.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { getTaskDetail } from '@/api/business/task'
+// 任务分发弹窗
+
+// 自定义方法：close关闭弹窗
+const emit = defineEmits(['close'])
+const dialogVisible = ref(false) // 弹窗显示
+const sampleId = ref('') // 样品id
+const orderId = ref('') // 委托单id
+
+// 委托书-证书类别列表
+const certificationTypes = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  getDictByCode('certificationType').then((response) => {
+    certificationTypes.value = response.data
+  })
+}
+
+getDict()
+// 样品详情
+const sampleDetail = ref({
+  sampleName: '压力表',
+  mesureContent: '压力、ip68',
+  certifications: ['1', '2'],
+  remark: '这是备注',
+  measureProcessList: [],
+  measureSendBackList: [],
+})
+
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    sampleDetail.value.sampleName = res.data.sampleName
+    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.remark = res.data.remark
+    sampleDetail.value.certifications = res.data.certifications
+    sampleDetail.value.measureProcessList = res.data.measureProcessList
+    sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+  })
+}
+// 初始化弹窗
+const initDialog = (orderid: string, sampleid: string) => {
+  dialogVisible.value = true
+  sampleId.value = sampleid
+  orderId.value = orderid
+  getInfo()
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+  emit('close')
+}
+function cancel() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="任务分发" width="1000" @close="cancel">
+    <div class="simple-info">
+      <div class="simple-info-line">
+        <span class="label">样品名称:</span>
+        <el-input v-model="sampleDetail.sampleName" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">证书类别:</span>
+        <el-checkbox-group v-model="sampleDetail.certifications" disabled>
+          <el-checkbox v-for="item in certificationTypes" :key="item.value" :label="item.value">
+            {{ item.name }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="simple-info-line">
+        <span class="label">检定项目:</span>
+        <el-input v-model="sampleDetail.mesureContent" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">备注:</span>
+        <el-input v-model="sampleDetail.remark" disabled />
+      </div>
+    </div>
+    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+      批量添加
+    </el-button>
+    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <template #footer>
+      <el-button type="primary" @click="saveProcess">
+        确定
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//  样式
+.simple-info {
+  margin-top: -10px;
+  margin-bottom: 10px;
+
+  .simple-info-line {
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    .label {
+      width: 90px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/components/lab-interface.ts b/src/views/business/schedule/task/components/lab-interface.ts
index d6355c6..02b0d1d 100644
--- a/src/views/business/schedule/task/components/lab-interface.ts
+++ b/src/views/business/schedule/task/components/lab-interface.ts
@@ -6,7 +6,8 @@
   isLab: '1' // 是否是实验室
   director: string // 负责人
   meterMajor: string // 专业
-  measureItems: string// 检测能力
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
 }
 
 // 部门返回值对象类型
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 4ccab04..1efb8a9 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -1,11 +1,18 @@
 <script setup lang="ts" name="ProcessConfig">
 import { ref } from 'vue'
 import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
 import ProcessNode from './processNode.vue'
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/task'
 const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
   // 是否为详情展示页面
   detail: {
     type: Boolean,
@@ -21,81 +28,35 @@
     type: String,
     required: true,
   },
+  list: {
+    type: Array,
+    default: () => [],
+  },
 })
 const emits = defineEmits(['saveOver'])
 // 默认流程节点
-const defaultProcess = {
-  id: '', // 检测节点id
-  executiveItem: '', // 检测项目
-  executiveDept: '', // 检测部门
-  executiveDeptName: '', // 检测部门
-  executivePerson: '', // 检测人员
-  executivePersonName: '', // 检测人员
-  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-  measureStateName: '', // 检测状态
-  currentCertifications: '', // 当前证书数
-  requireCertifications: '', // 应出具证书数
-  updateTime: '', // 更新时间
-  backPerson: '', // 退回人
-  backReason: '', // 退回原因
-  backTime: '', // 退回时间
-  distributePerson: '', // 分配人
-  distributeTime: '', // 分配时间
-  startTime: '', // 检测开始时间
-  overTime: '', // 检测结束时间
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
 }
 // 检定流程列表
-const processList = ref([
+const processList = ref<IScheduleSet[]>([
   { ...defaultProcess },
 ])
 
-// 获取当前样品检测流程，参数待定
-const fetchProcess = () => {
-  // TODO: 模拟数据
-  processList.value = [
-    {
-      id: '1', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423635973935106', // 检测部门
-      executiveDeptName: '力学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '张三', // 检测人员
-      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待检测', // 检测状态
-      currentCertifications: '0', // 当前证书数
-      requireCertifications: '2', // 应出具证书数
-      updateTime: '2023-02-01 09:00:05', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-    {
-      id: '2', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423577505337346', // 检测部门
-      executiveDeptName: '热学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待分配', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-  ]
-}
-fetchProcess()
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+})
 
 // 点击添加流程
 const processAdd = () => {
@@ -121,25 +82,17 @@
 // 批量添加实验室
 const batchChooseOver = (labs: ILabList[]) => {
   for (const item of labs) {
-    const processTemp = {
-      id: '',
-      executiveItem: '', // 检测项目
-      executiveDept: item.deptId, // 检测部门
-      executiveDeptName: item.organizeName, // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
     }
     processList.value.push(processTemp)
   }
@@ -147,9 +100,24 @@
 
 // 保存流程
 const saveProcess = () => {
-  // TODO: 保存流程
-  console.log(processList.value)
-  emits('saveOver')
+  const form = {
+    measureProcessList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  console.log(form)
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
 }
 // 删除流程
 const deleteProcess = (index: number) => {
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index 6cbdf10..31dfae4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -12,24 +12,16 @@
     type: Object,
     default: () => {
       return {
-        id: '', // 检测节点id
-        executiveItem: '', // 检测项目
-        executiveDept: '', // 检测部门
-        executiveDeptName: '', // 检测部门
-        executivePerson: '', // 检测人员
-        executivePersonName: '', // 检测人员
-        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-        measureStateName: '', // 检测状态
-        currentCertifications: '', // 当前证书数
-        requireCertifications: '', // 应出具证书数
-        updateTime: '', // 更新时间
-        backPerson: '', // 退回人
-        backReason: '', // 退回原因
-        backTime: '', // 退回时间
-        distributePerson: '', // 分配人
-        distributeTime: '', // 分配时间
-        startTime: '', // 检测开始时间
-        overTime: '', // 检测结束时间
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
       }
     },
   },
@@ -56,22 +48,23 @@
 })
 // 检定环节可编辑-只有待分发状态可编辑
 const deptEdit = computed(() => {
-  return processNodeData.value.measureState == '0'
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 检定人可编辑-待分配状态可编辑
 const personEdit = computed(() => {
-  const editStates = ['0', '1']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 证书可编辑-待分发、待分配、待检测状态可编辑
 const certificationEdit = computed(() => {
-  const editStates = ['0', '1', '2']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 节点可移动
 const canMove = computed(() => {
-  const editStates = ['0']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 
 // 选择实验室
@@ -82,8 +75,8 @@
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
   console.log(lab)
-  processNodeData.value.executiveDept = lab.deptId
-  processNodeData.value.executiveDeptName = lab.organizeName
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
 }
 
 // 选择人员
@@ -93,8 +86,8 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
-  processNodeData.value.executivePerson = person.id
-  processNodeData.value.executivePersonName = person.name
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
 }
 
@@ -122,7 +115,7 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit">
           <template v-if="deptEdit" #append>
             <el-button :icon="Aim" size="small" link @click="clickChoose" />
           </template>
@@ -130,7 +123,7 @@
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit">
           <template v-if="personEdit" #append>
             <el-button :icon="Aim" size="small" link @click="choosePerson" />
           </template>
@@ -140,7 +133,7 @@
         <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
       <div class="line">
-        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
       </div>
       <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
@@ -149,7 +142,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 1d02839..493fbba 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,5 +1,3 @@
-import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
-
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -8,12 +6,29 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
   offset: number
 }
 
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
 // 任务列表-返回值
 export interface ITaskList {
   orderId: string // 委托书编号
@@ -25,41 +40,127 @@
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  isUrgent: string // 是否加急
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
   requireOverTime: string // 应检完时间
-  sampleAttr: string // 样品属性
-  sampleAttrName: string // 样品属性
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
   currentMeasureState: string // 当前检定环节
   currentMeasureStateName: string // 当前检定环节
-  currentCertifications: number // 已出具证书总数
+  alreadyCertifications: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
-  distributeStateName: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
 }
 
-// 检测流程节点
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+}
+
+// 全部检测流程节点
 export interface ISchedule {
-  executivePerson: string // 执行人
-  executivePersonName: string // 执行人名称
-  executiveDept: string // 执行部门
-  executiveDeptName: string // 执行部门名称
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
   executiveItem: string // 检定项目
-  currentCertifications?: number // 已出具证书总数
+  alreadyCertifications?: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  measureState: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
   updateTime: string // 流程更新时间
-  backTime: string // 退回时间
-  backReason: string // 退回原因
-  backPerson: string // 退回人
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
   distributePerson: string // 分配人
   distributeTime: string // 分配时间
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
 
 // 样品检测信息
-export interface ISampleMeasure extends ISampleEdit {
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
   orderId: string // 委托单id
+  orderCode: string // 委托单编号
   certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
 }
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 465b2e7..547ee3e 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,28 +1,27 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
-import type { ISampleMeasure } from './task-interface'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
 import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getTaskDetail } from '@/api/business/task'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // 样品详情id
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -39,32 +38,49 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleMeasure> = ref({
-  id: '',
-  orderId: '', // 委托单id
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
   postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
   manufacturer: '', // 生产厂家
   manufacturerCountry: '', // 厂家国别
   manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
   remark: '', // 备注
   minioFileName: '', // 说明书
   labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-  certifications: '',
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
 })
 const ruleFormRef = ref<FormInstance>()
 
@@ -143,14 +159,6 @@
   return menu.find(item => item.name === currentMenu.value)
 })
 
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
 const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
@@ -181,11 +189,9 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(dataForm.value).then((res) => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -195,42 +201,23 @@
     }
   })
 }
-
-// 获取样品详情
+//
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
 const getInfo = () => {
-  // getSapmleDetail({ id: infoId.value }).then((res) => {
-  dataForm.value = {
-    orderId: '123',
-    ABC: 'A',
-    companyAddress: '北京/北京市',
-    customerName: '京东集团',
-    customerNo: 'sygf202211290001',
-    id: '111111',
-    labelBind: '11222',
-    manufacturer: '北京某厂家',
-    manufacturerCountry: 'CN',
-    manufacturingDate: '2023-03',
-    manufacturingNo: '123121',
-    mesureCategory: '',
-    mesureContent: '项目1',
-    mesurePeriod: '1',
-    mesureType: '',
-    minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-    phone: '950618',
-    postalCode: 'test',
-    remark: '无备注',
-    sampleModel: '型号1',
-    sampleName: '样品1',
-    sampleNo: '123456',
-    measureResultCode: 'bhg',
-    deliverer: '张三',
-    delivererTel: '156254577545',
-    certifications: '1',
-  }
-  // for (const item of menu) {
-  //   item.searchFunc()
-  // }
-  // })
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList
+    taskForm.value.measureSendBackList = res.data.measureSendBackList
+  })
 }
 
 // 点击标签绑定的扫描
@@ -260,7 +247,7 @@
     fd.append('multipartFile', event.target.files[0])
     // UploadFile(fd).then((res) => {
     //   if (res.code === 200) {
-    //     dataForm.value.minioFileName = res.data[0]
+    //     sampleForm.value.minioFileName = res.data[0]
     //     // 重置当前验证
     //     ElMessage.success('文件上传成功')
     //   }
@@ -273,18 +260,30 @@
 const upload = () => {
   fileRef.value.click()
 }
-// 获取样品详情
-getInfo()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.role) {
+  roleType.value = $route.params.role as string // 使用角色
+
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+    getSampleInfo()
+  }
+}
 </script>
 
 <template>
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -294,7 +293,7 @@
       <div id="form">
         <el-form
           ref="ruleFormRef"
-          :model="dataForm"
+          :model="sampleForm"
           :label-width="120"
           label-position="right"
           :rules="rules"
@@ -303,9 +302,9 @@
             <el-col :span="6">
               <el-form-item label="样品编号:" prop="sampleNo">
                 <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -313,9 +312,9 @@
             <el-col :span="6">
               <el-form-item label="样品名称:" prop="sampleName">
                 <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -323,9 +322,9 @@
             <el-col :span="6">
               <el-form-item label="样品型号:" prop="sampleModel">
                 <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -333,9 +332,9 @@
             <el-col :span="6">
               <el-form-item label="出厂编号:" prop="manufacturingNo">
                 <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -343,9 +342,9 @@
             <el-col :span="6">
               <el-form-item label="委托方代码" prop="customerNo">
                 <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -353,9 +352,9 @@
             <el-col :span="6">
               <el-form-item label="委托方名称" prop="customerName">
                 <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -363,9 +362,9 @@
             <el-col :span="6">
               <el-form-item label="委托方电话" prop="phone">
                 <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -373,9 +372,9 @@
             <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -383,11 +382,11 @@
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
-                  v-model="dataForm.companyAddress"
+                  v-model="sampleForm.customerAddress"
                   type="textarea"
                   autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -395,9 +394,9 @@
             <el-col :span="6">
               <el-form-item label="校检类别:">
                 <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
@@ -407,19 +406,19 @@
             <el-col :span="6">
               <el-form-item label="生产厂家:">
                 <el-input
-                  v-model="dataForm.manufacturer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="厂家国别:">
                 <el-select
-                  v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
@@ -429,23 +428,23 @@
             <el-col :span="6">
               <el-form-item label="出厂年月:">
                 <el-date-picker
-                  v-model="dataForm.manufacturingDate"
+                  v-model="sampleForm.manufacturingDate"
                   type="month"
                   format="YYYY-MM"
                   value-format="YYYY-MM"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="ABC:">
                 <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
@@ -455,9 +454,9 @@
             <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -465,9 +464,9 @@
             <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
-                  v-model="dataForm.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -475,49 +474,20 @@
             <el-col :span="24">
               <el-form-item label="检定项目:" prop="mesureContent">
                 <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定周期（月）:">
                 <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="上次检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  disabled
-                  class="full-width-input"
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
@@ -526,21 +496,21 @@
             <el-col :span="24">
               <el-form-item label="备注:">
                 <el-input
-                  v-model="dataForm.remark"
+                  v-model="sampleForm.remark"
                   type="textarea"
                   :rows="2"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
-                  v-model="dataForm.mesureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
@@ -550,10 +520,10 @@
             <el-col :span="6">
               <el-form-item label="标签绑定:">
                 <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 >
                   <template #append>
                     <el-button>扫描</el-button>
@@ -565,11 +535,11 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="14">
               <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
             </el-col>
@@ -586,7 +556,7 @@
           保存
         </el-button>
       </template>
-      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
@@ -604,11 +574,11 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="dataForm.id!" :order-id="dataForm.orderId" />
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
       <!-- 检定记录 -->
-      <measure-records v-if="currentMenu === '检定记录'" :sample-id="dataForm.id!" />
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
-      <certification-records v-if="currentMenu === '检定证书'" :sample-id="dataForm.id!" />
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index f784804..461c518 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -31,7 +31,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
@@ -39,30 +39,30 @@
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
-  { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center' },
-  { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
-  { text: '分发性质', value: 'distributeState', align: 'center', width: '90px' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return row.alreadyCertifications ? `${row.alreadyCertifications}/${row.requireCertifications}` : '0/0' } },
+  { text: '分发性质', value: 'handOutProperty', align: 'center', width: '90px' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -80,15 +80,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // // 模拟数据
-  // list.value = [
-  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  // ]
-  // loadingTable.value = false
-  // console.log(listQuery.value)
   getTaskList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -111,15 +107,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
+    sampleBelong: '', // 样品属性
     sampleStatus: '2', // 分发状态
+    startTime: '', //	应检定开始时间
+    endTime: '', //	应检定结束时间
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -271,8 +269,8 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue
index 629b33c..2300f4c 100644
--- a/src/views/customer/advice/adviceEdit.vue
+++ b/src/views/customer/advice/adviceEdit.vue
@@ -51,7 +51,7 @@
 const companyInfo: SimpleCompany = reactive({
   customerName: '', // 公司名称
   customerNo: '', //	客户编号
-  customerId: '', // 客户id
+  id: '', // 客户id
   grade: '', // 履约评级
   gradeName: '', // 履约评级
   companySize: '', // 公司规模
@@ -121,12 +121,13 @@
   const item = select as SimpleCompany
   companyInfo.customerName = item.customerName
   companyInfo.customerNo = item.customerNo
-  companyInfo.customerId = item.customerId
+  companyInfo.id = item.id
   companyInfo.gradeName = item.gradeName
   companyInfo.companySizeName = item.companySizeName
   companyInfo.businessSizeName = item.businessSizeName
   companyInfo.evaluationName = item.evaluationName
   dataForm.value.customerNo = item.customerNo
+  dataForm.value.customerId = item.id
 }
 // 打印表单
 const printObj = ref({
@@ -154,8 +155,6 @@
         if (dataForm.value.id) {
           updateAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -164,8 +163,6 @@
         else {
           addAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
diff --git a/src/views/customer/advice/advice_interface.ts b/src/views/customer/advice/advice_interface.ts
index b08f85b..a8bf311 100644
--- a/src/views/customer/advice/advice_interface.ts
+++ b/src/views/customer/advice/advice_interface.ts
@@ -40,9 +40,10 @@
 
 // 公司简易
 export interface SimpleCompany {
+  id: string // 客户id
   customerName: string // 公司名称
   customerNo: string //	客户编号
-  customerId: string // 客户id
+  grade: string // 履约评级
   gradeName: string // 履约评级
   companySizeName: string // 公司规模
   businessSizeName: string // 业务规模
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index f9ee314..4893c4f 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -26,6 +26,7 @@
 const visible = ref(false) // 控制对话框显隐
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -54,17 +55,7 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
-})
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
+})// 表单
 const ruleFormRef = ref<FormInstance>()
 
 // 自定义校验规则--检定周期为正整数
@@ -111,6 +102,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -479,7 +474,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index aceea6a..abcada5 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -36,7 +36,14 @@
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
-  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: ISampleList) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ISampleList[]>([])

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
new file mode 100644
index 0000000..d6827e4
--- /dev/null
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts" name="DistributeDialog">
+import processConfig from './processConfig.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { getTaskDetail } from '@/api/business/task'
+// 任务分发弹窗
+
+// 自定义方法：close关闭弹窗
+const emit = defineEmits(['close'])
+const dialogVisible = ref(false) // 弹窗显示
+const sampleId = ref('') // 样品id
+const orderId = ref('') // 委托单id
+
+// 委托书-证书类别列表
+const certificationTypes = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  getDictByCode('certificationType').then((response) => {
+    certificationTypes.value = response.data
+  })
+}
+
+getDict()
+// 样品详情
+const sampleDetail = ref({
+  sampleName: '压力表',
+  mesureContent: '压力、ip68',
+  certifications: ['1', '2'],
+  remark: '这是备注',
+  measureProcessList: [],
+  measureSendBackList: [],
+})
+
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    sampleDetail.value.sampleName = res.data.sampleName
+    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.remark = res.data.remark
+    sampleDetail.value.certifications = res.data.certifications
+    sampleDetail.value.measureProcessList = res.data.measureProcessList
+    sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+  })
+}
+// 初始化弹窗
+const initDialog = (orderid: string, sampleid: string) => {
+  dialogVisible.value = true
+  sampleId.value = sampleid
+  orderId.value = orderid
+  getInfo()
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+  emit('close')
+}
+function cancel() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="任务分发" width="1000" @close="cancel">
+    <div class="simple-info">
+      <div class="simple-info-line">
+        <span class="label">样品名称:</span>
+        <el-input v-model="sampleDetail.sampleName" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">证书类别:</span>
+        <el-checkbox-group v-model="sampleDetail.certifications" disabled>
+          <el-checkbox v-for="item in certificationTypes" :key="item.value" :label="item.value">
+            {{ item.name }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="simple-info-line">
+        <span class="label">检定项目:</span>
+        <el-input v-model="sampleDetail.mesureContent" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">备注:</span>
+        <el-input v-model="sampleDetail.remark" disabled />
+      </div>
+    </div>
+    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+      批量添加
+    </el-button>
+    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <template #footer>
+      <el-button type="primary" @click="saveProcess">
+        确定
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//  样式
+.simple-info {
+  margin-top: -10px;
+  margin-bottom: 10px;
+
+  .simple-info-line {
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    .label {
+      width: 90px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/components/lab-interface.ts b/src/views/business/schedule/task/components/lab-interface.ts
index d6355c6..02b0d1d 100644
--- a/src/views/business/schedule/task/components/lab-interface.ts
+++ b/src/views/business/schedule/task/components/lab-interface.ts
@@ -6,7 +6,8 @@
   isLab: '1' // 是否是实验室
   director: string // 负责人
   meterMajor: string // 专业
-  measureItems: string// 检测能力
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
 }
 
 // 部门返回值对象类型
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 4ccab04..1efb8a9 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -1,11 +1,18 @@
 <script setup lang="ts" name="ProcessConfig">
 import { ref } from 'vue'
 import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
 import ProcessNode from './processNode.vue'
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/task'
 const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
   // 是否为详情展示页面
   detail: {
     type: Boolean,
@@ -21,81 +28,35 @@
     type: String,
     required: true,
   },
+  list: {
+    type: Array,
+    default: () => [],
+  },
 })
 const emits = defineEmits(['saveOver'])
 // 默认流程节点
-const defaultProcess = {
-  id: '', // 检测节点id
-  executiveItem: '', // 检测项目
-  executiveDept: '', // 检测部门
-  executiveDeptName: '', // 检测部门
-  executivePerson: '', // 检测人员
-  executivePersonName: '', // 检测人员
-  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-  measureStateName: '', // 检测状态
-  currentCertifications: '', // 当前证书数
-  requireCertifications: '', // 应出具证书数
-  updateTime: '', // 更新时间
-  backPerson: '', // 退回人
-  backReason: '', // 退回原因
-  backTime: '', // 退回时间
-  distributePerson: '', // 分配人
-  distributeTime: '', // 分配时间
-  startTime: '', // 检测开始时间
-  overTime: '', // 检测结束时间
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
 }
 // 检定流程列表
-const processList = ref([
+const processList = ref<IScheduleSet[]>([
   { ...defaultProcess },
 ])
 
-// 获取当前样品检测流程，参数待定
-const fetchProcess = () => {
-  // TODO: 模拟数据
-  processList.value = [
-    {
-      id: '1', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423635973935106', // 检测部门
-      executiveDeptName: '力学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '张三', // 检测人员
-      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待检测', // 检测状态
-      currentCertifications: '0', // 当前证书数
-      requireCertifications: '2', // 应出具证书数
-      updateTime: '2023-02-01 09:00:05', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-    {
-      id: '2', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423577505337346', // 检测部门
-      executiveDeptName: '热学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待分配', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-  ]
-}
-fetchProcess()
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+})
 
 // 点击添加流程
 const processAdd = () => {
@@ -121,25 +82,17 @@
 // 批量添加实验室
 const batchChooseOver = (labs: ILabList[]) => {
   for (const item of labs) {
-    const processTemp = {
-      id: '',
-      executiveItem: '', // 检测项目
-      executiveDept: item.deptId, // 检测部门
-      executiveDeptName: item.organizeName, // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
     }
     processList.value.push(processTemp)
   }
@@ -147,9 +100,24 @@
 
 // 保存流程
 const saveProcess = () => {
-  // TODO: 保存流程
-  console.log(processList.value)
-  emits('saveOver')
+  const form = {
+    measureProcessList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  console.log(form)
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
 }
 // 删除流程
 const deleteProcess = (index: number) => {
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index 6cbdf10..31dfae4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -12,24 +12,16 @@
     type: Object,
     default: () => {
       return {
-        id: '', // 检测节点id
-        executiveItem: '', // 检测项目
-        executiveDept: '', // 检测部门
-        executiveDeptName: '', // 检测部门
-        executivePerson: '', // 检测人员
-        executivePersonName: '', // 检测人员
-        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-        measureStateName: '', // 检测状态
-        currentCertifications: '', // 当前证书数
-        requireCertifications: '', // 应出具证书数
-        updateTime: '', // 更新时间
-        backPerson: '', // 退回人
-        backReason: '', // 退回原因
-        backTime: '', // 退回时间
-        distributePerson: '', // 分配人
-        distributeTime: '', // 分配时间
-        startTime: '', // 检测开始时间
-        overTime: '', // 检测结束时间
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
       }
     },
   },
@@ -56,22 +48,23 @@
 })
 // 检定环节可编辑-只有待分发状态可编辑
 const deptEdit = computed(() => {
-  return processNodeData.value.measureState == '0'
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 检定人可编辑-待分配状态可编辑
 const personEdit = computed(() => {
-  const editStates = ['0', '1']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 证书可编辑-待分发、待分配、待检测状态可编辑
 const certificationEdit = computed(() => {
-  const editStates = ['0', '1', '2']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 节点可移动
 const canMove = computed(() => {
-  const editStates = ['0']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 
 // 选择实验室
@@ -82,8 +75,8 @@
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
   console.log(lab)
-  processNodeData.value.executiveDept = lab.deptId
-  processNodeData.value.executiveDeptName = lab.organizeName
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
 }
 
 // 选择人员
@@ -93,8 +86,8 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
-  processNodeData.value.executivePerson = person.id
-  processNodeData.value.executivePersonName = person.name
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
 }
 
@@ -122,7 +115,7 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit">
           <template v-if="deptEdit" #append>
             <el-button :icon="Aim" size="small" link @click="clickChoose" />
           </template>
@@ -130,7 +123,7 @@
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit">
           <template v-if="personEdit" #append>
             <el-button :icon="Aim" size="small" link @click="choosePerson" />
           </template>
@@ -140,7 +133,7 @@
         <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
       <div class="line">
-        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
       </div>
       <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
@@ -149,7 +142,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 1d02839..493fbba 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,5 +1,3 @@
-import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
-
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -8,12 +6,29 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
   offset: number
 }
 
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
 // 任务列表-返回值
 export interface ITaskList {
   orderId: string // 委托书编号
@@ -25,41 +40,127 @@
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  isUrgent: string // 是否加急
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
   requireOverTime: string // 应检完时间
-  sampleAttr: string // 样品属性
-  sampleAttrName: string // 样品属性
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
   currentMeasureState: string // 当前检定环节
   currentMeasureStateName: string // 当前检定环节
-  currentCertifications: number // 已出具证书总数
+  alreadyCertifications: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
-  distributeStateName: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
 }
 
-// 检测流程节点
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+}
+
+// 全部检测流程节点
 export interface ISchedule {
-  executivePerson: string // 执行人
-  executivePersonName: string // 执行人名称
-  executiveDept: string // 执行部门
-  executiveDeptName: string // 执行部门名称
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
   executiveItem: string // 检定项目
-  currentCertifications?: number // 已出具证书总数
+  alreadyCertifications?: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  measureState: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
   updateTime: string // 流程更新时间
-  backTime: string // 退回时间
-  backReason: string // 退回原因
-  backPerson: string // 退回人
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
   distributePerson: string // 分配人
   distributeTime: string // 分配时间
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
 
 // 样品检测信息
-export interface ISampleMeasure extends ISampleEdit {
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
   orderId: string // 委托单id
+  orderCode: string // 委托单编号
   certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
 }
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 465b2e7..547ee3e 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,28 +1,27 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
-import type { ISampleMeasure } from './task-interface'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
 import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getTaskDetail } from '@/api/business/task'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // 样品详情id
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -39,32 +38,49 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleMeasure> = ref({
-  id: '',
-  orderId: '', // 委托单id
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
   postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
   manufacturer: '', // 生产厂家
   manufacturerCountry: '', // 厂家国别
   manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
   remark: '', // 备注
   minioFileName: '', // 说明书
   labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-  certifications: '',
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
 })
 const ruleFormRef = ref<FormInstance>()
 
@@ -143,14 +159,6 @@
   return menu.find(item => item.name === currentMenu.value)
 })
 
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
 const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
@@ -181,11 +189,9 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(dataForm.value).then((res) => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -195,42 +201,23 @@
     }
   })
 }
-
-// 获取样品详情
+//
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
 const getInfo = () => {
-  // getSapmleDetail({ id: infoId.value }).then((res) => {
-  dataForm.value = {
-    orderId: '123',
-    ABC: 'A',
-    companyAddress: '北京/北京市',
-    customerName: '京东集团',
-    customerNo: 'sygf202211290001',
-    id: '111111',
-    labelBind: '11222',
-    manufacturer: '北京某厂家',
-    manufacturerCountry: 'CN',
-    manufacturingDate: '2023-03',
-    manufacturingNo: '123121',
-    mesureCategory: '',
-    mesureContent: '项目1',
-    mesurePeriod: '1',
-    mesureType: '',
-    minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-    phone: '950618',
-    postalCode: 'test',
-    remark: '无备注',
-    sampleModel: '型号1',
-    sampleName: '样品1',
-    sampleNo: '123456',
-    measureResultCode: 'bhg',
-    deliverer: '张三',
-    delivererTel: '156254577545',
-    certifications: '1',
-  }
-  // for (const item of menu) {
-  //   item.searchFunc()
-  // }
-  // })
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList
+    taskForm.value.measureSendBackList = res.data.measureSendBackList
+  })
 }
 
 // 点击标签绑定的扫描
@@ -260,7 +247,7 @@
     fd.append('multipartFile', event.target.files[0])
     // UploadFile(fd).then((res) => {
     //   if (res.code === 200) {
-    //     dataForm.value.minioFileName = res.data[0]
+    //     sampleForm.value.minioFileName = res.data[0]
     //     // 重置当前验证
     //     ElMessage.success('文件上传成功')
     //   }
@@ -273,18 +260,30 @@
 const upload = () => {
   fileRef.value.click()
 }
-// 获取样品详情
-getInfo()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.role) {
+  roleType.value = $route.params.role as string // 使用角色
+
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+    getSampleInfo()
+  }
+}
 </script>
 
 <template>
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -294,7 +293,7 @@
       <div id="form">
         <el-form
           ref="ruleFormRef"
-          :model="dataForm"
+          :model="sampleForm"
           :label-width="120"
           label-position="right"
           :rules="rules"
@@ -303,9 +302,9 @@
             <el-col :span="6">
               <el-form-item label="样品编号:" prop="sampleNo">
                 <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -313,9 +312,9 @@
             <el-col :span="6">
               <el-form-item label="样品名称:" prop="sampleName">
                 <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -323,9 +322,9 @@
             <el-col :span="6">
               <el-form-item label="样品型号:" prop="sampleModel">
                 <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -333,9 +332,9 @@
             <el-col :span="6">
               <el-form-item label="出厂编号:" prop="manufacturingNo">
                 <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -343,9 +342,9 @@
             <el-col :span="6">
               <el-form-item label="委托方代码" prop="customerNo">
                 <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -353,9 +352,9 @@
             <el-col :span="6">
               <el-form-item label="委托方名称" prop="customerName">
                 <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -363,9 +362,9 @@
             <el-col :span="6">
               <el-form-item label="委托方电话" prop="phone">
                 <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -373,9 +372,9 @@
             <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -383,11 +382,11 @@
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
-                  v-model="dataForm.companyAddress"
+                  v-model="sampleForm.customerAddress"
                   type="textarea"
                   autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -395,9 +394,9 @@
             <el-col :span="6">
               <el-form-item label="校检类别:">
                 <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
@@ -407,19 +406,19 @@
             <el-col :span="6">
               <el-form-item label="生产厂家:">
                 <el-input
-                  v-model="dataForm.manufacturer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="厂家国别:">
                 <el-select
-                  v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
@@ -429,23 +428,23 @@
             <el-col :span="6">
               <el-form-item label="出厂年月:">
                 <el-date-picker
-                  v-model="dataForm.manufacturingDate"
+                  v-model="sampleForm.manufacturingDate"
                   type="month"
                   format="YYYY-MM"
                   value-format="YYYY-MM"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="ABC:">
                 <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
@@ -455,9 +454,9 @@
             <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -465,9 +464,9 @@
             <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
-                  v-model="dataForm.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -475,49 +474,20 @@
             <el-col :span="24">
               <el-form-item label="检定项目:" prop="mesureContent">
                 <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定周期（月）:">
                 <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="上次检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  disabled
-                  class="full-width-input"
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
@@ -526,21 +496,21 @@
             <el-col :span="24">
               <el-form-item label="备注:">
                 <el-input
-                  v-model="dataForm.remark"
+                  v-model="sampleForm.remark"
                   type="textarea"
                   :rows="2"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
-                  v-model="dataForm.mesureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
@@ -550,10 +520,10 @@
             <el-col :span="6">
               <el-form-item label="标签绑定:">
                 <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 >
                   <template #append>
                     <el-button>扫描</el-button>
@@ -565,11 +535,11 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="14">
               <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
             </el-col>
@@ -586,7 +556,7 @@
           保存
         </el-button>
       </template>
-      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
@@ -604,11 +574,11 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="dataForm.id!" :order-id="dataForm.orderId" />
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
       <!-- 检定记录 -->
-      <measure-records v-if="currentMenu === '检定记录'" :sample-id="dataForm.id!" />
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
-      <certification-records v-if="currentMenu === '检定证书'" :sample-id="dataForm.id!" />
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index f784804..461c518 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -31,7 +31,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
@@ -39,30 +39,30 @@
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
-  { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center' },
-  { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
-  { text: '分发性质', value: 'distributeState', align: 'center', width: '90px' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return row.alreadyCertifications ? `${row.alreadyCertifications}/${row.requireCertifications}` : '0/0' } },
+  { text: '分发性质', value: 'handOutProperty', align: 'center', width: '90px' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -80,15 +80,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // // 模拟数据
-  // list.value = [
-  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  // ]
-  // loadingTable.value = false
-  // console.log(listQuery.value)
   getTaskList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -111,15 +107,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
+    sampleBelong: '', // 样品属性
     sampleStatus: '2', // 分发状态
+    startTime: '', //	应检定开始时间
+    endTime: '', //	应检定结束时间
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -271,8 +269,8 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue
index 629b33c..2300f4c 100644
--- a/src/views/customer/advice/adviceEdit.vue
+++ b/src/views/customer/advice/adviceEdit.vue
@@ -51,7 +51,7 @@
 const companyInfo: SimpleCompany = reactive({
   customerName: '', // 公司名称
   customerNo: '', //	客户编号
-  customerId: '', // 客户id
+  id: '', // 客户id
   grade: '', // 履约评级
   gradeName: '', // 履约评级
   companySize: '', // 公司规模
@@ -121,12 +121,13 @@
   const item = select as SimpleCompany
   companyInfo.customerName = item.customerName
   companyInfo.customerNo = item.customerNo
-  companyInfo.customerId = item.customerId
+  companyInfo.id = item.id
   companyInfo.gradeName = item.gradeName
   companyInfo.companySizeName = item.companySizeName
   companyInfo.businessSizeName = item.businessSizeName
   companyInfo.evaluationName = item.evaluationName
   dataForm.value.customerNo = item.customerNo
+  dataForm.value.customerId = item.id
 }
 // 打印表单
 const printObj = ref({
@@ -154,8 +155,6 @@
         if (dataForm.value.id) {
           updateAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -164,8 +163,6 @@
         else {
           addAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
diff --git a/src/views/customer/advice/advice_interface.ts b/src/views/customer/advice/advice_interface.ts
index b08f85b..a8bf311 100644
--- a/src/views/customer/advice/advice_interface.ts
+++ b/src/views/customer/advice/advice_interface.ts
@@ -40,9 +40,10 @@
 
 // 公司简易
 export interface SimpleCompany {
+  id: string // 客户id
   customerName: string // 公司名称
   customerNo: string //	客户编号
-  customerId: string // 客户id
+  grade: string // 履约评级
   gradeName: string // 履约评级
   companySizeName: string // 公司规模
   businessSizeName: string // 业务规模
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index f9ee314..4893c4f 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -26,6 +26,7 @@
 const visible = ref(false) // 控制对话框显隐
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -54,17 +55,7 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
-})
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
+})// 表单
 const ruleFormRef = ref<FormInstance>()
 
 // 自定义校验规则--检定周期为正整数
@@ -111,6 +102,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -479,7 +474,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index aceea6a..abcada5 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -36,7 +36,14 @@
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
-  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: ISampleList) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ISampleList[]>([])
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index aafed2a..256ed9f 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -24,6 +24,7 @@
   measurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
   remark: string // 备注
+  validDeadline?: string // 证书过期时间
 }
 
 export interface ISampleEdit {

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
new file mode 100644
index 0000000..d6827e4
--- /dev/null
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts" name="DistributeDialog">
+import processConfig from './processConfig.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { getTaskDetail } from '@/api/business/task'
+// 任务分发弹窗
+
+// 自定义方法：close关闭弹窗
+const emit = defineEmits(['close'])
+const dialogVisible = ref(false) // 弹窗显示
+const sampleId = ref('') // 样品id
+const orderId = ref('') // 委托单id
+
+// 委托书-证书类别列表
+const certificationTypes = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  getDictByCode('certificationType').then((response) => {
+    certificationTypes.value = response.data
+  })
+}
+
+getDict()
+// 样品详情
+const sampleDetail = ref({
+  sampleName: '压力表',
+  mesureContent: '压力、ip68',
+  certifications: ['1', '2'],
+  remark: '这是备注',
+  measureProcessList: [],
+  measureSendBackList: [],
+})
+
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    sampleDetail.value.sampleName = res.data.sampleName
+    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.remark = res.data.remark
+    sampleDetail.value.certifications = res.data.certifications
+    sampleDetail.value.measureProcessList = res.data.measureProcessList
+    sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+  })
+}
+// 初始化弹窗
+const initDialog = (orderid: string, sampleid: string) => {
+  dialogVisible.value = true
+  sampleId.value = sampleid
+  orderId.value = orderid
+  getInfo()
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+  emit('close')
+}
+function cancel() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="任务分发" width="1000" @close="cancel">
+    <div class="simple-info">
+      <div class="simple-info-line">
+        <span class="label">样品名称:</span>
+        <el-input v-model="sampleDetail.sampleName" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">证书类别:</span>
+        <el-checkbox-group v-model="sampleDetail.certifications" disabled>
+          <el-checkbox v-for="item in certificationTypes" :key="item.value" :label="item.value">
+            {{ item.name }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="simple-info-line">
+        <span class="label">检定项目:</span>
+        <el-input v-model="sampleDetail.mesureContent" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">备注:</span>
+        <el-input v-model="sampleDetail.remark" disabled />
+      </div>
+    </div>
+    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+      批量添加
+    </el-button>
+    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <template #footer>
+      <el-button type="primary" @click="saveProcess">
+        确定
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//  样式
+.simple-info {
+  margin-top: -10px;
+  margin-bottom: 10px;
+
+  .simple-info-line {
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    .label {
+      width: 90px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/components/lab-interface.ts b/src/views/business/schedule/task/components/lab-interface.ts
index d6355c6..02b0d1d 100644
--- a/src/views/business/schedule/task/components/lab-interface.ts
+++ b/src/views/business/schedule/task/components/lab-interface.ts
@@ -6,7 +6,8 @@
   isLab: '1' // 是否是实验室
   director: string // 负责人
   meterMajor: string // 专业
-  measureItems: string// 检测能力
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
 }
 
 // 部门返回值对象类型
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 4ccab04..1efb8a9 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -1,11 +1,18 @@
 <script setup lang="ts" name="ProcessConfig">
 import { ref } from 'vue'
 import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
 import ProcessNode from './processNode.vue'
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/task'
 const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
   // 是否为详情展示页面
   detail: {
     type: Boolean,
@@ -21,81 +28,35 @@
     type: String,
     required: true,
   },
+  list: {
+    type: Array,
+    default: () => [],
+  },
 })
 const emits = defineEmits(['saveOver'])
 // 默认流程节点
-const defaultProcess = {
-  id: '', // 检测节点id
-  executiveItem: '', // 检测项目
-  executiveDept: '', // 检测部门
-  executiveDeptName: '', // 检测部门
-  executivePerson: '', // 检测人员
-  executivePersonName: '', // 检测人员
-  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-  measureStateName: '', // 检测状态
-  currentCertifications: '', // 当前证书数
-  requireCertifications: '', // 应出具证书数
-  updateTime: '', // 更新时间
-  backPerson: '', // 退回人
-  backReason: '', // 退回原因
-  backTime: '', // 退回时间
-  distributePerson: '', // 分配人
-  distributeTime: '', // 分配时间
-  startTime: '', // 检测开始时间
-  overTime: '', // 检测结束时间
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
 }
 // 检定流程列表
-const processList = ref([
+const processList = ref<IScheduleSet[]>([
   { ...defaultProcess },
 ])
 
-// 获取当前样品检测流程，参数待定
-const fetchProcess = () => {
-  // TODO: 模拟数据
-  processList.value = [
-    {
-      id: '1', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423635973935106', // 检测部门
-      executiveDeptName: '力学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '张三', // 检测人员
-      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待检测', // 检测状态
-      currentCertifications: '0', // 当前证书数
-      requireCertifications: '2', // 应出具证书数
-      updateTime: '2023-02-01 09:00:05', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-    {
-      id: '2', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423577505337346', // 检测部门
-      executiveDeptName: '热学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待分配', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-  ]
-}
-fetchProcess()
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+})
 
 // 点击添加流程
 const processAdd = () => {
@@ -121,25 +82,17 @@
 // 批量添加实验室
 const batchChooseOver = (labs: ILabList[]) => {
   for (const item of labs) {
-    const processTemp = {
-      id: '',
-      executiveItem: '', // 检测项目
-      executiveDept: item.deptId, // 检测部门
-      executiveDeptName: item.organizeName, // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
     }
     processList.value.push(processTemp)
   }
@@ -147,9 +100,24 @@
 
 // 保存流程
 const saveProcess = () => {
-  // TODO: 保存流程
-  console.log(processList.value)
-  emits('saveOver')
+  const form = {
+    measureProcessList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  console.log(form)
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
 }
 // 删除流程
 const deleteProcess = (index: number) => {
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index 6cbdf10..31dfae4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -12,24 +12,16 @@
     type: Object,
     default: () => {
       return {
-        id: '', // 检测节点id
-        executiveItem: '', // 检测项目
-        executiveDept: '', // 检测部门
-        executiveDeptName: '', // 检测部门
-        executivePerson: '', // 检测人员
-        executivePersonName: '', // 检测人员
-        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-        measureStateName: '', // 检测状态
-        currentCertifications: '', // 当前证书数
-        requireCertifications: '', // 应出具证书数
-        updateTime: '', // 更新时间
-        backPerson: '', // 退回人
-        backReason: '', // 退回原因
-        backTime: '', // 退回时间
-        distributePerson: '', // 分配人
-        distributeTime: '', // 分配时间
-        startTime: '', // 检测开始时间
-        overTime: '', // 检测结束时间
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
       }
     },
   },
@@ -56,22 +48,23 @@
 })
 // 检定环节可编辑-只有待分发状态可编辑
 const deptEdit = computed(() => {
-  return processNodeData.value.measureState == '0'
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 检定人可编辑-待分配状态可编辑
 const personEdit = computed(() => {
-  const editStates = ['0', '1']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 证书可编辑-待分发、待分配、待检测状态可编辑
 const certificationEdit = computed(() => {
-  const editStates = ['0', '1', '2']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 节点可移动
 const canMove = computed(() => {
-  const editStates = ['0']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 
 // 选择实验室
@@ -82,8 +75,8 @@
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
   console.log(lab)
-  processNodeData.value.executiveDept = lab.deptId
-  processNodeData.value.executiveDeptName = lab.organizeName
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
 }
 
 // 选择人员
@@ -93,8 +86,8 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
-  processNodeData.value.executivePerson = person.id
-  processNodeData.value.executivePersonName = person.name
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
 }
 
@@ -122,7 +115,7 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit">
           <template v-if="deptEdit" #append>
             <el-button :icon="Aim" size="small" link @click="clickChoose" />
           </template>
@@ -130,7 +123,7 @@
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit">
           <template v-if="personEdit" #append>
             <el-button :icon="Aim" size="small" link @click="choosePerson" />
           </template>
@@ -140,7 +133,7 @@
         <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
       <div class="line">
-        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
       </div>
       <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
@@ -149,7 +142,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 1d02839..493fbba 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,5 +1,3 @@
-import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
-
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -8,12 +6,29 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
   offset: number
 }
 
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
 // 任务列表-返回值
 export interface ITaskList {
   orderId: string // 委托书编号
@@ -25,41 +40,127 @@
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  isUrgent: string // 是否加急
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
   requireOverTime: string // 应检完时间
-  sampleAttr: string // 样品属性
-  sampleAttrName: string // 样品属性
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
   currentMeasureState: string // 当前检定环节
   currentMeasureStateName: string // 当前检定环节
-  currentCertifications: number // 已出具证书总数
+  alreadyCertifications: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
-  distributeStateName: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
 }
 
-// 检测流程节点
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+}
+
+// 全部检测流程节点
 export interface ISchedule {
-  executivePerson: string // 执行人
-  executivePersonName: string // 执行人名称
-  executiveDept: string // 执行部门
-  executiveDeptName: string // 执行部门名称
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
   executiveItem: string // 检定项目
-  currentCertifications?: number // 已出具证书总数
+  alreadyCertifications?: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  measureState: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
   updateTime: string // 流程更新时间
-  backTime: string // 退回时间
-  backReason: string // 退回原因
-  backPerson: string // 退回人
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
   distributePerson: string // 分配人
   distributeTime: string // 分配时间
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
 
 // 样品检测信息
-export interface ISampleMeasure extends ISampleEdit {
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
   orderId: string // 委托单id
+  orderCode: string // 委托单编号
   certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
 }
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 465b2e7..547ee3e 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,28 +1,27 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
-import type { ISampleMeasure } from './task-interface'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
 import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getTaskDetail } from '@/api/business/task'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // 样品详情id
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -39,32 +38,49 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleMeasure> = ref({
-  id: '',
-  orderId: '', // 委托单id
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
   postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
   manufacturer: '', // 生产厂家
   manufacturerCountry: '', // 厂家国别
   manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
   remark: '', // 备注
   minioFileName: '', // 说明书
   labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-  certifications: '',
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
 })
 const ruleFormRef = ref<FormInstance>()
 
@@ -143,14 +159,6 @@
   return menu.find(item => item.name === currentMenu.value)
 })
 
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
 const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
@@ -181,11 +189,9 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(dataForm.value).then((res) => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -195,42 +201,23 @@
     }
   })
 }
-
-// 获取样品详情
+//
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
 const getInfo = () => {
-  // getSapmleDetail({ id: infoId.value }).then((res) => {
-  dataForm.value = {
-    orderId: '123',
-    ABC: 'A',
-    companyAddress: '北京/北京市',
-    customerName: '京东集团',
-    customerNo: 'sygf202211290001',
-    id: '111111',
-    labelBind: '11222',
-    manufacturer: '北京某厂家',
-    manufacturerCountry: 'CN',
-    manufacturingDate: '2023-03',
-    manufacturingNo: '123121',
-    mesureCategory: '',
-    mesureContent: '项目1',
-    mesurePeriod: '1',
-    mesureType: '',
-    minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-    phone: '950618',
-    postalCode: 'test',
-    remark: '无备注',
-    sampleModel: '型号1',
-    sampleName: '样品1',
-    sampleNo: '123456',
-    measureResultCode: 'bhg',
-    deliverer: '张三',
-    delivererTel: '156254577545',
-    certifications: '1',
-  }
-  // for (const item of menu) {
-  //   item.searchFunc()
-  // }
-  // })
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList
+    taskForm.value.measureSendBackList = res.data.measureSendBackList
+  })
 }
 
 // 点击标签绑定的扫描
@@ -260,7 +247,7 @@
     fd.append('multipartFile', event.target.files[0])
     // UploadFile(fd).then((res) => {
     //   if (res.code === 200) {
-    //     dataForm.value.minioFileName = res.data[0]
+    //     sampleForm.value.minioFileName = res.data[0]
     //     // 重置当前验证
     //     ElMessage.success('文件上传成功')
     //   }
@@ -273,18 +260,30 @@
 const upload = () => {
   fileRef.value.click()
 }
-// 获取样品详情
-getInfo()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.role) {
+  roleType.value = $route.params.role as string // 使用角色
+
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+    getSampleInfo()
+  }
+}
 </script>
 
 <template>
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -294,7 +293,7 @@
       <div id="form">
         <el-form
           ref="ruleFormRef"
-          :model="dataForm"
+          :model="sampleForm"
           :label-width="120"
           label-position="right"
           :rules="rules"
@@ -303,9 +302,9 @@
             <el-col :span="6">
               <el-form-item label="样品编号:" prop="sampleNo">
                 <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -313,9 +312,9 @@
             <el-col :span="6">
               <el-form-item label="样品名称:" prop="sampleName">
                 <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -323,9 +322,9 @@
             <el-col :span="6">
               <el-form-item label="样品型号:" prop="sampleModel">
                 <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -333,9 +332,9 @@
             <el-col :span="6">
               <el-form-item label="出厂编号:" prop="manufacturingNo">
                 <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -343,9 +342,9 @@
             <el-col :span="6">
               <el-form-item label="委托方代码" prop="customerNo">
                 <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -353,9 +352,9 @@
             <el-col :span="6">
               <el-form-item label="委托方名称" prop="customerName">
                 <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -363,9 +362,9 @@
             <el-col :span="6">
               <el-form-item label="委托方电话" prop="phone">
                 <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -373,9 +372,9 @@
             <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -383,11 +382,11 @@
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
-                  v-model="dataForm.companyAddress"
+                  v-model="sampleForm.customerAddress"
                   type="textarea"
                   autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -395,9 +394,9 @@
             <el-col :span="6">
               <el-form-item label="校检类别:">
                 <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
@@ -407,19 +406,19 @@
             <el-col :span="6">
               <el-form-item label="生产厂家:">
                 <el-input
-                  v-model="dataForm.manufacturer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="厂家国别:">
                 <el-select
-                  v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
@@ -429,23 +428,23 @@
             <el-col :span="6">
               <el-form-item label="出厂年月:">
                 <el-date-picker
-                  v-model="dataForm.manufacturingDate"
+                  v-model="sampleForm.manufacturingDate"
                   type="month"
                   format="YYYY-MM"
                   value-format="YYYY-MM"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="ABC:">
                 <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
@@ -455,9 +454,9 @@
             <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -465,9 +464,9 @@
             <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
-                  v-model="dataForm.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -475,49 +474,20 @@
             <el-col :span="24">
               <el-form-item label="检定项目:" prop="mesureContent">
                 <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定周期（月）:">
                 <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="上次检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  disabled
-                  class="full-width-input"
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
@@ -526,21 +496,21 @@
             <el-col :span="24">
               <el-form-item label="备注:">
                 <el-input
-                  v-model="dataForm.remark"
+                  v-model="sampleForm.remark"
                   type="textarea"
                   :rows="2"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
-                  v-model="dataForm.mesureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
@@ -550,10 +520,10 @@
             <el-col :span="6">
               <el-form-item label="标签绑定:">
                 <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 >
                   <template #append>
                     <el-button>扫描</el-button>
@@ -565,11 +535,11 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="14">
               <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
             </el-col>
@@ -586,7 +556,7 @@
           保存
         </el-button>
       </template>
-      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
@@ -604,11 +574,11 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="dataForm.id!" :order-id="dataForm.orderId" />
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
       <!-- 检定记录 -->
-      <measure-records v-if="currentMenu === '检定记录'" :sample-id="dataForm.id!" />
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
-      <certification-records v-if="currentMenu === '检定证书'" :sample-id="dataForm.id!" />
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index f784804..461c518 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -31,7 +31,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
@@ -39,30 +39,30 @@
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
-  { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center' },
-  { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
-  { text: '分发性质', value: 'distributeState', align: 'center', width: '90px' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return row.alreadyCertifications ? `${row.alreadyCertifications}/${row.requireCertifications}` : '0/0' } },
+  { text: '分发性质', value: 'handOutProperty', align: 'center', width: '90px' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -80,15 +80,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // // 模拟数据
-  // list.value = [
-  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  // ]
-  // loadingTable.value = false
-  // console.log(listQuery.value)
   getTaskList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -111,15 +107,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
+    sampleBelong: '', // 样品属性
     sampleStatus: '2', // 分发状态
+    startTime: '', //	应检定开始时间
+    endTime: '', //	应检定结束时间
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -271,8 +269,8 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue
index 629b33c..2300f4c 100644
--- a/src/views/customer/advice/adviceEdit.vue
+++ b/src/views/customer/advice/adviceEdit.vue
@@ -51,7 +51,7 @@
 const companyInfo: SimpleCompany = reactive({
   customerName: '', // 公司名称
   customerNo: '', //	客户编号
-  customerId: '', // 客户id
+  id: '', // 客户id
   grade: '', // 履约评级
   gradeName: '', // 履约评级
   companySize: '', // 公司规模
@@ -121,12 +121,13 @@
   const item = select as SimpleCompany
   companyInfo.customerName = item.customerName
   companyInfo.customerNo = item.customerNo
-  companyInfo.customerId = item.customerId
+  companyInfo.id = item.id
   companyInfo.gradeName = item.gradeName
   companyInfo.companySizeName = item.companySizeName
   companyInfo.businessSizeName = item.businessSizeName
   companyInfo.evaluationName = item.evaluationName
   dataForm.value.customerNo = item.customerNo
+  dataForm.value.customerId = item.id
 }
 // 打印表单
 const printObj = ref({
@@ -154,8 +155,6 @@
         if (dataForm.value.id) {
           updateAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -164,8 +163,6 @@
         else {
           addAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
diff --git a/src/views/customer/advice/advice_interface.ts b/src/views/customer/advice/advice_interface.ts
index b08f85b..a8bf311 100644
--- a/src/views/customer/advice/advice_interface.ts
+++ b/src/views/customer/advice/advice_interface.ts
@@ -40,9 +40,10 @@
 
 // 公司简易
 export interface SimpleCompany {
+  id: string // 客户id
   customerName: string // 公司名称
   customerNo: string //	客户编号
-  customerId: string // 客户id
+  grade: string // 履约评级
   gradeName: string // 履约评级
   companySizeName: string // 公司规模
   businessSizeName: string // 业务规模
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index f9ee314..4893c4f 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -26,6 +26,7 @@
 const visible = ref(false) // 控制对话框显隐
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -54,17 +55,7 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
-})
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
+})// 表单
 const ruleFormRef = ref<FormInstance>()
 
 // 自定义校验规则--检定周期为正整数
@@ -111,6 +102,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -479,7 +474,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index aceea6a..abcada5 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -36,7 +36,14 @@
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
-  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: ISampleList) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ISampleList[]>([])
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index aafed2a..256ed9f 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -24,6 +24,7 @@
   measurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
   remark: string // 备注
+  validDeadline?: string // 证书过期时间
 }
 
 export interface ISampleEdit {
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 3b03275..d04456b 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -163,7 +163,7 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
+          <el-select v-model="listQuery.businessSize" placeholder="业务规模">
             <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
@@ -183,7 +183,16 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirm">
           确定

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
new file mode 100644
index 0000000..d6827e4
--- /dev/null
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts" name="DistributeDialog">
+import processConfig from './processConfig.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { getTaskDetail } from '@/api/business/task'
+// 任务分发弹窗
+
+// 自定义方法：close关闭弹窗
+const emit = defineEmits(['close'])
+const dialogVisible = ref(false) // 弹窗显示
+const sampleId = ref('') // 样品id
+const orderId = ref('') // 委托单id
+
+// 委托书-证书类别列表
+const certificationTypes = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  getDictByCode('certificationType').then((response) => {
+    certificationTypes.value = response.data
+  })
+}
+
+getDict()
+// 样品详情
+const sampleDetail = ref({
+  sampleName: '压力表',
+  mesureContent: '压力、ip68',
+  certifications: ['1', '2'],
+  remark: '这是备注',
+  measureProcessList: [],
+  measureSendBackList: [],
+})
+
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    sampleDetail.value.sampleName = res.data.sampleName
+    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.remark = res.data.remark
+    sampleDetail.value.certifications = res.data.certifications
+    sampleDetail.value.measureProcessList = res.data.measureProcessList
+    sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+  })
+}
+// 初始化弹窗
+const initDialog = (orderid: string, sampleid: string) => {
+  dialogVisible.value = true
+  sampleId.value = sampleid
+  orderId.value = orderid
+  getInfo()
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+  emit('close')
+}
+function cancel() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="任务分发" width="1000" @close="cancel">
+    <div class="simple-info">
+      <div class="simple-info-line">
+        <span class="label">样品名称:</span>
+        <el-input v-model="sampleDetail.sampleName" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">证书类别:</span>
+        <el-checkbox-group v-model="sampleDetail.certifications" disabled>
+          <el-checkbox v-for="item in certificationTypes" :key="item.value" :label="item.value">
+            {{ item.name }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="simple-info-line">
+        <span class="label">检定项目:</span>
+        <el-input v-model="sampleDetail.mesureContent" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">备注:</span>
+        <el-input v-model="sampleDetail.remark" disabled />
+      </div>
+    </div>
+    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+      批量添加
+    </el-button>
+    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <template #footer>
+      <el-button type="primary" @click="saveProcess">
+        确定
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//  样式
+.simple-info {
+  margin-top: -10px;
+  margin-bottom: 10px;
+
+  .simple-info-line {
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    .label {
+      width: 90px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/components/lab-interface.ts b/src/views/business/schedule/task/components/lab-interface.ts
index d6355c6..02b0d1d 100644
--- a/src/views/business/schedule/task/components/lab-interface.ts
+++ b/src/views/business/schedule/task/components/lab-interface.ts
@@ -6,7 +6,8 @@
   isLab: '1' // 是否是实验室
   director: string // 负责人
   meterMajor: string // 专业
-  measureItems: string// 检测能力
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
 }
 
 // 部门返回值对象类型
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 4ccab04..1efb8a9 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -1,11 +1,18 @@
 <script setup lang="ts" name="ProcessConfig">
 import { ref } from 'vue'
 import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
 import ProcessNode from './processNode.vue'
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/task'
 const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
   // 是否为详情展示页面
   detail: {
     type: Boolean,
@@ -21,81 +28,35 @@
     type: String,
     required: true,
   },
+  list: {
+    type: Array,
+    default: () => [],
+  },
 })
 const emits = defineEmits(['saveOver'])
 // 默认流程节点
-const defaultProcess = {
-  id: '', // 检测节点id
-  executiveItem: '', // 检测项目
-  executiveDept: '', // 检测部门
-  executiveDeptName: '', // 检测部门
-  executivePerson: '', // 检测人员
-  executivePersonName: '', // 检测人员
-  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-  measureStateName: '', // 检测状态
-  currentCertifications: '', // 当前证书数
-  requireCertifications: '', // 应出具证书数
-  updateTime: '', // 更新时间
-  backPerson: '', // 退回人
-  backReason: '', // 退回原因
-  backTime: '', // 退回时间
-  distributePerson: '', // 分配人
-  distributeTime: '', // 分配时间
-  startTime: '', // 检测开始时间
-  overTime: '', // 检测结束时间
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
 }
 // 检定流程列表
-const processList = ref([
+const processList = ref<IScheduleSet[]>([
   { ...defaultProcess },
 ])
 
-// 获取当前样品检测流程，参数待定
-const fetchProcess = () => {
-  // TODO: 模拟数据
-  processList.value = [
-    {
-      id: '1', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423635973935106', // 检测部门
-      executiveDeptName: '力学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '张三', // 检测人员
-      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待检测', // 检测状态
-      currentCertifications: '0', // 当前证书数
-      requireCertifications: '2', // 应出具证书数
-      updateTime: '2023-02-01 09:00:05', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-    {
-      id: '2', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423577505337346', // 检测部门
-      executiveDeptName: '热学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待分配', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-  ]
-}
-fetchProcess()
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+})
 
 // 点击添加流程
 const processAdd = () => {
@@ -121,25 +82,17 @@
 // 批量添加实验室
 const batchChooseOver = (labs: ILabList[]) => {
   for (const item of labs) {
-    const processTemp = {
-      id: '',
-      executiveItem: '', // 检测项目
-      executiveDept: item.deptId, // 检测部门
-      executiveDeptName: item.organizeName, // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
     }
     processList.value.push(processTemp)
   }
@@ -147,9 +100,24 @@
 
 // 保存流程
 const saveProcess = () => {
-  // TODO: 保存流程
-  console.log(processList.value)
-  emits('saveOver')
+  const form = {
+    measureProcessList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  console.log(form)
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
 }
 // 删除流程
 const deleteProcess = (index: number) => {
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index 6cbdf10..31dfae4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -12,24 +12,16 @@
     type: Object,
     default: () => {
       return {
-        id: '', // 检测节点id
-        executiveItem: '', // 检测项目
-        executiveDept: '', // 检测部门
-        executiveDeptName: '', // 检测部门
-        executivePerson: '', // 检测人员
-        executivePersonName: '', // 检测人员
-        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-        measureStateName: '', // 检测状态
-        currentCertifications: '', // 当前证书数
-        requireCertifications: '', // 应出具证书数
-        updateTime: '', // 更新时间
-        backPerson: '', // 退回人
-        backReason: '', // 退回原因
-        backTime: '', // 退回时间
-        distributePerson: '', // 分配人
-        distributeTime: '', // 分配时间
-        startTime: '', // 检测开始时间
-        overTime: '', // 检测结束时间
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
       }
     },
   },
@@ -56,22 +48,23 @@
 })
 // 检定环节可编辑-只有待分发状态可编辑
 const deptEdit = computed(() => {
-  return processNodeData.value.measureState == '0'
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 检定人可编辑-待分配状态可编辑
 const personEdit = computed(() => {
-  const editStates = ['0', '1']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 证书可编辑-待分发、待分配、待检测状态可编辑
 const certificationEdit = computed(() => {
-  const editStates = ['0', '1', '2']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 节点可移动
 const canMove = computed(() => {
-  const editStates = ['0']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 
 // 选择实验室
@@ -82,8 +75,8 @@
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
   console.log(lab)
-  processNodeData.value.executiveDept = lab.deptId
-  processNodeData.value.executiveDeptName = lab.organizeName
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
 }
 
 // 选择人员
@@ -93,8 +86,8 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
-  processNodeData.value.executivePerson = person.id
-  processNodeData.value.executivePersonName = person.name
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
 }
 
@@ -122,7 +115,7 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit">
           <template v-if="deptEdit" #append>
             <el-button :icon="Aim" size="small" link @click="clickChoose" />
           </template>
@@ -130,7 +123,7 @@
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit">
           <template v-if="personEdit" #append>
             <el-button :icon="Aim" size="small" link @click="choosePerson" />
           </template>
@@ -140,7 +133,7 @@
         <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
       <div class="line">
-        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
       </div>
       <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
@@ -149,7 +142,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 1d02839..493fbba 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,5 +1,3 @@
-import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
-
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -8,12 +6,29 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
   offset: number
 }
 
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
 // 任务列表-返回值
 export interface ITaskList {
   orderId: string // 委托书编号
@@ -25,41 +40,127 @@
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  isUrgent: string // 是否加急
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
   requireOverTime: string // 应检完时间
-  sampleAttr: string // 样品属性
-  sampleAttrName: string // 样品属性
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
   currentMeasureState: string // 当前检定环节
   currentMeasureStateName: string // 当前检定环节
-  currentCertifications: number // 已出具证书总数
+  alreadyCertifications: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
-  distributeStateName: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
 }
 
-// 检测流程节点
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+}
+
+// 全部检测流程节点
 export interface ISchedule {
-  executivePerson: string // 执行人
-  executivePersonName: string // 执行人名称
-  executiveDept: string // 执行部门
-  executiveDeptName: string // 执行部门名称
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
   executiveItem: string // 检定项目
-  currentCertifications?: number // 已出具证书总数
+  alreadyCertifications?: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  measureState: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
   updateTime: string // 流程更新时间
-  backTime: string // 退回时间
-  backReason: string // 退回原因
-  backPerson: string // 退回人
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
   distributePerson: string // 分配人
   distributeTime: string // 分配时间
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
 
 // 样品检测信息
-export interface ISampleMeasure extends ISampleEdit {
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
   orderId: string // 委托单id
+  orderCode: string // 委托单编号
   certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
 }
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 465b2e7..547ee3e 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,28 +1,27 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
-import type { ISampleMeasure } from './task-interface'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
 import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getTaskDetail } from '@/api/business/task'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // 样品详情id
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -39,32 +38,49 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleMeasure> = ref({
-  id: '',
-  orderId: '', // 委托单id
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
   postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
   manufacturer: '', // 生产厂家
   manufacturerCountry: '', // 厂家国别
   manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
   remark: '', // 备注
   minioFileName: '', // 说明书
   labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-  certifications: '',
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
 })
 const ruleFormRef = ref<FormInstance>()
 
@@ -143,14 +159,6 @@
   return menu.find(item => item.name === currentMenu.value)
 })
 
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
 const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
@@ -181,11 +189,9 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(dataForm.value).then((res) => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -195,42 +201,23 @@
     }
   })
 }
-
-// 获取样品详情
+//
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
 const getInfo = () => {
-  // getSapmleDetail({ id: infoId.value }).then((res) => {
-  dataForm.value = {
-    orderId: '123',
-    ABC: 'A',
-    companyAddress: '北京/北京市',
-    customerName: '京东集团',
-    customerNo: 'sygf202211290001',
-    id: '111111',
-    labelBind: '11222',
-    manufacturer: '北京某厂家',
-    manufacturerCountry: 'CN',
-    manufacturingDate: '2023-03',
-    manufacturingNo: '123121',
-    mesureCategory: '',
-    mesureContent: '项目1',
-    mesurePeriod: '1',
-    mesureType: '',
-    minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-    phone: '950618',
-    postalCode: 'test',
-    remark: '无备注',
-    sampleModel: '型号1',
-    sampleName: '样品1',
-    sampleNo: '123456',
-    measureResultCode: 'bhg',
-    deliverer: '张三',
-    delivererTel: '156254577545',
-    certifications: '1',
-  }
-  // for (const item of menu) {
-  //   item.searchFunc()
-  // }
-  // })
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList
+    taskForm.value.measureSendBackList = res.data.measureSendBackList
+  })
 }
 
 // 点击标签绑定的扫描
@@ -260,7 +247,7 @@
     fd.append('multipartFile', event.target.files[0])
     // UploadFile(fd).then((res) => {
     //   if (res.code === 200) {
-    //     dataForm.value.minioFileName = res.data[0]
+    //     sampleForm.value.minioFileName = res.data[0]
     //     // 重置当前验证
     //     ElMessage.success('文件上传成功')
     //   }
@@ -273,18 +260,30 @@
 const upload = () => {
   fileRef.value.click()
 }
-// 获取样品详情
-getInfo()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.role) {
+  roleType.value = $route.params.role as string // 使用角色
+
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+    getSampleInfo()
+  }
+}
 </script>
 
 <template>
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -294,7 +293,7 @@
       <div id="form">
         <el-form
           ref="ruleFormRef"
-          :model="dataForm"
+          :model="sampleForm"
           :label-width="120"
           label-position="right"
           :rules="rules"
@@ -303,9 +302,9 @@
             <el-col :span="6">
               <el-form-item label="样品编号:" prop="sampleNo">
                 <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -313,9 +312,9 @@
             <el-col :span="6">
               <el-form-item label="样品名称:" prop="sampleName">
                 <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -323,9 +322,9 @@
             <el-col :span="6">
               <el-form-item label="样品型号:" prop="sampleModel">
                 <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -333,9 +332,9 @@
             <el-col :span="6">
               <el-form-item label="出厂编号:" prop="manufacturingNo">
                 <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -343,9 +342,9 @@
             <el-col :span="6">
               <el-form-item label="委托方代码" prop="customerNo">
                 <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -353,9 +352,9 @@
             <el-col :span="6">
               <el-form-item label="委托方名称" prop="customerName">
                 <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -363,9 +362,9 @@
             <el-col :span="6">
               <el-form-item label="委托方电话" prop="phone">
                 <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -373,9 +372,9 @@
             <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -383,11 +382,11 @@
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
-                  v-model="dataForm.companyAddress"
+                  v-model="sampleForm.customerAddress"
                   type="textarea"
                   autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -395,9 +394,9 @@
             <el-col :span="6">
               <el-form-item label="校检类别:">
                 <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
@@ -407,19 +406,19 @@
             <el-col :span="6">
               <el-form-item label="生产厂家:">
                 <el-input
-                  v-model="dataForm.manufacturer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="厂家国别:">
                 <el-select
-                  v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
@@ -429,23 +428,23 @@
             <el-col :span="6">
               <el-form-item label="出厂年月:">
                 <el-date-picker
-                  v-model="dataForm.manufacturingDate"
+                  v-model="sampleForm.manufacturingDate"
                   type="month"
                   format="YYYY-MM"
                   value-format="YYYY-MM"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="ABC:">
                 <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
@@ -455,9 +454,9 @@
             <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -465,9 +464,9 @@
             <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
-                  v-model="dataForm.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -475,49 +474,20 @@
             <el-col :span="24">
               <el-form-item label="检定项目:" prop="mesureContent">
                 <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定周期（月）:">
                 <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="上次检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  disabled
-                  class="full-width-input"
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
@@ -526,21 +496,21 @@
             <el-col :span="24">
               <el-form-item label="备注:">
                 <el-input
-                  v-model="dataForm.remark"
+                  v-model="sampleForm.remark"
                   type="textarea"
                   :rows="2"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
-                  v-model="dataForm.mesureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
@@ -550,10 +520,10 @@
             <el-col :span="6">
               <el-form-item label="标签绑定:">
                 <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 >
                   <template #append>
                     <el-button>扫描</el-button>
@@ -565,11 +535,11 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="14">
               <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
             </el-col>
@@ -586,7 +556,7 @@
           保存
         </el-button>
       </template>
-      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
@@ -604,11 +574,11 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="dataForm.id!" :order-id="dataForm.orderId" />
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
       <!-- 检定记录 -->
-      <measure-records v-if="currentMenu === '检定记录'" :sample-id="dataForm.id!" />
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
-      <certification-records v-if="currentMenu === '检定证书'" :sample-id="dataForm.id!" />
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index f784804..461c518 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -31,7 +31,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
@@ -39,30 +39,30 @@
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
-  { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center' },
-  { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
-  { text: '分发性质', value: 'distributeState', align: 'center', width: '90px' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return row.alreadyCertifications ? `${row.alreadyCertifications}/${row.requireCertifications}` : '0/0' } },
+  { text: '分发性质', value: 'handOutProperty', align: 'center', width: '90px' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -80,15 +80,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // // 模拟数据
-  // list.value = [
-  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  // ]
-  // loadingTable.value = false
-  // console.log(listQuery.value)
   getTaskList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -111,15 +107,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
+    sampleBelong: '', // 样品属性
     sampleStatus: '2', // 分发状态
+    startTime: '', //	应检定开始时间
+    endTime: '', //	应检定结束时间
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -271,8 +269,8 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue
index 629b33c..2300f4c 100644
--- a/src/views/customer/advice/adviceEdit.vue
+++ b/src/views/customer/advice/adviceEdit.vue
@@ -51,7 +51,7 @@
 const companyInfo: SimpleCompany = reactive({
   customerName: '', // 公司名称
   customerNo: '', //	客户编号
-  customerId: '', // 客户id
+  id: '', // 客户id
   grade: '', // 履约评级
   gradeName: '', // 履约评级
   companySize: '', // 公司规模
@@ -121,12 +121,13 @@
   const item = select as SimpleCompany
   companyInfo.customerName = item.customerName
   companyInfo.customerNo = item.customerNo
-  companyInfo.customerId = item.customerId
+  companyInfo.id = item.id
   companyInfo.gradeName = item.gradeName
   companyInfo.companySizeName = item.companySizeName
   companyInfo.businessSizeName = item.businessSizeName
   companyInfo.evaluationName = item.evaluationName
   dataForm.value.customerNo = item.customerNo
+  dataForm.value.customerId = item.id
 }
 // 打印表单
 const printObj = ref({
@@ -154,8 +155,6 @@
         if (dataForm.value.id) {
           updateAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -164,8 +163,6 @@
         else {
           addAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
diff --git a/src/views/customer/advice/advice_interface.ts b/src/views/customer/advice/advice_interface.ts
index b08f85b..a8bf311 100644
--- a/src/views/customer/advice/advice_interface.ts
+++ b/src/views/customer/advice/advice_interface.ts
@@ -40,9 +40,10 @@
 
 // 公司简易
 export interface SimpleCompany {
+  id: string // 客户id
   customerName: string // 公司名称
   customerNo: string //	客户编号
-  customerId: string // 客户id
+  grade: string // 履约评级
   gradeName: string // 履约评级
   companySizeName: string // 公司规模
   businessSizeName: string // 业务规模
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index f9ee314..4893c4f 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -26,6 +26,7 @@
 const visible = ref(false) // 控制对话框显隐
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -54,17 +55,7 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
-})
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
+})// 表单
 const ruleFormRef = ref<FormInstance>()
 
 // 自定义校验规则--检定周期为正整数
@@ -111,6 +102,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -479,7 +474,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index aceea6a..abcada5 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -36,7 +36,14 @@
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
-  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: ISampleList) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ISampleList[]>([])
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index aafed2a..256ed9f 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -24,6 +24,7 @@
   measurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
   remark: string // 备注
+  validDeadline?: string // 证书过期时间
 }
 
 export interface ISampleEdit {
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 3b03275..d04456b 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -163,7 +163,7 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
+          <el-select v-model="listQuery.businessSize" placeholder="业务规模">
             <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
@@ -183,7 +183,16 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirm">
           确定
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 59f2feb..4deeed8 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -20,18 +20,9 @@
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 
 const dataForm: Ref<ISampleDetail> = ref({
   id: '',
@@ -74,6 +65,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -358,7 +353,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
new file mode 100644
index 0000000..d6827e4
--- /dev/null
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts" name="DistributeDialog">
+import processConfig from './processConfig.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { getTaskDetail } from '@/api/business/task'
+// 任务分发弹窗
+
+// 自定义方法：close关闭弹窗
+const emit = defineEmits(['close'])
+const dialogVisible = ref(false) // 弹窗显示
+const sampleId = ref('') // 样品id
+const orderId = ref('') // 委托单id
+
+// 委托书-证书类别列表
+const certificationTypes = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  getDictByCode('certificationType').then((response) => {
+    certificationTypes.value = response.data
+  })
+}
+
+getDict()
+// 样品详情
+const sampleDetail = ref({
+  sampleName: '压力表',
+  mesureContent: '压力、ip68',
+  certifications: ['1', '2'],
+  remark: '这是备注',
+  measureProcessList: [],
+  measureSendBackList: [],
+})
+
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    sampleDetail.value.sampleName = res.data.sampleName
+    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.remark = res.data.remark
+    sampleDetail.value.certifications = res.data.certifications
+    sampleDetail.value.measureProcessList = res.data.measureProcessList
+    sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+  })
+}
+// 初始化弹窗
+const initDialog = (orderid: string, sampleid: string) => {
+  dialogVisible.value = true
+  sampleId.value = sampleid
+  orderId.value = orderid
+  getInfo()
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+  emit('close')
+}
+function cancel() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="任务分发" width="1000" @close="cancel">
+    <div class="simple-info">
+      <div class="simple-info-line">
+        <span class="label">样品名称:</span>
+        <el-input v-model="sampleDetail.sampleName" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">证书类别:</span>
+        <el-checkbox-group v-model="sampleDetail.certifications" disabled>
+          <el-checkbox v-for="item in certificationTypes" :key="item.value" :label="item.value">
+            {{ item.name }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="simple-info-line">
+        <span class="label">检定项目:</span>
+        <el-input v-model="sampleDetail.mesureContent" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">备注:</span>
+        <el-input v-model="sampleDetail.remark" disabled />
+      </div>
+    </div>
+    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+      批量添加
+    </el-button>
+    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <template #footer>
+      <el-button type="primary" @click="saveProcess">
+        确定
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//  样式
+.simple-info {
+  margin-top: -10px;
+  margin-bottom: 10px;
+
+  .simple-info-line {
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    .label {
+      width: 90px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/components/lab-interface.ts b/src/views/business/schedule/task/components/lab-interface.ts
index d6355c6..02b0d1d 100644
--- a/src/views/business/schedule/task/components/lab-interface.ts
+++ b/src/views/business/schedule/task/components/lab-interface.ts
@@ -6,7 +6,8 @@
   isLab: '1' // 是否是实验室
   director: string // 负责人
   meterMajor: string // 专业
-  measureItems: string// 检测能力
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
 }
 
 // 部门返回值对象类型
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 4ccab04..1efb8a9 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -1,11 +1,18 @@
 <script setup lang="ts" name="ProcessConfig">
 import { ref } from 'vue'
 import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
 import ProcessNode from './processNode.vue'
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/task'
 const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
   // 是否为详情展示页面
   detail: {
     type: Boolean,
@@ -21,81 +28,35 @@
     type: String,
     required: true,
   },
+  list: {
+    type: Array,
+    default: () => [],
+  },
 })
 const emits = defineEmits(['saveOver'])
 // 默认流程节点
-const defaultProcess = {
-  id: '', // 检测节点id
-  executiveItem: '', // 检测项目
-  executiveDept: '', // 检测部门
-  executiveDeptName: '', // 检测部门
-  executivePerson: '', // 检测人员
-  executivePersonName: '', // 检测人员
-  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-  measureStateName: '', // 检测状态
-  currentCertifications: '', // 当前证书数
-  requireCertifications: '', // 应出具证书数
-  updateTime: '', // 更新时间
-  backPerson: '', // 退回人
-  backReason: '', // 退回原因
-  backTime: '', // 退回时间
-  distributePerson: '', // 分配人
-  distributeTime: '', // 分配时间
-  startTime: '', // 检测开始时间
-  overTime: '', // 检测结束时间
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
 }
 // 检定流程列表
-const processList = ref([
+const processList = ref<IScheduleSet[]>([
   { ...defaultProcess },
 ])
 
-// 获取当前样品检测流程，参数待定
-const fetchProcess = () => {
-  // TODO: 模拟数据
-  processList.value = [
-    {
-      id: '1', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423635973935106', // 检测部门
-      executiveDeptName: '力学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '张三', // 检测人员
-      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待检测', // 检测状态
-      currentCertifications: '0', // 当前证书数
-      requireCertifications: '2', // 应出具证书数
-      updateTime: '2023-02-01 09:00:05', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-    {
-      id: '2', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423577505337346', // 检测部门
-      executiveDeptName: '热学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待分配', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-  ]
-}
-fetchProcess()
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+})
 
 // 点击添加流程
 const processAdd = () => {
@@ -121,25 +82,17 @@
 // 批量添加实验室
 const batchChooseOver = (labs: ILabList[]) => {
   for (const item of labs) {
-    const processTemp = {
-      id: '',
-      executiveItem: '', // 检测项目
-      executiveDept: item.deptId, // 检测部门
-      executiveDeptName: item.organizeName, // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
     }
     processList.value.push(processTemp)
   }
@@ -147,9 +100,24 @@
 
 // 保存流程
 const saveProcess = () => {
-  // TODO: 保存流程
-  console.log(processList.value)
-  emits('saveOver')
+  const form = {
+    measureProcessList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  console.log(form)
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
 }
 // 删除流程
 const deleteProcess = (index: number) => {
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index 6cbdf10..31dfae4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -12,24 +12,16 @@
     type: Object,
     default: () => {
       return {
-        id: '', // 检测节点id
-        executiveItem: '', // 检测项目
-        executiveDept: '', // 检测部门
-        executiveDeptName: '', // 检测部门
-        executivePerson: '', // 检测人员
-        executivePersonName: '', // 检测人员
-        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-        measureStateName: '', // 检测状态
-        currentCertifications: '', // 当前证书数
-        requireCertifications: '', // 应出具证书数
-        updateTime: '', // 更新时间
-        backPerson: '', // 退回人
-        backReason: '', // 退回原因
-        backTime: '', // 退回时间
-        distributePerson: '', // 分配人
-        distributeTime: '', // 分配时间
-        startTime: '', // 检测开始时间
-        overTime: '', // 检测结束时间
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
       }
     },
   },
@@ -56,22 +48,23 @@
 })
 // 检定环节可编辑-只有待分发状态可编辑
 const deptEdit = computed(() => {
-  return processNodeData.value.measureState == '0'
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 检定人可编辑-待分配状态可编辑
 const personEdit = computed(() => {
-  const editStates = ['0', '1']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 证书可编辑-待分发、待分配、待检测状态可编辑
 const certificationEdit = computed(() => {
-  const editStates = ['0', '1', '2']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 节点可移动
 const canMove = computed(() => {
-  const editStates = ['0']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 
 // 选择实验室
@@ -82,8 +75,8 @@
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
   console.log(lab)
-  processNodeData.value.executiveDept = lab.deptId
-  processNodeData.value.executiveDeptName = lab.organizeName
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
 }
 
 // 选择人员
@@ -93,8 +86,8 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
-  processNodeData.value.executivePerson = person.id
-  processNodeData.value.executivePersonName = person.name
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
 }
 
@@ -122,7 +115,7 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit">
           <template v-if="deptEdit" #append>
             <el-button :icon="Aim" size="small" link @click="clickChoose" />
           </template>
@@ -130,7 +123,7 @@
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit">
           <template v-if="personEdit" #append>
             <el-button :icon="Aim" size="small" link @click="choosePerson" />
           </template>
@@ -140,7 +133,7 @@
         <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
       <div class="line">
-        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
       </div>
       <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
@@ -149,7 +142,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 1d02839..493fbba 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,5 +1,3 @@
-import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
-
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -8,12 +6,29 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
   offset: number
 }
 
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
 // 任务列表-返回值
 export interface ITaskList {
   orderId: string // 委托书编号
@@ -25,41 +40,127 @@
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  isUrgent: string // 是否加急
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
   requireOverTime: string // 应检完时间
-  sampleAttr: string // 样品属性
-  sampleAttrName: string // 样品属性
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
   currentMeasureState: string // 当前检定环节
   currentMeasureStateName: string // 当前检定环节
-  currentCertifications: number // 已出具证书总数
+  alreadyCertifications: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
-  distributeStateName: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
 }
 
-// 检测流程节点
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+}
+
+// 全部检测流程节点
 export interface ISchedule {
-  executivePerson: string // 执行人
-  executivePersonName: string // 执行人名称
-  executiveDept: string // 执行部门
-  executiveDeptName: string // 执行部门名称
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
   executiveItem: string // 检定项目
-  currentCertifications?: number // 已出具证书总数
+  alreadyCertifications?: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  measureState: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
   updateTime: string // 流程更新时间
-  backTime: string // 退回时间
-  backReason: string // 退回原因
-  backPerson: string // 退回人
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
   distributePerson: string // 分配人
   distributeTime: string // 分配时间
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
 
 // 样品检测信息
-export interface ISampleMeasure extends ISampleEdit {
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
   orderId: string // 委托单id
+  orderCode: string // 委托单编号
   certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
 }
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 465b2e7..547ee3e 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,28 +1,27 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
-import type { ISampleMeasure } from './task-interface'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
 import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getTaskDetail } from '@/api/business/task'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // 样品详情id
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -39,32 +38,49 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleMeasure> = ref({
-  id: '',
-  orderId: '', // 委托单id
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
   postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
   manufacturer: '', // 生产厂家
   manufacturerCountry: '', // 厂家国别
   manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
   remark: '', // 备注
   minioFileName: '', // 说明书
   labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-  certifications: '',
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
 })
 const ruleFormRef = ref<FormInstance>()
 
@@ -143,14 +159,6 @@
   return menu.find(item => item.name === currentMenu.value)
 })
 
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
 const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
@@ -181,11 +189,9 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(dataForm.value).then((res) => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -195,42 +201,23 @@
     }
   })
 }
-
-// 获取样品详情
+//
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
 const getInfo = () => {
-  // getSapmleDetail({ id: infoId.value }).then((res) => {
-  dataForm.value = {
-    orderId: '123',
-    ABC: 'A',
-    companyAddress: '北京/北京市',
-    customerName: '京东集团',
-    customerNo: 'sygf202211290001',
-    id: '111111',
-    labelBind: '11222',
-    manufacturer: '北京某厂家',
-    manufacturerCountry: 'CN',
-    manufacturingDate: '2023-03',
-    manufacturingNo: '123121',
-    mesureCategory: '',
-    mesureContent: '项目1',
-    mesurePeriod: '1',
-    mesureType: '',
-    minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-    phone: '950618',
-    postalCode: 'test',
-    remark: '无备注',
-    sampleModel: '型号1',
-    sampleName: '样品1',
-    sampleNo: '123456',
-    measureResultCode: 'bhg',
-    deliverer: '张三',
-    delivererTel: '156254577545',
-    certifications: '1',
-  }
-  // for (const item of menu) {
-  //   item.searchFunc()
-  // }
-  // })
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList
+    taskForm.value.measureSendBackList = res.data.measureSendBackList
+  })
 }
 
 // 点击标签绑定的扫描
@@ -260,7 +247,7 @@
     fd.append('multipartFile', event.target.files[0])
     // UploadFile(fd).then((res) => {
     //   if (res.code === 200) {
-    //     dataForm.value.minioFileName = res.data[0]
+    //     sampleForm.value.minioFileName = res.data[0]
     //     // 重置当前验证
     //     ElMessage.success('文件上传成功')
     //   }
@@ -273,18 +260,30 @@
 const upload = () => {
   fileRef.value.click()
 }
-// 获取样品详情
-getInfo()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.role) {
+  roleType.value = $route.params.role as string // 使用角色
+
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+    getSampleInfo()
+  }
+}
 </script>
 
 <template>
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -294,7 +293,7 @@
       <div id="form">
         <el-form
           ref="ruleFormRef"
-          :model="dataForm"
+          :model="sampleForm"
           :label-width="120"
           label-position="right"
           :rules="rules"
@@ -303,9 +302,9 @@
             <el-col :span="6">
               <el-form-item label="样品编号:" prop="sampleNo">
                 <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -313,9 +312,9 @@
             <el-col :span="6">
               <el-form-item label="样品名称:" prop="sampleName">
                 <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -323,9 +322,9 @@
             <el-col :span="6">
               <el-form-item label="样品型号:" prop="sampleModel">
                 <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -333,9 +332,9 @@
             <el-col :span="6">
               <el-form-item label="出厂编号:" prop="manufacturingNo">
                 <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -343,9 +342,9 @@
             <el-col :span="6">
               <el-form-item label="委托方代码" prop="customerNo">
                 <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -353,9 +352,9 @@
             <el-col :span="6">
               <el-form-item label="委托方名称" prop="customerName">
                 <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -363,9 +362,9 @@
             <el-col :span="6">
               <el-form-item label="委托方电话" prop="phone">
                 <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -373,9 +372,9 @@
             <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -383,11 +382,11 @@
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
-                  v-model="dataForm.companyAddress"
+                  v-model="sampleForm.customerAddress"
                   type="textarea"
                   autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -395,9 +394,9 @@
             <el-col :span="6">
               <el-form-item label="校检类别:">
                 <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
@@ -407,19 +406,19 @@
             <el-col :span="6">
               <el-form-item label="生产厂家:">
                 <el-input
-                  v-model="dataForm.manufacturer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="厂家国别:">
                 <el-select
-                  v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
@@ -429,23 +428,23 @@
             <el-col :span="6">
               <el-form-item label="出厂年月:">
                 <el-date-picker
-                  v-model="dataForm.manufacturingDate"
+                  v-model="sampleForm.manufacturingDate"
                   type="month"
                   format="YYYY-MM"
                   value-format="YYYY-MM"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="ABC:">
                 <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
@@ -455,9 +454,9 @@
             <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -465,9 +464,9 @@
             <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
-                  v-model="dataForm.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -475,49 +474,20 @@
             <el-col :span="24">
               <el-form-item label="检定项目:" prop="mesureContent">
                 <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定周期（月）:">
                 <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="上次检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  disabled
-                  class="full-width-input"
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
@@ -526,21 +496,21 @@
             <el-col :span="24">
               <el-form-item label="备注:">
                 <el-input
-                  v-model="dataForm.remark"
+                  v-model="sampleForm.remark"
                   type="textarea"
                   :rows="2"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
-                  v-model="dataForm.mesureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
@@ -550,10 +520,10 @@
             <el-col :span="6">
               <el-form-item label="标签绑定:">
                 <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 >
                   <template #append>
                     <el-button>扫描</el-button>
@@ -565,11 +535,11 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="14">
               <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
             </el-col>
@@ -586,7 +556,7 @@
           保存
         </el-button>
       </template>
-      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
@@ -604,11 +574,11 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="dataForm.id!" :order-id="dataForm.orderId" />
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
       <!-- 检定记录 -->
-      <measure-records v-if="currentMenu === '检定记录'" :sample-id="dataForm.id!" />
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
-      <certification-records v-if="currentMenu === '检定证书'" :sample-id="dataForm.id!" />
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index f784804..461c518 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -31,7 +31,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
@@ -39,30 +39,30 @@
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
-  { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center' },
-  { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
-  { text: '分发性质', value: 'distributeState', align: 'center', width: '90px' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return row.alreadyCertifications ? `${row.alreadyCertifications}/${row.requireCertifications}` : '0/0' } },
+  { text: '分发性质', value: 'handOutProperty', align: 'center', width: '90px' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -80,15 +80,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // // 模拟数据
-  // list.value = [
-  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  // ]
-  // loadingTable.value = false
-  // console.log(listQuery.value)
   getTaskList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -111,15 +107,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
+    sampleBelong: '', // 样品属性
     sampleStatus: '2', // 分发状态
+    startTime: '', //	应检定开始时间
+    endTime: '', //	应检定结束时间
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -271,8 +269,8 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue
index 629b33c..2300f4c 100644
--- a/src/views/customer/advice/adviceEdit.vue
+++ b/src/views/customer/advice/adviceEdit.vue
@@ -51,7 +51,7 @@
 const companyInfo: SimpleCompany = reactive({
   customerName: '', // 公司名称
   customerNo: '', //	客户编号
-  customerId: '', // 客户id
+  id: '', // 客户id
   grade: '', // 履约评级
   gradeName: '', // 履约评级
   companySize: '', // 公司规模
@@ -121,12 +121,13 @@
   const item = select as SimpleCompany
   companyInfo.customerName = item.customerName
   companyInfo.customerNo = item.customerNo
-  companyInfo.customerId = item.customerId
+  companyInfo.id = item.id
   companyInfo.gradeName = item.gradeName
   companyInfo.companySizeName = item.companySizeName
   companyInfo.businessSizeName = item.businessSizeName
   companyInfo.evaluationName = item.evaluationName
   dataForm.value.customerNo = item.customerNo
+  dataForm.value.customerId = item.id
 }
 // 打印表单
 const printObj = ref({
@@ -154,8 +155,6 @@
         if (dataForm.value.id) {
           updateAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -164,8 +163,6 @@
         else {
           addAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
diff --git a/src/views/customer/advice/advice_interface.ts b/src/views/customer/advice/advice_interface.ts
index b08f85b..a8bf311 100644
--- a/src/views/customer/advice/advice_interface.ts
+++ b/src/views/customer/advice/advice_interface.ts
@@ -40,9 +40,10 @@
 
 // 公司简易
 export interface SimpleCompany {
+  id: string // 客户id
   customerName: string // 公司名称
   customerNo: string //	客户编号
-  customerId: string // 客户id
+  grade: string // 履约评级
   gradeName: string // 履约评级
   companySizeName: string // 公司规模
   businessSizeName: string // 业务规模
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index f9ee314..4893c4f 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -26,6 +26,7 @@
 const visible = ref(false) // 控制对话框显隐
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -54,17 +55,7 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
-})
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
+})// 表单
 const ruleFormRef = ref<FormInstance>()
 
 // 自定义校验规则--检定周期为正整数
@@ -111,6 +102,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -479,7 +474,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index aceea6a..abcada5 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -36,7 +36,14 @@
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
-  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: ISampleList) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ISampleList[]>([])
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index aafed2a..256ed9f 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -24,6 +24,7 @@
   measurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
   remark: string // 备注
+  validDeadline?: string // 证书过期时间
 }
 
 export interface ISampleEdit {
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 3b03275..d04456b 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -163,7 +163,7 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
+          <el-select v-model="listQuery.businessSize" placeholder="业务规模">
             <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
@@ -183,7 +183,16 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirm">
           确定
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 59f2feb..4deeed8 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -20,18 +20,9 @@
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 
 const dataForm: Ref<ISampleDetail> = ref({
   id: '',
@@ -74,6 +65,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -358,7 +353,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 05fe276..7251eda 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -4,12 +4,16 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOvertimeList, IOvertimeListQuery } from './overtime_list_interface'
+import { ITEM_RENDER_EVT } from 'element-plus/es/components/virtual-list/src/defaults'
+import type { IOvertimeList, IOvertimeListQuery, dictType } from './overtime_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportSapmleList, getSampleList } from '@/api/customer/sampleList'
+import { getDictByCode } from '@/api/system/dict'
+
 const { proxy } = getCurrentInstance() as any
+const certificationStatusMap = ref<dictType[]>([]) as any // 证书状况
 const $router = useRouter()
 
 // 查询条件
@@ -25,12 +29,7 @@
   offset: 1,
   limit: 20,
 })
-// 证书状况字典
-const certificationStatusMap = {
-  0: '未超期',
-  1: '即将超期',
-  2: '已超期',
-}
+
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
@@ -42,7 +41,13 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
-  { text: '证书状况', value: 'certificationStatus', align: 'center' },
+  {
+    text: '证书状况',
+    value: 'certificationStatus',
+    align: 'center',
+    width: '90px',
+    styleFilter: (row: IOvertimeList) => { return row.certificationStatus === '即将超期' ? 'color: red' : '' },
+  },
 ])
 // 表格数据
 const list = ref<IOvertimeList[]>([])
@@ -53,6 +58,16 @@
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
+// 获取字典值
+async function getDict() {
+  // 证书状况
+  const res = await getDictByCode('certificationStatus')
+  // 证书状况字典 {1：即将过期}
+  res.data.forEach((item: any) => {
+    certificationStatusMap.value[`${item.value}`] = item.name
+  })
+}
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -63,7 +78,12 @@
   listQuery.value.startTime = timeRange.value[0] as string || ''
   listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: IOvertimeList) => {
+      return {
+        ...item,
+        certificationStatus: certificationStatusMap.value[item.certificationStatus],
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -161,7 +181,10 @@
   }
 }
 
-fetchData(true)
+onMounted(async () => {
+  await getDict()
+  fetchData(true)
+})
 </script>
 
 <template>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
new file mode 100644
index 0000000..d6827e4
--- /dev/null
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts" name="DistributeDialog">
+import processConfig from './processConfig.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { getTaskDetail } from '@/api/business/task'
+// 任务分发弹窗
+
+// 自定义方法：close关闭弹窗
+const emit = defineEmits(['close'])
+const dialogVisible = ref(false) // 弹窗显示
+const sampleId = ref('') // 样品id
+const orderId = ref('') // 委托单id
+
+// 委托书-证书类别列表
+const certificationTypes = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  getDictByCode('certificationType').then((response) => {
+    certificationTypes.value = response.data
+  })
+}
+
+getDict()
+// 样品详情
+const sampleDetail = ref({
+  sampleName: '压力表',
+  mesureContent: '压力、ip68',
+  certifications: ['1', '2'],
+  remark: '这是备注',
+  measureProcessList: [],
+  measureSendBackList: [],
+})
+
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    sampleDetail.value.sampleName = res.data.sampleName
+    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.remark = res.data.remark
+    sampleDetail.value.certifications = res.data.certifications
+    sampleDetail.value.measureProcessList = res.data.measureProcessList
+    sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+  })
+}
+// 初始化弹窗
+const initDialog = (orderid: string, sampleid: string) => {
+  dialogVisible.value = true
+  sampleId.value = sampleid
+  orderId.value = orderid
+  getInfo()
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+  emit('close')
+}
+function cancel() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="任务分发" width="1000" @close="cancel">
+    <div class="simple-info">
+      <div class="simple-info-line">
+        <span class="label">样品名称:</span>
+        <el-input v-model="sampleDetail.sampleName" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">证书类别:</span>
+        <el-checkbox-group v-model="sampleDetail.certifications" disabled>
+          <el-checkbox v-for="item in certificationTypes" :key="item.value" :label="item.value">
+            {{ item.name }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="simple-info-line">
+        <span class="label">检定项目:</span>
+        <el-input v-model="sampleDetail.mesureContent" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">备注:</span>
+        <el-input v-model="sampleDetail.remark" disabled />
+      </div>
+    </div>
+    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+      批量添加
+    </el-button>
+    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <template #footer>
+      <el-button type="primary" @click="saveProcess">
+        确定
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//  样式
+.simple-info {
+  margin-top: -10px;
+  margin-bottom: 10px;
+
+  .simple-info-line {
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    .label {
+      width: 90px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/components/lab-interface.ts b/src/views/business/schedule/task/components/lab-interface.ts
index d6355c6..02b0d1d 100644
--- a/src/views/business/schedule/task/components/lab-interface.ts
+++ b/src/views/business/schedule/task/components/lab-interface.ts
@@ -6,7 +6,8 @@
   isLab: '1' // 是否是实验室
   director: string // 负责人
   meterMajor: string // 专业
-  measureItems: string// 检测能力
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
 }
 
 // 部门返回值对象类型
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 4ccab04..1efb8a9 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -1,11 +1,18 @@
 <script setup lang="ts" name="ProcessConfig">
 import { ref } from 'vue'
 import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
 import ProcessNode from './processNode.vue'
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/task'
 const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
   // 是否为详情展示页面
   detail: {
     type: Boolean,
@@ -21,81 +28,35 @@
     type: String,
     required: true,
   },
+  list: {
+    type: Array,
+    default: () => [],
+  },
 })
 const emits = defineEmits(['saveOver'])
 // 默认流程节点
-const defaultProcess = {
-  id: '', // 检测节点id
-  executiveItem: '', // 检测项目
-  executiveDept: '', // 检测部门
-  executiveDeptName: '', // 检测部门
-  executivePerson: '', // 检测人员
-  executivePersonName: '', // 检测人员
-  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-  measureStateName: '', // 检测状态
-  currentCertifications: '', // 当前证书数
-  requireCertifications: '', // 应出具证书数
-  updateTime: '', // 更新时间
-  backPerson: '', // 退回人
-  backReason: '', // 退回原因
-  backTime: '', // 退回时间
-  distributePerson: '', // 分配人
-  distributeTime: '', // 分配时间
-  startTime: '', // 检测开始时间
-  overTime: '', // 检测结束时间
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
 }
 // 检定流程列表
-const processList = ref([
+const processList = ref<IScheduleSet[]>([
   { ...defaultProcess },
 ])
 
-// 获取当前样品检测流程，参数待定
-const fetchProcess = () => {
-  // TODO: 模拟数据
-  processList.value = [
-    {
-      id: '1', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423635973935106', // 检测部门
-      executiveDeptName: '力学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '张三', // 检测人员
-      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待检测', // 检测状态
-      currentCertifications: '0', // 当前证书数
-      requireCertifications: '2', // 应出具证书数
-      updateTime: '2023-02-01 09:00:05', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-    {
-      id: '2', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423577505337346', // 检测部门
-      executiveDeptName: '热学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待分配', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-  ]
-}
-fetchProcess()
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+})
 
 // 点击添加流程
 const processAdd = () => {
@@ -121,25 +82,17 @@
 // 批量添加实验室
 const batchChooseOver = (labs: ILabList[]) => {
   for (const item of labs) {
-    const processTemp = {
-      id: '',
-      executiveItem: '', // 检测项目
-      executiveDept: item.deptId, // 检测部门
-      executiveDeptName: item.organizeName, // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
     }
     processList.value.push(processTemp)
   }
@@ -147,9 +100,24 @@
 
 // 保存流程
 const saveProcess = () => {
-  // TODO: 保存流程
-  console.log(processList.value)
-  emits('saveOver')
+  const form = {
+    measureProcessList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  console.log(form)
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
 }
 // 删除流程
 const deleteProcess = (index: number) => {
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index 6cbdf10..31dfae4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -12,24 +12,16 @@
     type: Object,
     default: () => {
       return {
-        id: '', // 检测节点id
-        executiveItem: '', // 检测项目
-        executiveDept: '', // 检测部门
-        executiveDeptName: '', // 检测部门
-        executivePerson: '', // 检测人员
-        executivePersonName: '', // 检测人员
-        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-        measureStateName: '', // 检测状态
-        currentCertifications: '', // 当前证书数
-        requireCertifications: '', // 应出具证书数
-        updateTime: '', // 更新时间
-        backPerson: '', // 退回人
-        backReason: '', // 退回原因
-        backTime: '', // 退回时间
-        distributePerson: '', // 分配人
-        distributeTime: '', // 分配时间
-        startTime: '', // 检测开始时间
-        overTime: '', // 检测结束时间
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
       }
     },
   },
@@ -56,22 +48,23 @@
 })
 // 检定环节可编辑-只有待分发状态可编辑
 const deptEdit = computed(() => {
-  return processNodeData.value.measureState == '0'
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 检定人可编辑-待分配状态可编辑
 const personEdit = computed(() => {
-  const editStates = ['0', '1']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 证书可编辑-待分发、待分配、待检测状态可编辑
 const certificationEdit = computed(() => {
-  const editStates = ['0', '1', '2']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 节点可移动
 const canMove = computed(() => {
-  const editStates = ['0']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 
 // 选择实验室
@@ -82,8 +75,8 @@
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
   console.log(lab)
-  processNodeData.value.executiveDept = lab.deptId
-  processNodeData.value.executiveDeptName = lab.organizeName
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
 }
 
 // 选择人员
@@ -93,8 +86,8 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
-  processNodeData.value.executivePerson = person.id
-  processNodeData.value.executivePersonName = person.name
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
 }
 
@@ -122,7 +115,7 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit">
           <template v-if="deptEdit" #append>
             <el-button :icon="Aim" size="small" link @click="clickChoose" />
           </template>
@@ -130,7 +123,7 @@
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit">
           <template v-if="personEdit" #append>
             <el-button :icon="Aim" size="small" link @click="choosePerson" />
           </template>
@@ -140,7 +133,7 @@
         <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
       <div class="line">
-        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
       </div>
       <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
@@ -149,7 +142,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 1d02839..493fbba 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,5 +1,3 @@
-import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
-
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -8,12 +6,29 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
   offset: number
 }
 
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
 // 任务列表-返回值
 export interface ITaskList {
   orderId: string // 委托书编号
@@ -25,41 +40,127 @@
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  isUrgent: string // 是否加急
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
   requireOverTime: string // 应检完时间
-  sampleAttr: string // 样品属性
-  sampleAttrName: string // 样品属性
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
   currentMeasureState: string // 当前检定环节
   currentMeasureStateName: string // 当前检定环节
-  currentCertifications: number // 已出具证书总数
+  alreadyCertifications: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
-  distributeStateName: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
 }
 
-// 检测流程节点
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+}
+
+// 全部检测流程节点
 export interface ISchedule {
-  executivePerson: string // 执行人
-  executivePersonName: string // 执行人名称
-  executiveDept: string // 执行部门
-  executiveDeptName: string // 执行部门名称
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
   executiveItem: string // 检定项目
-  currentCertifications?: number // 已出具证书总数
+  alreadyCertifications?: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  measureState: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
   updateTime: string // 流程更新时间
-  backTime: string // 退回时间
-  backReason: string // 退回原因
-  backPerson: string // 退回人
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
   distributePerson: string // 分配人
   distributeTime: string // 分配时间
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
 
 // 样品检测信息
-export interface ISampleMeasure extends ISampleEdit {
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
   orderId: string // 委托单id
+  orderCode: string // 委托单编号
   certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
 }
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 465b2e7..547ee3e 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,28 +1,27 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
-import type { ISampleMeasure } from './task-interface'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
 import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getTaskDetail } from '@/api/business/task'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // 样品详情id
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -39,32 +38,49 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleMeasure> = ref({
-  id: '',
-  orderId: '', // 委托单id
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
   postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
   manufacturer: '', // 生产厂家
   manufacturerCountry: '', // 厂家国别
   manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
   remark: '', // 备注
   minioFileName: '', // 说明书
   labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-  certifications: '',
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
 })
 const ruleFormRef = ref<FormInstance>()
 
@@ -143,14 +159,6 @@
   return menu.find(item => item.name === currentMenu.value)
 })
 
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
 const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
@@ -181,11 +189,9 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(dataForm.value).then((res) => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -195,42 +201,23 @@
     }
   })
 }
-
-// 获取样品详情
+//
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
 const getInfo = () => {
-  // getSapmleDetail({ id: infoId.value }).then((res) => {
-  dataForm.value = {
-    orderId: '123',
-    ABC: 'A',
-    companyAddress: '北京/北京市',
-    customerName: '京东集团',
-    customerNo: 'sygf202211290001',
-    id: '111111',
-    labelBind: '11222',
-    manufacturer: '北京某厂家',
-    manufacturerCountry: 'CN',
-    manufacturingDate: '2023-03',
-    manufacturingNo: '123121',
-    mesureCategory: '',
-    mesureContent: '项目1',
-    mesurePeriod: '1',
-    mesureType: '',
-    minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-    phone: '950618',
-    postalCode: 'test',
-    remark: '无备注',
-    sampleModel: '型号1',
-    sampleName: '样品1',
-    sampleNo: '123456',
-    measureResultCode: 'bhg',
-    deliverer: '张三',
-    delivererTel: '156254577545',
-    certifications: '1',
-  }
-  // for (const item of menu) {
-  //   item.searchFunc()
-  // }
-  // })
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList
+    taskForm.value.measureSendBackList = res.data.measureSendBackList
+  })
 }
 
 // 点击标签绑定的扫描
@@ -260,7 +247,7 @@
     fd.append('multipartFile', event.target.files[0])
     // UploadFile(fd).then((res) => {
     //   if (res.code === 200) {
-    //     dataForm.value.minioFileName = res.data[0]
+    //     sampleForm.value.minioFileName = res.data[0]
     //     // 重置当前验证
     //     ElMessage.success('文件上传成功')
     //   }
@@ -273,18 +260,30 @@
 const upload = () => {
   fileRef.value.click()
 }
-// 获取样品详情
-getInfo()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.role) {
+  roleType.value = $route.params.role as string // 使用角色
+
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+    getSampleInfo()
+  }
+}
 </script>
 
 <template>
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -294,7 +293,7 @@
       <div id="form">
         <el-form
           ref="ruleFormRef"
-          :model="dataForm"
+          :model="sampleForm"
           :label-width="120"
           label-position="right"
           :rules="rules"
@@ -303,9 +302,9 @@
             <el-col :span="6">
               <el-form-item label="样品编号:" prop="sampleNo">
                 <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -313,9 +312,9 @@
             <el-col :span="6">
               <el-form-item label="样品名称:" prop="sampleName">
                 <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -323,9 +322,9 @@
             <el-col :span="6">
               <el-form-item label="样品型号:" prop="sampleModel">
                 <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -333,9 +332,9 @@
             <el-col :span="6">
               <el-form-item label="出厂编号:" prop="manufacturingNo">
                 <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -343,9 +342,9 @@
             <el-col :span="6">
               <el-form-item label="委托方代码" prop="customerNo">
                 <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -353,9 +352,9 @@
             <el-col :span="6">
               <el-form-item label="委托方名称" prop="customerName">
                 <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -363,9 +362,9 @@
             <el-col :span="6">
               <el-form-item label="委托方电话" prop="phone">
                 <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -373,9 +372,9 @@
             <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -383,11 +382,11 @@
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
-                  v-model="dataForm.companyAddress"
+                  v-model="sampleForm.customerAddress"
                   type="textarea"
                   autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -395,9 +394,9 @@
             <el-col :span="6">
               <el-form-item label="校检类别:">
                 <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
@@ -407,19 +406,19 @@
             <el-col :span="6">
               <el-form-item label="生产厂家:">
                 <el-input
-                  v-model="dataForm.manufacturer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="厂家国别:">
                 <el-select
-                  v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
@@ -429,23 +428,23 @@
             <el-col :span="6">
               <el-form-item label="出厂年月:">
                 <el-date-picker
-                  v-model="dataForm.manufacturingDate"
+                  v-model="sampleForm.manufacturingDate"
                   type="month"
                   format="YYYY-MM"
                   value-format="YYYY-MM"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="ABC:">
                 <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
@@ -455,9 +454,9 @@
             <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -465,9 +464,9 @@
             <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
-                  v-model="dataForm.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -475,49 +474,20 @@
             <el-col :span="24">
               <el-form-item label="检定项目:" prop="mesureContent">
                 <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定周期（月）:">
                 <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="上次检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  disabled
-                  class="full-width-input"
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
@@ -526,21 +496,21 @@
             <el-col :span="24">
               <el-form-item label="备注:">
                 <el-input
-                  v-model="dataForm.remark"
+                  v-model="sampleForm.remark"
                   type="textarea"
                   :rows="2"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
-                  v-model="dataForm.mesureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
@@ -550,10 +520,10 @@
             <el-col :span="6">
               <el-form-item label="标签绑定:">
                 <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 >
                   <template #append>
                     <el-button>扫描</el-button>
@@ -565,11 +535,11 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="14">
               <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
             </el-col>
@@ -586,7 +556,7 @@
           保存
         </el-button>
       </template>
-      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
@@ -604,11 +574,11 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="dataForm.id!" :order-id="dataForm.orderId" />
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
       <!-- 检定记录 -->
-      <measure-records v-if="currentMenu === '检定记录'" :sample-id="dataForm.id!" />
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
-      <certification-records v-if="currentMenu === '检定证书'" :sample-id="dataForm.id!" />
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index f784804..461c518 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -31,7 +31,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
@@ -39,30 +39,30 @@
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
-  { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center' },
-  { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
-  { text: '分发性质', value: 'distributeState', align: 'center', width: '90px' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return row.alreadyCertifications ? `${row.alreadyCertifications}/${row.requireCertifications}` : '0/0' } },
+  { text: '分发性质', value: 'handOutProperty', align: 'center', width: '90px' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -80,15 +80,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // // 模拟数据
-  // list.value = [
-  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  // ]
-  // loadingTable.value = false
-  // console.log(listQuery.value)
   getTaskList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -111,15 +107,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
+    sampleBelong: '', // 样品属性
     sampleStatus: '2', // 分发状态
+    startTime: '', //	应检定开始时间
+    endTime: '', //	应检定结束时间
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -271,8 +269,8 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue
index 629b33c..2300f4c 100644
--- a/src/views/customer/advice/adviceEdit.vue
+++ b/src/views/customer/advice/adviceEdit.vue
@@ -51,7 +51,7 @@
 const companyInfo: SimpleCompany = reactive({
   customerName: '', // 公司名称
   customerNo: '', //	客户编号
-  customerId: '', // 客户id
+  id: '', // 客户id
   grade: '', // 履约评级
   gradeName: '', // 履约评级
   companySize: '', // 公司规模
@@ -121,12 +121,13 @@
   const item = select as SimpleCompany
   companyInfo.customerName = item.customerName
   companyInfo.customerNo = item.customerNo
-  companyInfo.customerId = item.customerId
+  companyInfo.id = item.id
   companyInfo.gradeName = item.gradeName
   companyInfo.companySizeName = item.companySizeName
   companyInfo.businessSizeName = item.businessSizeName
   companyInfo.evaluationName = item.evaluationName
   dataForm.value.customerNo = item.customerNo
+  dataForm.value.customerId = item.id
 }
 // 打印表单
 const printObj = ref({
@@ -154,8 +155,6 @@
         if (dataForm.value.id) {
           updateAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -164,8 +163,6 @@
         else {
           addAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
diff --git a/src/views/customer/advice/advice_interface.ts b/src/views/customer/advice/advice_interface.ts
index b08f85b..a8bf311 100644
--- a/src/views/customer/advice/advice_interface.ts
+++ b/src/views/customer/advice/advice_interface.ts
@@ -40,9 +40,10 @@
 
 // 公司简易
 export interface SimpleCompany {
+  id: string // 客户id
   customerName: string // 公司名称
   customerNo: string //	客户编号
-  customerId: string // 客户id
+  grade: string // 履约评级
   gradeName: string // 履约评级
   companySizeName: string // 公司规模
   businessSizeName: string // 业务规模
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index f9ee314..4893c4f 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -26,6 +26,7 @@
 const visible = ref(false) // 控制对话框显隐
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -54,17 +55,7 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
-})
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
+})// 表单
 const ruleFormRef = ref<FormInstance>()
 
 // 自定义校验规则--检定周期为正整数
@@ -111,6 +102,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -479,7 +474,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index aceea6a..abcada5 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -36,7 +36,14 @@
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
-  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: ISampleList) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ISampleList[]>([])
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index aafed2a..256ed9f 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -24,6 +24,7 @@
   measurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
   remark: string // 备注
+  validDeadline?: string // 证书过期时间
 }
 
 export interface ISampleEdit {
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 3b03275..d04456b 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -163,7 +163,7 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
+          <el-select v-model="listQuery.businessSize" placeholder="业务规模">
             <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
@@ -183,7 +183,16 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirm">
           确定
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 59f2feb..4deeed8 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -20,18 +20,9 @@
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 
 const dataForm: Ref<ISampleDetail> = ref({
   id: '',
@@ -74,6 +65,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -358,7 +353,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 05fe276..7251eda 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -4,12 +4,16 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOvertimeList, IOvertimeListQuery } from './overtime_list_interface'
+import { ITEM_RENDER_EVT } from 'element-plus/es/components/virtual-list/src/defaults'
+import type { IOvertimeList, IOvertimeListQuery, dictType } from './overtime_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportSapmleList, getSampleList } from '@/api/customer/sampleList'
+import { getDictByCode } from '@/api/system/dict'
+
 const { proxy } = getCurrentInstance() as any
+const certificationStatusMap = ref<dictType[]>([]) as any // 证书状况
 const $router = useRouter()
 
 // 查询条件
@@ -25,12 +29,7 @@
   offset: 1,
   limit: 20,
 })
-// 证书状况字典
-const certificationStatusMap = {
-  0: '未超期',
-  1: '即将超期',
-  2: '已超期',
-}
+
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
@@ -42,7 +41,13 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
-  { text: '证书状况', value: 'certificationStatus', align: 'center' },
+  {
+    text: '证书状况',
+    value: 'certificationStatus',
+    align: 'center',
+    width: '90px',
+    styleFilter: (row: IOvertimeList) => { return row.certificationStatus === '即将超期' ? 'color: red' : '' },
+  },
 ])
 // 表格数据
 const list = ref<IOvertimeList[]>([])
@@ -53,6 +58,16 @@
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
+// 获取字典值
+async function getDict() {
+  // 证书状况
+  const res = await getDictByCode('certificationStatus')
+  // 证书状况字典 {1：即将过期}
+  res.data.forEach((item: any) => {
+    certificationStatusMap.value[`${item.value}`] = item.name
+  })
+}
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -63,7 +78,12 @@
   listQuery.value.startTime = timeRange.value[0] as string || ''
   listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: IOvertimeList) => {
+      return {
+        ...item,
+        certificationStatus: certificationStatusMap.value[item.certificationStatus],
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -161,7 +181,10 @@
   }
 }
 
-fetchData(true)
+onMounted(async () => {
+  await getDict()
+  fetchData(true)
+})
 </script>
 
 <template>
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 519f0af..cceb09b 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -135,7 +135,7 @@
         @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
new file mode 100644
index 0000000..d6827e4
--- /dev/null
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts" name="DistributeDialog">
+import processConfig from './processConfig.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { getTaskDetail } from '@/api/business/task'
+// 任务分发弹窗
+
+// 自定义方法：close关闭弹窗
+const emit = defineEmits(['close'])
+const dialogVisible = ref(false) // 弹窗显示
+const sampleId = ref('') // 样品id
+const orderId = ref('') // 委托单id
+
+// 委托书-证书类别列表
+const certificationTypes = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  getDictByCode('certificationType').then((response) => {
+    certificationTypes.value = response.data
+  })
+}
+
+getDict()
+// 样品详情
+const sampleDetail = ref({
+  sampleName: '压力表',
+  mesureContent: '压力、ip68',
+  certifications: ['1', '2'],
+  remark: '这是备注',
+  measureProcessList: [],
+  measureSendBackList: [],
+})
+
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    sampleDetail.value.sampleName = res.data.sampleName
+    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.remark = res.data.remark
+    sampleDetail.value.certifications = res.data.certifications
+    sampleDetail.value.measureProcessList = res.data.measureProcessList
+    sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+  })
+}
+// 初始化弹窗
+const initDialog = (orderid: string, sampleid: string) => {
+  dialogVisible.value = true
+  sampleId.value = sampleid
+  orderId.value = orderid
+  getInfo()
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+  emit('close')
+}
+function cancel() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="任务分发" width="1000" @close="cancel">
+    <div class="simple-info">
+      <div class="simple-info-line">
+        <span class="label">样品名称:</span>
+        <el-input v-model="sampleDetail.sampleName" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">证书类别:</span>
+        <el-checkbox-group v-model="sampleDetail.certifications" disabled>
+          <el-checkbox v-for="item in certificationTypes" :key="item.value" :label="item.value">
+            {{ item.name }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="simple-info-line">
+        <span class="label">检定项目:</span>
+        <el-input v-model="sampleDetail.mesureContent" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">备注:</span>
+        <el-input v-model="sampleDetail.remark" disabled />
+      </div>
+    </div>
+    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+      批量添加
+    </el-button>
+    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <template #footer>
+      <el-button type="primary" @click="saveProcess">
+        确定
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//  样式
+.simple-info {
+  margin-top: -10px;
+  margin-bottom: 10px;
+
+  .simple-info-line {
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    .label {
+      width: 90px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/components/lab-interface.ts b/src/views/business/schedule/task/components/lab-interface.ts
index d6355c6..02b0d1d 100644
--- a/src/views/business/schedule/task/components/lab-interface.ts
+++ b/src/views/business/schedule/task/components/lab-interface.ts
@@ -6,7 +6,8 @@
   isLab: '1' // 是否是实验室
   director: string // 负责人
   meterMajor: string // 专业
-  measureItems: string// 检测能力
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
 }
 
 // 部门返回值对象类型
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 4ccab04..1efb8a9 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -1,11 +1,18 @@
 <script setup lang="ts" name="ProcessConfig">
 import { ref } from 'vue'
 import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
 import ProcessNode from './processNode.vue'
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/task'
 const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
   // 是否为详情展示页面
   detail: {
     type: Boolean,
@@ -21,81 +28,35 @@
     type: String,
     required: true,
   },
+  list: {
+    type: Array,
+    default: () => [],
+  },
 })
 const emits = defineEmits(['saveOver'])
 // 默认流程节点
-const defaultProcess = {
-  id: '', // 检测节点id
-  executiveItem: '', // 检测项目
-  executiveDept: '', // 检测部门
-  executiveDeptName: '', // 检测部门
-  executivePerson: '', // 检测人员
-  executivePersonName: '', // 检测人员
-  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-  measureStateName: '', // 检测状态
-  currentCertifications: '', // 当前证书数
-  requireCertifications: '', // 应出具证书数
-  updateTime: '', // 更新时间
-  backPerson: '', // 退回人
-  backReason: '', // 退回原因
-  backTime: '', // 退回时间
-  distributePerson: '', // 分配人
-  distributeTime: '', // 分配时间
-  startTime: '', // 检测开始时间
-  overTime: '', // 检测结束时间
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
 }
 // 检定流程列表
-const processList = ref([
+const processList = ref<IScheduleSet[]>([
   { ...defaultProcess },
 ])
 
-// 获取当前样品检测流程，参数待定
-const fetchProcess = () => {
-  // TODO: 模拟数据
-  processList.value = [
-    {
-      id: '1', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423635973935106', // 检测部门
-      executiveDeptName: '力学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '张三', // 检测人员
-      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待检测', // 检测状态
-      currentCertifications: '0', // 当前证书数
-      requireCertifications: '2', // 应出具证书数
-      updateTime: '2023-02-01 09:00:05', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-    {
-      id: '2', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423577505337346', // 检测部门
-      executiveDeptName: '热学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待分配', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-  ]
-}
-fetchProcess()
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+})
 
 // 点击添加流程
 const processAdd = () => {
@@ -121,25 +82,17 @@
 // 批量添加实验室
 const batchChooseOver = (labs: ILabList[]) => {
   for (const item of labs) {
-    const processTemp = {
-      id: '',
-      executiveItem: '', // 检测项目
-      executiveDept: item.deptId, // 检测部门
-      executiveDeptName: item.organizeName, // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
     }
     processList.value.push(processTemp)
   }
@@ -147,9 +100,24 @@
 
 // 保存流程
 const saveProcess = () => {
-  // TODO: 保存流程
-  console.log(processList.value)
-  emits('saveOver')
+  const form = {
+    measureProcessList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  console.log(form)
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
 }
 // 删除流程
 const deleteProcess = (index: number) => {
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index 6cbdf10..31dfae4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -12,24 +12,16 @@
     type: Object,
     default: () => {
       return {
-        id: '', // 检测节点id
-        executiveItem: '', // 检测项目
-        executiveDept: '', // 检测部门
-        executiveDeptName: '', // 检测部门
-        executivePerson: '', // 检测人员
-        executivePersonName: '', // 检测人员
-        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-        measureStateName: '', // 检测状态
-        currentCertifications: '', // 当前证书数
-        requireCertifications: '', // 应出具证书数
-        updateTime: '', // 更新时间
-        backPerson: '', // 退回人
-        backReason: '', // 退回原因
-        backTime: '', // 退回时间
-        distributePerson: '', // 分配人
-        distributeTime: '', // 分配时间
-        startTime: '', // 检测开始时间
-        overTime: '', // 检测结束时间
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
       }
     },
   },
@@ -56,22 +48,23 @@
 })
 // 检定环节可编辑-只有待分发状态可编辑
 const deptEdit = computed(() => {
-  return processNodeData.value.measureState == '0'
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 检定人可编辑-待分配状态可编辑
 const personEdit = computed(() => {
-  const editStates = ['0', '1']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 证书可编辑-待分发、待分配、待检测状态可编辑
 const certificationEdit = computed(() => {
-  const editStates = ['0', '1', '2']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 节点可移动
 const canMove = computed(() => {
-  const editStates = ['0']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 
 // 选择实验室
@@ -82,8 +75,8 @@
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
   console.log(lab)
-  processNodeData.value.executiveDept = lab.deptId
-  processNodeData.value.executiveDeptName = lab.organizeName
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
 }
 
 // 选择人员
@@ -93,8 +86,8 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
-  processNodeData.value.executivePerson = person.id
-  processNodeData.value.executivePersonName = person.name
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
 }
 
@@ -122,7 +115,7 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit">
           <template v-if="deptEdit" #append>
             <el-button :icon="Aim" size="small" link @click="clickChoose" />
           </template>
@@ -130,7 +123,7 @@
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit">
           <template v-if="personEdit" #append>
             <el-button :icon="Aim" size="small" link @click="choosePerson" />
           </template>
@@ -140,7 +133,7 @@
         <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
       <div class="line">
-        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
       </div>
       <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
@@ -149,7 +142,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 1d02839..493fbba 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,5 +1,3 @@
-import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
-
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -8,12 +6,29 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
   offset: number
 }
 
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
 // 任务列表-返回值
 export interface ITaskList {
   orderId: string // 委托书编号
@@ -25,41 +40,127 @@
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  isUrgent: string // 是否加急
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
   requireOverTime: string // 应检完时间
-  sampleAttr: string // 样品属性
-  sampleAttrName: string // 样品属性
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
   currentMeasureState: string // 当前检定环节
   currentMeasureStateName: string // 当前检定环节
-  currentCertifications: number // 已出具证书总数
+  alreadyCertifications: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
-  distributeStateName: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
 }
 
-// 检测流程节点
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+}
+
+// 全部检测流程节点
 export interface ISchedule {
-  executivePerson: string // 执行人
-  executivePersonName: string // 执行人名称
-  executiveDept: string // 执行部门
-  executiveDeptName: string // 执行部门名称
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
   executiveItem: string // 检定项目
-  currentCertifications?: number // 已出具证书总数
+  alreadyCertifications?: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  measureState: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
   updateTime: string // 流程更新时间
-  backTime: string // 退回时间
-  backReason: string // 退回原因
-  backPerson: string // 退回人
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
   distributePerson: string // 分配人
   distributeTime: string // 分配时间
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
 
 // 样品检测信息
-export interface ISampleMeasure extends ISampleEdit {
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
   orderId: string // 委托单id
+  orderCode: string // 委托单编号
   certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
 }
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 465b2e7..547ee3e 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,28 +1,27 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
-import type { ISampleMeasure } from './task-interface'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
 import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getTaskDetail } from '@/api/business/task'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // 样品详情id
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -39,32 +38,49 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleMeasure> = ref({
-  id: '',
-  orderId: '', // 委托单id
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
   postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
   manufacturer: '', // 生产厂家
   manufacturerCountry: '', // 厂家国别
   manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
   remark: '', // 备注
   minioFileName: '', // 说明书
   labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-  certifications: '',
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
 })
 const ruleFormRef = ref<FormInstance>()
 
@@ -143,14 +159,6 @@
   return menu.find(item => item.name === currentMenu.value)
 })
 
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
 const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
@@ -181,11 +189,9 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(dataForm.value).then((res) => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -195,42 +201,23 @@
     }
   })
 }
-
-// 获取样品详情
+//
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
 const getInfo = () => {
-  // getSapmleDetail({ id: infoId.value }).then((res) => {
-  dataForm.value = {
-    orderId: '123',
-    ABC: 'A',
-    companyAddress: '北京/北京市',
-    customerName: '京东集团',
-    customerNo: 'sygf202211290001',
-    id: '111111',
-    labelBind: '11222',
-    manufacturer: '北京某厂家',
-    manufacturerCountry: 'CN',
-    manufacturingDate: '2023-03',
-    manufacturingNo: '123121',
-    mesureCategory: '',
-    mesureContent: '项目1',
-    mesurePeriod: '1',
-    mesureType: '',
-    minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-    phone: '950618',
-    postalCode: 'test',
-    remark: '无备注',
-    sampleModel: '型号1',
-    sampleName: '样品1',
-    sampleNo: '123456',
-    measureResultCode: 'bhg',
-    deliverer: '张三',
-    delivererTel: '156254577545',
-    certifications: '1',
-  }
-  // for (const item of menu) {
-  //   item.searchFunc()
-  // }
-  // })
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList
+    taskForm.value.measureSendBackList = res.data.measureSendBackList
+  })
 }
 
 // 点击标签绑定的扫描
@@ -260,7 +247,7 @@
     fd.append('multipartFile', event.target.files[0])
     // UploadFile(fd).then((res) => {
     //   if (res.code === 200) {
-    //     dataForm.value.minioFileName = res.data[0]
+    //     sampleForm.value.minioFileName = res.data[0]
     //     // 重置当前验证
     //     ElMessage.success('文件上传成功')
     //   }
@@ -273,18 +260,30 @@
 const upload = () => {
   fileRef.value.click()
 }
-// 获取样品详情
-getInfo()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.role) {
+  roleType.value = $route.params.role as string // 使用角色
+
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+    getSampleInfo()
+  }
+}
 </script>
 
 <template>
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -294,7 +293,7 @@
       <div id="form">
         <el-form
           ref="ruleFormRef"
-          :model="dataForm"
+          :model="sampleForm"
           :label-width="120"
           label-position="right"
           :rules="rules"
@@ -303,9 +302,9 @@
             <el-col :span="6">
               <el-form-item label="样品编号:" prop="sampleNo">
                 <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -313,9 +312,9 @@
             <el-col :span="6">
               <el-form-item label="样品名称:" prop="sampleName">
                 <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -323,9 +322,9 @@
             <el-col :span="6">
               <el-form-item label="样品型号:" prop="sampleModel">
                 <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -333,9 +332,9 @@
             <el-col :span="6">
               <el-form-item label="出厂编号:" prop="manufacturingNo">
                 <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -343,9 +342,9 @@
             <el-col :span="6">
               <el-form-item label="委托方代码" prop="customerNo">
                 <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -353,9 +352,9 @@
             <el-col :span="6">
               <el-form-item label="委托方名称" prop="customerName">
                 <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -363,9 +362,9 @@
             <el-col :span="6">
               <el-form-item label="委托方电话" prop="phone">
                 <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -373,9 +372,9 @@
             <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -383,11 +382,11 @@
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
-                  v-model="dataForm.companyAddress"
+                  v-model="sampleForm.customerAddress"
                   type="textarea"
                   autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -395,9 +394,9 @@
             <el-col :span="6">
               <el-form-item label="校检类别:">
                 <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
@@ -407,19 +406,19 @@
             <el-col :span="6">
               <el-form-item label="生产厂家:">
                 <el-input
-                  v-model="dataForm.manufacturer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="厂家国别:">
                 <el-select
-                  v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
@@ -429,23 +428,23 @@
             <el-col :span="6">
               <el-form-item label="出厂年月:">
                 <el-date-picker
-                  v-model="dataForm.manufacturingDate"
+                  v-model="sampleForm.manufacturingDate"
                   type="month"
                   format="YYYY-MM"
                   value-format="YYYY-MM"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="ABC:">
                 <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
@@ -455,9 +454,9 @@
             <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -465,9 +464,9 @@
             <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
-                  v-model="dataForm.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -475,49 +474,20 @@
             <el-col :span="24">
               <el-form-item label="检定项目:" prop="mesureContent">
                 <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定周期（月）:">
                 <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="上次检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  disabled
-                  class="full-width-input"
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
@@ -526,21 +496,21 @@
             <el-col :span="24">
               <el-form-item label="备注:">
                 <el-input
-                  v-model="dataForm.remark"
+                  v-model="sampleForm.remark"
                   type="textarea"
                   :rows="2"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
-                  v-model="dataForm.mesureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
@@ -550,10 +520,10 @@
             <el-col :span="6">
               <el-form-item label="标签绑定:">
                 <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 >
                   <template #append>
                     <el-button>扫描</el-button>
@@ -565,11 +535,11 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="14">
               <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
             </el-col>
@@ -586,7 +556,7 @@
           保存
         </el-button>
       </template>
-      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
@@ -604,11 +574,11 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="dataForm.id!" :order-id="dataForm.orderId" />
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
       <!-- 检定记录 -->
-      <measure-records v-if="currentMenu === '检定记录'" :sample-id="dataForm.id!" />
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
-      <certification-records v-if="currentMenu === '检定证书'" :sample-id="dataForm.id!" />
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index f784804..461c518 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -31,7 +31,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
@@ -39,30 +39,30 @@
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
-  { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center' },
-  { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
-  { text: '分发性质', value: 'distributeState', align: 'center', width: '90px' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return row.alreadyCertifications ? `${row.alreadyCertifications}/${row.requireCertifications}` : '0/0' } },
+  { text: '分发性质', value: 'handOutProperty', align: 'center', width: '90px' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -80,15 +80,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // // 模拟数据
-  // list.value = [
-  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  // ]
-  // loadingTable.value = false
-  // console.log(listQuery.value)
   getTaskList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -111,15 +107,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
+    sampleBelong: '', // 样品属性
     sampleStatus: '2', // 分发状态
+    startTime: '', //	应检定开始时间
+    endTime: '', //	应检定结束时间
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -271,8 +269,8 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue
index 629b33c..2300f4c 100644
--- a/src/views/customer/advice/adviceEdit.vue
+++ b/src/views/customer/advice/adviceEdit.vue
@@ -51,7 +51,7 @@
 const companyInfo: SimpleCompany = reactive({
   customerName: '', // 公司名称
   customerNo: '', //	客户编号
-  customerId: '', // 客户id
+  id: '', // 客户id
   grade: '', // 履约评级
   gradeName: '', // 履约评级
   companySize: '', // 公司规模
@@ -121,12 +121,13 @@
   const item = select as SimpleCompany
   companyInfo.customerName = item.customerName
   companyInfo.customerNo = item.customerNo
-  companyInfo.customerId = item.customerId
+  companyInfo.id = item.id
   companyInfo.gradeName = item.gradeName
   companyInfo.companySizeName = item.companySizeName
   companyInfo.businessSizeName = item.businessSizeName
   companyInfo.evaluationName = item.evaluationName
   dataForm.value.customerNo = item.customerNo
+  dataForm.value.customerId = item.id
 }
 // 打印表单
 const printObj = ref({
@@ -154,8 +155,6 @@
         if (dataForm.value.id) {
           updateAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -164,8 +163,6 @@
         else {
           addAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
diff --git a/src/views/customer/advice/advice_interface.ts b/src/views/customer/advice/advice_interface.ts
index b08f85b..a8bf311 100644
--- a/src/views/customer/advice/advice_interface.ts
+++ b/src/views/customer/advice/advice_interface.ts
@@ -40,9 +40,10 @@
 
 // 公司简易
 export interface SimpleCompany {
+  id: string // 客户id
   customerName: string // 公司名称
   customerNo: string //	客户编号
-  customerId: string // 客户id
+  grade: string // 履约评级
   gradeName: string // 履约评级
   companySizeName: string // 公司规模
   businessSizeName: string // 业务规模
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index f9ee314..4893c4f 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -26,6 +26,7 @@
 const visible = ref(false) // 控制对话框显隐
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -54,17 +55,7 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
-})
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
+})// 表单
 const ruleFormRef = ref<FormInstance>()
 
 // 自定义校验规则--检定周期为正整数
@@ -111,6 +102,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -479,7 +474,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index aceea6a..abcada5 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -36,7 +36,14 @@
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
-  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: ISampleList) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ISampleList[]>([])
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index aafed2a..256ed9f 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -24,6 +24,7 @@
   measurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
   remark: string // 备注
+  validDeadline?: string // 证书过期时间
 }
 
 export interface ISampleEdit {
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 3b03275..d04456b 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -163,7 +163,7 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
+          <el-select v-model="listQuery.businessSize" placeholder="业务规模">
             <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
@@ -183,7 +183,16 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirm">
           确定
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 59f2feb..4deeed8 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -20,18 +20,9 @@
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 
 const dataForm: Ref<ISampleDetail> = ref({
   id: '',
@@ -74,6 +65,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -358,7 +353,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 05fe276..7251eda 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -4,12 +4,16 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOvertimeList, IOvertimeListQuery } from './overtime_list_interface'
+import { ITEM_RENDER_EVT } from 'element-plus/es/components/virtual-list/src/defaults'
+import type { IOvertimeList, IOvertimeListQuery, dictType } from './overtime_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportSapmleList, getSampleList } from '@/api/customer/sampleList'
+import { getDictByCode } from '@/api/system/dict'
+
 const { proxy } = getCurrentInstance() as any
+const certificationStatusMap = ref<dictType[]>([]) as any // 证书状况
 const $router = useRouter()
 
 // 查询条件
@@ -25,12 +29,7 @@
   offset: 1,
   limit: 20,
 })
-// 证书状况字典
-const certificationStatusMap = {
-  0: '未超期',
-  1: '即将超期',
-  2: '已超期',
-}
+
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
@@ -42,7 +41,13 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
-  { text: '证书状况', value: 'certificationStatus', align: 'center' },
+  {
+    text: '证书状况',
+    value: 'certificationStatus',
+    align: 'center',
+    width: '90px',
+    styleFilter: (row: IOvertimeList) => { return row.certificationStatus === '即将超期' ? 'color: red' : '' },
+  },
 ])
 // 表格数据
 const list = ref<IOvertimeList[]>([])
@@ -53,6 +58,16 @@
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
+// 获取字典值
+async function getDict() {
+  // 证书状况
+  const res = await getDictByCode('certificationStatus')
+  // 证书状况字典 {1：即将过期}
+  res.data.forEach((item: any) => {
+    certificationStatusMap.value[`${item.value}`] = item.name
+  })
+}
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -63,7 +78,12 @@
   listQuery.value.startTime = timeRange.value[0] as string || ''
   listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: IOvertimeList) => {
+      return {
+        ...item,
+        certificationStatus: certificationStatusMap.value[item.certificationStatus],
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -161,7 +181,10 @@
   }
 }
 
-fetchData(true)
+onMounted(async () => {
+  await getDict()
+  fetchData(true)
+})
 </script>
 
 <template>
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 519f0af..cceb09b 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -135,7 +135,7 @@
         @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 4eb62ec..9d75cff 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -8,6 +8,7 @@
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { getpDeptApi, listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -19,9 +20,12 @@
   director: '', // 负责人
   administrationJob: '', // 行政职务
   technologyJob: '', // 技术职务
+  meterMajor: '', // 计量专业
   remark: '', // 备注
-  pDeptId: '',
-  pDeptName: '',
+  pDeptId: '', // 父级
+  pDeptName: '', // 父级
+  isLab: '1', // 是否为实验室
+  labCapacity: [], // 实验室能力
 }) // 表单
 // 展示父级组织
 const pDept = ref({
@@ -33,10 +37,11 @@
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
-  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+  organizeName: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
+  director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: ['blur', 'change'] }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: ['blur', 'change'] }],
+  isLab: [{ required: true, message: '是否为实验室不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 // 获取计量人员列表
@@ -53,13 +58,26 @@
     }
   })
 }
-const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
-// 获取技术职务列表
-const getTechnologyJobList = () => {
+const measureTypeList = ref<dictType[]>([]) // 实验室能力
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+const technologyJobList = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  // 获取技术职务列表
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
+  // 获取检校类型
+  getDictByCode('checkType').then((response) => {
+    measureTypeList.value = response.data
+  })
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
 }
+getDict()
+
 const administrationJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
@@ -91,7 +109,8 @@
           type: 'warning',
         },
       ).then((res) => {
-        updateApi({ ...ruleForm.value, title: undefined }).then((res) => {
+        const form = { ...ruleForm.value, labCapacity: ruleForm.value.labCapacity.join(',') }
+        updateApi(form).then((res) => {
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('提交成功')
@@ -117,6 +136,8 @@
   ruleForm.value.administrationJob = '' // 行政职务
   ruleForm.value.technologyJob = '' // 技术职务
   ruleForm.value.remark = '' // 备注
+  ruleForm.value.isLab = ''
+  ruleForm.value.labCapacity = []
 }
 const multipleTableRef = ref()
 const current = ref('')
@@ -141,7 +162,7 @@
       },
       {
         label: '计量专业',
-        data: 'meterMajor',
+        data: 'meterMajorName',
       },
       {
         label: '创建时间',
@@ -196,7 +217,7 @@
       },
       {
         label: '计量专业',
-        data: 'meterMajor',
+        data: 'meterMajorName',
       },
       {
         label: '创建时间',
@@ -434,10 +455,12 @@
   reset()
   title.value = row.title
   path.value = row.path
+  ruleForm.value = row
   ruleForm.value.organizeType = row.organizeType
   ruleForm.value.deptId = row.deptId
+  ruleForm.value.labCapacity = row.labCapacity ? row.labCapacity.split(',') : []
+  ruleForm.value.meterMajor = row.meterMajor
   getuser()
-  getTechnologyJobList()
   getAdministrationJob()
   getDepartmentList()
   getuserInfoList()
@@ -445,7 +468,6 @@
     getInstrumentInfo()
     getDeviceInfo()
   }
-  ruleForm.value = row
   console.log(row, 'row')
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
@@ -538,6 +560,53 @@
           </el-col>
         </el-row>
         <el-row :gutter="24">
+          <el-col v-if="title.split('-')[1] === '科室'" :span="6">
+            <el-form-item label="是否为实验室" prop="isLab">
+              <el-select v-model="ruleForm.isLab" :placeholder="title.split('-')[2] === '详情' ? '' : ''" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
+                <el-option label="是" value="1" />
+                <el-option label="否" value="0" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="title.split('-')[1] !== '部门'" :span="6">
+            <el-form-item label="计量专业" prop="meterMajor">
+              <el-select
+                v-model.trim="ruleForm.meterMajor"
+                clearable
+                :placeholder="title.split('-')[2] === '详情' ? '' : '请选择'"
+                :disabled="ruleForm.isLab === '0' || title.split('-')[2] === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="title.split('-')[1] === '科室'" :span="12">
+            <el-form-item label="实验室能力" prop="labCapacity">
+              <el-select
+                v-model.trim="ruleForm.labCapacity"
+                clearable
+                multiple
+                :placeholder="title.split('-')[2] === '详情' ? '' : '请选择'"
+                :disabled="ruleForm.isLab === '0' || title.split('-')[2] === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureTypeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
@@ -586,13 +655,5 @@
 </template>
 
 <style lang="scss" scoped>
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      content: "";
-      display: none;
-    }
-  }
-}
+// 样式代码
 </style>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
new file mode 100644
index 0000000..d6827e4
--- /dev/null
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts" name="DistributeDialog">
+import processConfig from './processConfig.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { getTaskDetail } from '@/api/business/task'
+// 任务分发弹窗
+
+// 自定义方法：close关闭弹窗
+const emit = defineEmits(['close'])
+const dialogVisible = ref(false) // 弹窗显示
+const sampleId = ref('') // 样品id
+const orderId = ref('') // 委托单id
+
+// 委托书-证书类别列表
+const certificationTypes = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  getDictByCode('certificationType').then((response) => {
+    certificationTypes.value = response.data
+  })
+}
+
+getDict()
+// 样品详情
+const sampleDetail = ref({
+  sampleName: '压力表',
+  mesureContent: '压力、ip68',
+  certifications: ['1', '2'],
+  remark: '这是备注',
+  measureProcessList: [],
+  measureSendBackList: [],
+})
+
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    sampleDetail.value.sampleName = res.data.sampleName
+    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.remark = res.data.remark
+    sampleDetail.value.certifications = res.data.certifications
+    sampleDetail.value.measureProcessList = res.data.measureProcessList
+    sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+  })
+}
+// 初始化弹窗
+const initDialog = (orderid: string, sampleid: string) => {
+  dialogVisible.value = true
+  sampleId.value = sampleid
+  orderId.value = orderid
+  getInfo()
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+  emit('close')
+}
+function cancel() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="任务分发" width="1000" @close="cancel">
+    <div class="simple-info">
+      <div class="simple-info-line">
+        <span class="label">样品名称:</span>
+        <el-input v-model="sampleDetail.sampleName" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">证书类别:</span>
+        <el-checkbox-group v-model="sampleDetail.certifications" disabled>
+          <el-checkbox v-for="item in certificationTypes" :key="item.value" :label="item.value">
+            {{ item.name }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="simple-info-line">
+        <span class="label">检定项目:</span>
+        <el-input v-model="sampleDetail.mesureContent" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">备注:</span>
+        <el-input v-model="sampleDetail.remark" disabled />
+      </div>
+    </div>
+    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+      批量添加
+    </el-button>
+    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <template #footer>
+      <el-button type="primary" @click="saveProcess">
+        确定
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//  样式
+.simple-info {
+  margin-top: -10px;
+  margin-bottom: 10px;
+
+  .simple-info-line {
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    .label {
+      width: 90px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/components/lab-interface.ts b/src/views/business/schedule/task/components/lab-interface.ts
index d6355c6..02b0d1d 100644
--- a/src/views/business/schedule/task/components/lab-interface.ts
+++ b/src/views/business/schedule/task/components/lab-interface.ts
@@ -6,7 +6,8 @@
   isLab: '1' // 是否是实验室
   director: string // 负责人
   meterMajor: string // 专业
-  measureItems: string// 检测能力
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
 }
 
 // 部门返回值对象类型
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 4ccab04..1efb8a9 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -1,11 +1,18 @@
 <script setup lang="ts" name="ProcessConfig">
 import { ref } from 'vue'
 import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
 import ProcessNode from './processNode.vue'
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/task'
 const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
   // 是否为详情展示页面
   detail: {
     type: Boolean,
@@ -21,81 +28,35 @@
     type: String,
     required: true,
   },
+  list: {
+    type: Array,
+    default: () => [],
+  },
 })
 const emits = defineEmits(['saveOver'])
 // 默认流程节点
-const defaultProcess = {
-  id: '', // 检测节点id
-  executiveItem: '', // 检测项目
-  executiveDept: '', // 检测部门
-  executiveDeptName: '', // 检测部门
-  executivePerson: '', // 检测人员
-  executivePersonName: '', // 检测人员
-  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-  measureStateName: '', // 检测状态
-  currentCertifications: '', // 当前证书数
-  requireCertifications: '', // 应出具证书数
-  updateTime: '', // 更新时间
-  backPerson: '', // 退回人
-  backReason: '', // 退回原因
-  backTime: '', // 退回时间
-  distributePerson: '', // 分配人
-  distributeTime: '', // 分配时间
-  startTime: '', // 检测开始时间
-  overTime: '', // 检测结束时间
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
 }
 // 检定流程列表
-const processList = ref([
+const processList = ref<IScheduleSet[]>([
   { ...defaultProcess },
 ])
 
-// 获取当前样品检测流程，参数待定
-const fetchProcess = () => {
-  // TODO: 模拟数据
-  processList.value = [
-    {
-      id: '1', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423635973935106', // 检测部门
-      executiveDeptName: '力学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '张三', // 检测人员
-      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待检测', // 检测状态
-      currentCertifications: '0', // 当前证书数
-      requireCertifications: '2', // 应出具证书数
-      updateTime: '2023-02-01 09:00:05', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-    {
-      id: '2', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423577505337346', // 检测部门
-      executiveDeptName: '热学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待分配', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-  ]
-}
-fetchProcess()
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+})
 
 // 点击添加流程
 const processAdd = () => {
@@ -121,25 +82,17 @@
 // 批量添加实验室
 const batchChooseOver = (labs: ILabList[]) => {
   for (const item of labs) {
-    const processTemp = {
-      id: '',
-      executiveItem: '', // 检测项目
-      executiveDept: item.deptId, // 检测部门
-      executiveDeptName: item.organizeName, // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
     }
     processList.value.push(processTemp)
   }
@@ -147,9 +100,24 @@
 
 // 保存流程
 const saveProcess = () => {
-  // TODO: 保存流程
-  console.log(processList.value)
-  emits('saveOver')
+  const form = {
+    measureProcessList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  console.log(form)
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
 }
 // 删除流程
 const deleteProcess = (index: number) => {
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index 6cbdf10..31dfae4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -12,24 +12,16 @@
     type: Object,
     default: () => {
       return {
-        id: '', // 检测节点id
-        executiveItem: '', // 检测项目
-        executiveDept: '', // 检测部门
-        executiveDeptName: '', // 检测部门
-        executivePerson: '', // 检测人员
-        executivePersonName: '', // 检测人员
-        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-        measureStateName: '', // 检测状态
-        currentCertifications: '', // 当前证书数
-        requireCertifications: '', // 应出具证书数
-        updateTime: '', // 更新时间
-        backPerson: '', // 退回人
-        backReason: '', // 退回原因
-        backTime: '', // 退回时间
-        distributePerson: '', // 分配人
-        distributeTime: '', // 分配时间
-        startTime: '', // 检测开始时间
-        overTime: '', // 检测结束时间
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
       }
     },
   },
@@ -56,22 +48,23 @@
 })
 // 检定环节可编辑-只有待分发状态可编辑
 const deptEdit = computed(() => {
-  return processNodeData.value.measureState == '0'
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 检定人可编辑-待分配状态可编辑
 const personEdit = computed(() => {
-  const editStates = ['0', '1']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 证书可编辑-待分发、待分配、待检测状态可编辑
 const certificationEdit = computed(() => {
-  const editStates = ['0', '1', '2']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 节点可移动
 const canMove = computed(() => {
-  const editStates = ['0']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 
 // 选择实验室
@@ -82,8 +75,8 @@
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
   console.log(lab)
-  processNodeData.value.executiveDept = lab.deptId
-  processNodeData.value.executiveDeptName = lab.organizeName
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
 }
 
 // 选择人员
@@ -93,8 +86,8 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
-  processNodeData.value.executivePerson = person.id
-  processNodeData.value.executivePersonName = person.name
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
 }
 
@@ -122,7 +115,7 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit">
           <template v-if="deptEdit" #append>
             <el-button :icon="Aim" size="small" link @click="clickChoose" />
           </template>
@@ -130,7 +123,7 @@
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit">
           <template v-if="personEdit" #append>
             <el-button :icon="Aim" size="small" link @click="choosePerson" />
           </template>
@@ -140,7 +133,7 @@
         <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
       <div class="line">
-        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
       </div>
       <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
@@ -149,7 +142,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 1d02839..493fbba 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,5 +1,3 @@
-import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
-
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -8,12 +6,29 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
   offset: number
 }
 
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
 // 任务列表-返回值
 export interface ITaskList {
   orderId: string // 委托书编号
@@ -25,41 +40,127 @@
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  isUrgent: string // 是否加急
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
   requireOverTime: string // 应检完时间
-  sampleAttr: string // 样品属性
-  sampleAttrName: string // 样品属性
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
   currentMeasureState: string // 当前检定环节
   currentMeasureStateName: string // 当前检定环节
-  currentCertifications: number // 已出具证书总数
+  alreadyCertifications: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
-  distributeStateName: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
 }
 
-// 检测流程节点
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+}
+
+// 全部检测流程节点
 export interface ISchedule {
-  executivePerson: string // 执行人
-  executivePersonName: string // 执行人名称
-  executiveDept: string // 执行部门
-  executiveDeptName: string // 执行部门名称
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
   executiveItem: string // 检定项目
-  currentCertifications?: number // 已出具证书总数
+  alreadyCertifications?: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  measureState: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
   updateTime: string // 流程更新时间
-  backTime: string // 退回时间
-  backReason: string // 退回原因
-  backPerson: string // 退回人
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
   distributePerson: string // 分配人
   distributeTime: string // 分配时间
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
 
 // 样品检测信息
-export interface ISampleMeasure extends ISampleEdit {
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
   orderId: string // 委托单id
+  orderCode: string // 委托单编号
   certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
 }
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 465b2e7..547ee3e 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,28 +1,27 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
-import type { ISampleMeasure } from './task-interface'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
 import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getTaskDetail } from '@/api/business/task'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // 样品详情id
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -39,32 +38,49 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleMeasure> = ref({
-  id: '',
-  orderId: '', // 委托单id
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
   postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
   manufacturer: '', // 生产厂家
   manufacturerCountry: '', // 厂家国别
   manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
   remark: '', // 备注
   minioFileName: '', // 说明书
   labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-  certifications: '',
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
 })
 const ruleFormRef = ref<FormInstance>()
 
@@ -143,14 +159,6 @@
   return menu.find(item => item.name === currentMenu.value)
 })
 
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
 const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
@@ -181,11 +189,9 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(dataForm.value).then((res) => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -195,42 +201,23 @@
     }
   })
 }
-
-// 获取样品详情
+//
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
 const getInfo = () => {
-  // getSapmleDetail({ id: infoId.value }).then((res) => {
-  dataForm.value = {
-    orderId: '123',
-    ABC: 'A',
-    companyAddress: '北京/北京市',
-    customerName: '京东集团',
-    customerNo: 'sygf202211290001',
-    id: '111111',
-    labelBind: '11222',
-    manufacturer: '北京某厂家',
-    manufacturerCountry: 'CN',
-    manufacturingDate: '2023-03',
-    manufacturingNo: '123121',
-    mesureCategory: '',
-    mesureContent: '项目1',
-    mesurePeriod: '1',
-    mesureType: '',
-    minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-    phone: '950618',
-    postalCode: 'test',
-    remark: '无备注',
-    sampleModel: '型号1',
-    sampleName: '样品1',
-    sampleNo: '123456',
-    measureResultCode: 'bhg',
-    deliverer: '张三',
-    delivererTel: '156254577545',
-    certifications: '1',
-  }
-  // for (const item of menu) {
-  //   item.searchFunc()
-  // }
-  // })
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList
+    taskForm.value.measureSendBackList = res.data.measureSendBackList
+  })
 }
 
 // 点击标签绑定的扫描
@@ -260,7 +247,7 @@
     fd.append('multipartFile', event.target.files[0])
     // UploadFile(fd).then((res) => {
     //   if (res.code === 200) {
-    //     dataForm.value.minioFileName = res.data[0]
+    //     sampleForm.value.minioFileName = res.data[0]
     //     // 重置当前验证
     //     ElMessage.success('文件上传成功')
     //   }
@@ -273,18 +260,30 @@
 const upload = () => {
   fileRef.value.click()
 }
-// 获取样品详情
-getInfo()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.role) {
+  roleType.value = $route.params.role as string // 使用角色
+
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+    getSampleInfo()
+  }
+}
 </script>
 
 <template>
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -294,7 +293,7 @@
       <div id="form">
         <el-form
           ref="ruleFormRef"
-          :model="dataForm"
+          :model="sampleForm"
           :label-width="120"
           label-position="right"
           :rules="rules"
@@ -303,9 +302,9 @@
             <el-col :span="6">
               <el-form-item label="样品编号:" prop="sampleNo">
                 <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -313,9 +312,9 @@
             <el-col :span="6">
               <el-form-item label="样品名称:" prop="sampleName">
                 <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -323,9 +322,9 @@
             <el-col :span="6">
               <el-form-item label="样品型号:" prop="sampleModel">
                 <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -333,9 +332,9 @@
             <el-col :span="6">
               <el-form-item label="出厂编号:" prop="manufacturingNo">
                 <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -343,9 +342,9 @@
             <el-col :span="6">
               <el-form-item label="委托方代码" prop="customerNo">
                 <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -353,9 +352,9 @@
             <el-col :span="6">
               <el-form-item label="委托方名称" prop="customerName">
                 <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -363,9 +362,9 @@
             <el-col :span="6">
               <el-form-item label="委托方电话" prop="phone">
                 <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -373,9 +372,9 @@
             <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -383,11 +382,11 @@
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
-                  v-model="dataForm.companyAddress"
+                  v-model="sampleForm.customerAddress"
                   type="textarea"
                   autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -395,9 +394,9 @@
             <el-col :span="6">
               <el-form-item label="校检类别:">
                 <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
@@ -407,19 +406,19 @@
             <el-col :span="6">
               <el-form-item label="生产厂家:">
                 <el-input
-                  v-model="dataForm.manufacturer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="厂家国别:">
                 <el-select
-                  v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
@@ -429,23 +428,23 @@
             <el-col :span="6">
               <el-form-item label="出厂年月:">
                 <el-date-picker
-                  v-model="dataForm.manufacturingDate"
+                  v-model="sampleForm.manufacturingDate"
                   type="month"
                   format="YYYY-MM"
                   value-format="YYYY-MM"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="ABC:">
                 <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
@@ -455,9 +454,9 @@
             <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -465,9 +464,9 @@
             <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
-                  v-model="dataForm.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -475,49 +474,20 @@
             <el-col :span="24">
               <el-form-item label="检定项目:" prop="mesureContent">
                 <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定周期（月）:">
                 <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="上次检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  disabled
-                  class="full-width-input"
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
@@ -526,21 +496,21 @@
             <el-col :span="24">
               <el-form-item label="备注:">
                 <el-input
-                  v-model="dataForm.remark"
+                  v-model="sampleForm.remark"
                   type="textarea"
                   :rows="2"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
-                  v-model="dataForm.mesureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
@@ -550,10 +520,10 @@
             <el-col :span="6">
               <el-form-item label="标签绑定:">
                 <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 >
                   <template #append>
                     <el-button>扫描</el-button>
@@ -565,11 +535,11 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="14">
               <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
             </el-col>
@@ -586,7 +556,7 @@
           保存
         </el-button>
       </template>
-      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
@@ -604,11 +574,11 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="dataForm.id!" :order-id="dataForm.orderId" />
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
       <!-- 检定记录 -->
-      <measure-records v-if="currentMenu === '检定记录'" :sample-id="dataForm.id!" />
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
-      <certification-records v-if="currentMenu === '检定证书'" :sample-id="dataForm.id!" />
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index f784804..461c518 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -31,7 +31,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
@@ -39,30 +39,30 @@
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
-  { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center' },
-  { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
-  { text: '分发性质', value: 'distributeState', align: 'center', width: '90px' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return row.alreadyCertifications ? `${row.alreadyCertifications}/${row.requireCertifications}` : '0/0' } },
+  { text: '分发性质', value: 'handOutProperty', align: 'center', width: '90px' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -80,15 +80,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // // 模拟数据
-  // list.value = [
-  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  // ]
-  // loadingTable.value = false
-  // console.log(listQuery.value)
   getTaskList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -111,15 +107,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
+    sampleBelong: '', // 样品属性
     sampleStatus: '2', // 分发状态
+    startTime: '', //	应检定开始时间
+    endTime: '', //	应检定结束时间
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -271,8 +269,8 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue
index 629b33c..2300f4c 100644
--- a/src/views/customer/advice/adviceEdit.vue
+++ b/src/views/customer/advice/adviceEdit.vue
@@ -51,7 +51,7 @@
 const companyInfo: SimpleCompany = reactive({
   customerName: '', // 公司名称
   customerNo: '', //	客户编号
-  customerId: '', // 客户id
+  id: '', // 客户id
   grade: '', // 履约评级
   gradeName: '', // 履约评级
   companySize: '', // 公司规模
@@ -121,12 +121,13 @@
   const item = select as SimpleCompany
   companyInfo.customerName = item.customerName
   companyInfo.customerNo = item.customerNo
-  companyInfo.customerId = item.customerId
+  companyInfo.id = item.id
   companyInfo.gradeName = item.gradeName
   companyInfo.companySizeName = item.companySizeName
   companyInfo.businessSizeName = item.businessSizeName
   companyInfo.evaluationName = item.evaluationName
   dataForm.value.customerNo = item.customerNo
+  dataForm.value.customerId = item.id
 }
 // 打印表单
 const printObj = ref({
@@ -154,8 +155,6 @@
         if (dataForm.value.id) {
           updateAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -164,8 +163,6 @@
         else {
           addAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
diff --git a/src/views/customer/advice/advice_interface.ts b/src/views/customer/advice/advice_interface.ts
index b08f85b..a8bf311 100644
--- a/src/views/customer/advice/advice_interface.ts
+++ b/src/views/customer/advice/advice_interface.ts
@@ -40,9 +40,10 @@
 
 // 公司简易
 export interface SimpleCompany {
+  id: string // 客户id
   customerName: string // 公司名称
   customerNo: string //	客户编号
-  customerId: string // 客户id
+  grade: string // 履约评级
   gradeName: string // 履约评级
   companySizeName: string // 公司规模
   businessSizeName: string // 业务规模
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index f9ee314..4893c4f 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -26,6 +26,7 @@
 const visible = ref(false) // 控制对话框显隐
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -54,17 +55,7 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
-})
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
+})// 表单
 const ruleFormRef = ref<FormInstance>()
 
 // 自定义校验规则--检定周期为正整数
@@ -111,6 +102,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -479,7 +474,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index aceea6a..abcada5 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -36,7 +36,14 @@
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
-  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: ISampleList) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ISampleList[]>([])
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index aafed2a..256ed9f 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -24,6 +24,7 @@
   measurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
   remark: string // 备注
+  validDeadline?: string // 证书过期时间
 }
 
 export interface ISampleEdit {
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 3b03275..d04456b 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -163,7 +163,7 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
+          <el-select v-model="listQuery.businessSize" placeholder="业务规模">
             <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
@@ -183,7 +183,16 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirm">
           确定
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 59f2feb..4deeed8 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -20,18 +20,9 @@
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 
 const dataForm: Ref<ISampleDetail> = ref({
   id: '',
@@ -74,6 +65,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -358,7 +353,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 05fe276..7251eda 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -4,12 +4,16 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOvertimeList, IOvertimeListQuery } from './overtime_list_interface'
+import { ITEM_RENDER_EVT } from 'element-plus/es/components/virtual-list/src/defaults'
+import type { IOvertimeList, IOvertimeListQuery, dictType } from './overtime_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportSapmleList, getSampleList } from '@/api/customer/sampleList'
+import { getDictByCode } from '@/api/system/dict'
+
 const { proxy } = getCurrentInstance() as any
+const certificationStatusMap = ref<dictType[]>([]) as any // 证书状况
 const $router = useRouter()
 
 // 查询条件
@@ -25,12 +29,7 @@
   offset: 1,
   limit: 20,
 })
-// 证书状况字典
-const certificationStatusMap = {
-  0: '未超期',
-  1: '即将超期',
-  2: '已超期',
-}
+
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
@@ -42,7 +41,13 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
-  { text: '证书状况', value: 'certificationStatus', align: 'center' },
+  {
+    text: '证书状况',
+    value: 'certificationStatus',
+    align: 'center',
+    width: '90px',
+    styleFilter: (row: IOvertimeList) => { return row.certificationStatus === '即将超期' ? 'color: red' : '' },
+  },
 ])
 // 表格数据
 const list = ref<IOvertimeList[]>([])
@@ -53,6 +58,16 @@
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
+// 获取字典值
+async function getDict() {
+  // 证书状况
+  const res = await getDictByCode('certificationStatus')
+  // 证书状况字典 {1：即将过期}
+  res.data.forEach((item: any) => {
+    certificationStatusMap.value[`${item.value}`] = item.name
+  })
+}
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -63,7 +78,12 @@
   listQuery.value.startTime = timeRange.value[0] as string || ''
   listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: IOvertimeList) => {
+      return {
+        ...item,
+        certificationStatus: certificationStatusMap.value[item.certificationStatus],
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -161,7 +181,10 @@
   }
 }
 
-fetchData(true)
+onMounted(async () => {
+  await getDict()
+  fetchData(true)
+})
 </script>
 
 <template>
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 519f0af..cceb09b 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -135,7 +135,7 @@
         @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 4eb62ec..9d75cff 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -8,6 +8,7 @@
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { getpDeptApi, listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -19,9 +20,12 @@
   director: '', // 负责人
   administrationJob: '', // 行政职务
   technologyJob: '', // 技术职务
+  meterMajor: '', // 计量专业
   remark: '', // 备注
-  pDeptId: '',
-  pDeptName: '',
+  pDeptId: '', // 父级
+  pDeptName: '', // 父级
+  isLab: '1', // 是否为实验室
+  labCapacity: [], // 实验室能力
 }) // 表单
 // 展示父级组织
 const pDept = ref({
@@ -33,10 +37,11 @@
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
-  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+  organizeName: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
+  director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: ['blur', 'change'] }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: ['blur', 'change'] }],
+  isLab: [{ required: true, message: '是否为实验室不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 // 获取计量人员列表
@@ -53,13 +58,26 @@
     }
   })
 }
-const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
-// 获取技术职务列表
-const getTechnologyJobList = () => {
+const measureTypeList = ref<dictType[]>([]) // 实验室能力
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+const technologyJobList = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  // 获取技术职务列表
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
+  // 获取检校类型
+  getDictByCode('checkType').then((response) => {
+    measureTypeList.value = response.data
+  })
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
 }
+getDict()
+
 const administrationJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
@@ -91,7 +109,8 @@
           type: 'warning',
         },
       ).then((res) => {
-        updateApi({ ...ruleForm.value, title: undefined }).then((res) => {
+        const form = { ...ruleForm.value, labCapacity: ruleForm.value.labCapacity.join(',') }
+        updateApi(form).then((res) => {
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('提交成功')
@@ -117,6 +136,8 @@
   ruleForm.value.administrationJob = '' // 行政职务
   ruleForm.value.technologyJob = '' // 技术职务
   ruleForm.value.remark = '' // 备注
+  ruleForm.value.isLab = ''
+  ruleForm.value.labCapacity = []
 }
 const multipleTableRef = ref()
 const current = ref('')
@@ -141,7 +162,7 @@
       },
       {
         label: '计量专业',
-        data: 'meterMajor',
+        data: 'meterMajorName',
       },
       {
         label: '创建时间',
@@ -196,7 +217,7 @@
       },
       {
         label: '计量专业',
-        data: 'meterMajor',
+        data: 'meterMajorName',
       },
       {
         label: '创建时间',
@@ -434,10 +455,12 @@
   reset()
   title.value = row.title
   path.value = row.path
+  ruleForm.value = row
   ruleForm.value.organizeType = row.organizeType
   ruleForm.value.deptId = row.deptId
+  ruleForm.value.labCapacity = row.labCapacity ? row.labCapacity.split(',') : []
+  ruleForm.value.meterMajor = row.meterMajor
   getuser()
-  getTechnologyJobList()
   getAdministrationJob()
   getDepartmentList()
   getuserInfoList()
@@ -445,7 +468,6 @@
     getInstrumentInfo()
     getDeviceInfo()
   }
-  ruleForm.value = row
   console.log(row, 'row')
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
@@ -538,6 +560,53 @@
           </el-col>
         </el-row>
         <el-row :gutter="24">
+          <el-col v-if="title.split('-')[1] === '科室'" :span="6">
+            <el-form-item label="是否为实验室" prop="isLab">
+              <el-select v-model="ruleForm.isLab" :placeholder="title.split('-')[2] === '详情' ? '' : ''" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
+                <el-option label="是" value="1" />
+                <el-option label="否" value="0" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="title.split('-')[1] !== '部门'" :span="6">
+            <el-form-item label="计量专业" prop="meterMajor">
+              <el-select
+                v-model.trim="ruleForm.meterMajor"
+                clearable
+                :placeholder="title.split('-')[2] === '详情' ? '' : '请选择'"
+                :disabled="ruleForm.isLab === '0' || title.split('-')[2] === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="title.split('-')[1] === '科室'" :span="12">
+            <el-form-item label="实验室能力" prop="labCapacity">
+              <el-select
+                v-model.trim="ruleForm.labCapacity"
+                clearable
+                multiple
+                :placeholder="title.split('-')[2] === '详情' ? '' : '请选择'"
+                :disabled="ruleForm.isLab === '0' || title.split('-')[2] === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureTypeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
@@ -586,13 +655,5 @@
 </template>
 
 <style lang="scss" scoped>
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      content: "";
-      display: none;
-    }
-  }
-}
+// 样式代码
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index f7fd689..33e63c8 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -66,7 +66,7 @@
     columns: [
       { text: '科室编号', value: 'organizeNo', align: 'center' },
       { text: '科室名称', value: 'organizeName', align: 'center' },
-      { text: '专业', value: 'meterMajor', align: 'center' },
+      { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '技术职务', value: 'technologyJobName', align: 'center' },
       { text: '行政职务', value: 'administrationJobName', align: 'center' },
@@ -79,7 +79,7 @@
     columns: [
       { text: '工程组编号', value: 'organizeNo', align: 'center' },
       { text: '工程组名', value: 'organizeName', align: 'center' },
-      { text: '计量专业', value: 'meterMajor', align: 'center' },
+      { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
       { text: '所属科室', value: 'pDeptName', align: 'center' },

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
new file mode 100644
index 0000000..d6827e4
--- /dev/null
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts" name="DistributeDialog">
+import processConfig from './processConfig.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { getTaskDetail } from '@/api/business/task'
+// 任务分发弹窗
+
+// 自定义方法：close关闭弹窗
+const emit = defineEmits(['close'])
+const dialogVisible = ref(false) // 弹窗显示
+const sampleId = ref('') // 样品id
+const orderId = ref('') // 委托单id
+
+// 委托书-证书类别列表
+const certificationTypes = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  getDictByCode('certificationType').then((response) => {
+    certificationTypes.value = response.data
+  })
+}
+
+getDict()
+// 样品详情
+const sampleDetail = ref({
+  sampleName: '压力表',
+  mesureContent: '压力、ip68',
+  certifications: ['1', '2'],
+  remark: '这是备注',
+  measureProcessList: [],
+  measureSendBackList: [],
+})
+
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    sampleDetail.value.sampleName = res.data.sampleName
+    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.remark = res.data.remark
+    sampleDetail.value.certifications = res.data.certifications
+    sampleDetail.value.measureProcessList = res.data.measureProcessList
+    sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+  })
+}
+// 初始化弹窗
+const initDialog = (orderid: string, sampleid: string) => {
+  dialogVisible.value = true
+  sampleId.value = sampleid
+  orderId.value = orderid
+  getInfo()
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+  emit('close')
+}
+function cancel() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="任务分发" width="1000" @close="cancel">
+    <div class="simple-info">
+      <div class="simple-info-line">
+        <span class="label">样品名称:</span>
+        <el-input v-model="sampleDetail.sampleName" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">证书类别:</span>
+        <el-checkbox-group v-model="sampleDetail.certifications" disabled>
+          <el-checkbox v-for="item in certificationTypes" :key="item.value" :label="item.value">
+            {{ item.name }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="simple-info-line">
+        <span class="label">检定项目:</span>
+        <el-input v-model="sampleDetail.mesureContent" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">备注:</span>
+        <el-input v-model="sampleDetail.remark" disabled />
+      </div>
+    </div>
+    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+      批量添加
+    </el-button>
+    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <template #footer>
+      <el-button type="primary" @click="saveProcess">
+        确定
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//  样式
+.simple-info {
+  margin-top: -10px;
+  margin-bottom: 10px;
+
+  .simple-info-line {
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    .label {
+      width: 90px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/components/lab-interface.ts b/src/views/business/schedule/task/components/lab-interface.ts
index d6355c6..02b0d1d 100644
--- a/src/views/business/schedule/task/components/lab-interface.ts
+++ b/src/views/business/schedule/task/components/lab-interface.ts
@@ -6,7 +6,8 @@
   isLab: '1' // 是否是实验室
   director: string // 负责人
   meterMajor: string // 专业
-  measureItems: string// 检测能力
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
 }
 
 // 部门返回值对象类型
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 4ccab04..1efb8a9 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -1,11 +1,18 @@
 <script setup lang="ts" name="ProcessConfig">
 import { ref } from 'vue'
 import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
 import ProcessNode from './processNode.vue'
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/task'
 const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
   // 是否为详情展示页面
   detail: {
     type: Boolean,
@@ -21,81 +28,35 @@
     type: String,
     required: true,
   },
+  list: {
+    type: Array,
+    default: () => [],
+  },
 })
 const emits = defineEmits(['saveOver'])
 // 默认流程节点
-const defaultProcess = {
-  id: '', // 检测节点id
-  executiveItem: '', // 检测项目
-  executiveDept: '', // 检测部门
-  executiveDeptName: '', // 检测部门
-  executivePerson: '', // 检测人员
-  executivePersonName: '', // 检测人员
-  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-  measureStateName: '', // 检测状态
-  currentCertifications: '', // 当前证书数
-  requireCertifications: '', // 应出具证书数
-  updateTime: '', // 更新时间
-  backPerson: '', // 退回人
-  backReason: '', // 退回原因
-  backTime: '', // 退回时间
-  distributePerson: '', // 分配人
-  distributeTime: '', // 分配时间
-  startTime: '', // 检测开始时间
-  overTime: '', // 检测结束时间
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
 }
 // 检定流程列表
-const processList = ref([
+const processList = ref<IScheduleSet[]>([
   { ...defaultProcess },
 ])
 
-// 获取当前样品检测流程，参数待定
-const fetchProcess = () => {
-  // TODO: 模拟数据
-  processList.value = [
-    {
-      id: '1', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423635973935106', // 检测部门
-      executiveDeptName: '力学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '张三', // 检测人员
-      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待检测', // 检测状态
-      currentCertifications: '0', // 当前证书数
-      requireCertifications: '2', // 应出具证书数
-      updateTime: '2023-02-01 09:00:05', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-    {
-      id: '2', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423577505337346', // 检测部门
-      executiveDeptName: '热学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待分配', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-  ]
-}
-fetchProcess()
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+})
 
 // 点击添加流程
 const processAdd = () => {
@@ -121,25 +82,17 @@
 // 批量添加实验室
 const batchChooseOver = (labs: ILabList[]) => {
   for (const item of labs) {
-    const processTemp = {
-      id: '',
-      executiveItem: '', // 检测项目
-      executiveDept: item.deptId, // 检测部门
-      executiveDeptName: item.organizeName, // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
     }
     processList.value.push(processTemp)
   }
@@ -147,9 +100,24 @@
 
 // 保存流程
 const saveProcess = () => {
-  // TODO: 保存流程
-  console.log(processList.value)
-  emits('saveOver')
+  const form = {
+    measureProcessList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  console.log(form)
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
 }
 // 删除流程
 const deleteProcess = (index: number) => {
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index 6cbdf10..31dfae4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -12,24 +12,16 @@
     type: Object,
     default: () => {
       return {
-        id: '', // 检测节点id
-        executiveItem: '', // 检测项目
-        executiveDept: '', // 检测部门
-        executiveDeptName: '', // 检测部门
-        executivePerson: '', // 检测人员
-        executivePersonName: '', // 检测人员
-        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-        measureStateName: '', // 检测状态
-        currentCertifications: '', // 当前证书数
-        requireCertifications: '', // 应出具证书数
-        updateTime: '', // 更新时间
-        backPerson: '', // 退回人
-        backReason: '', // 退回原因
-        backTime: '', // 退回时间
-        distributePerson: '', // 分配人
-        distributeTime: '', // 分配时间
-        startTime: '', // 检测开始时间
-        overTime: '', // 检测结束时间
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
       }
     },
   },
@@ -56,22 +48,23 @@
 })
 // 检定环节可编辑-只有待分发状态可编辑
 const deptEdit = computed(() => {
-  return processNodeData.value.measureState == '0'
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 检定人可编辑-待分配状态可编辑
 const personEdit = computed(() => {
-  const editStates = ['0', '1']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 证书可编辑-待分发、待分配、待检测状态可编辑
 const certificationEdit = computed(() => {
-  const editStates = ['0', '1', '2']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 节点可移动
 const canMove = computed(() => {
-  const editStates = ['0']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 
 // 选择实验室
@@ -82,8 +75,8 @@
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
   console.log(lab)
-  processNodeData.value.executiveDept = lab.deptId
-  processNodeData.value.executiveDeptName = lab.organizeName
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
 }
 
 // 选择人员
@@ -93,8 +86,8 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
-  processNodeData.value.executivePerson = person.id
-  processNodeData.value.executivePersonName = person.name
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
 }
 
@@ -122,7 +115,7 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit">
           <template v-if="deptEdit" #append>
             <el-button :icon="Aim" size="small" link @click="clickChoose" />
           </template>
@@ -130,7 +123,7 @@
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit">
           <template v-if="personEdit" #append>
             <el-button :icon="Aim" size="small" link @click="choosePerson" />
           </template>
@@ -140,7 +133,7 @@
         <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
       <div class="line">
-        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
       </div>
       <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
@@ -149,7 +142,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 1d02839..493fbba 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,5 +1,3 @@
-import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
-
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -8,12 +6,29 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
   offset: number
 }
 
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
 // 任务列表-返回值
 export interface ITaskList {
   orderId: string // 委托书编号
@@ -25,41 +40,127 @@
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  isUrgent: string // 是否加急
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
   requireOverTime: string // 应检完时间
-  sampleAttr: string // 样品属性
-  sampleAttrName: string // 样品属性
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
   currentMeasureState: string // 当前检定环节
   currentMeasureStateName: string // 当前检定环节
-  currentCertifications: number // 已出具证书总数
+  alreadyCertifications: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
-  distributeStateName: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
 }
 
-// 检测流程节点
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+}
+
+// 全部检测流程节点
 export interface ISchedule {
-  executivePerson: string // 执行人
-  executivePersonName: string // 执行人名称
-  executiveDept: string // 执行部门
-  executiveDeptName: string // 执行部门名称
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
   executiveItem: string // 检定项目
-  currentCertifications?: number // 已出具证书总数
+  alreadyCertifications?: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  measureState: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
   updateTime: string // 流程更新时间
-  backTime: string // 退回时间
-  backReason: string // 退回原因
-  backPerson: string // 退回人
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
   distributePerson: string // 分配人
   distributeTime: string // 分配时间
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
 
 // 样品检测信息
-export interface ISampleMeasure extends ISampleEdit {
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
   orderId: string // 委托单id
+  orderCode: string // 委托单编号
   certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
 }
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 465b2e7..547ee3e 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,28 +1,27 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
-import type { ISampleMeasure } from './task-interface'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
 import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getTaskDetail } from '@/api/business/task'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // 样品详情id
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -39,32 +38,49 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleMeasure> = ref({
-  id: '',
-  orderId: '', // 委托单id
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
   postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
   manufacturer: '', // 生产厂家
   manufacturerCountry: '', // 厂家国别
   manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
   remark: '', // 备注
   minioFileName: '', // 说明书
   labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-  certifications: '',
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
 })
 const ruleFormRef = ref<FormInstance>()
 
@@ -143,14 +159,6 @@
   return menu.find(item => item.name === currentMenu.value)
 })
 
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
 const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
@@ -181,11 +189,9 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(dataForm.value).then((res) => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -195,42 +201,23 @@
     }
   })
 }
-
-// 获取样品详情
+//
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
 const getInfo = () => {
-  // getSapmleDetail({ id: infoId.value }).then((res) => {
-  dataForm.value = {
-    orderId: '123',
-    ABC: 'A',
-    companyAddress: '北京/北京市',
-    customerName: '京东集团',
-    customerNo: 'sygf202211290001',
-    id: '111111',
-    labelBind: '11222',
-    manufacturer: '北京某厂家',
-    manufacturerCountry: 'CN',
-    manufacturingDate: '2023-03',
-    manufacturingNo: '123121',
-    mesureCategory: '',
-    mesureContent: '项目1',
-    mesurePeriod: '1',
-    mesureType: '',
-    minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-    phone: '950618',
-    postalCode: 'test',
-    remark: '无备注',
-    sampleModel: '型号1',
-    sampleName: '样品1',
-    sampleNo: '123456',
-    measureResultCode: 'bhg',
-    deliverer: '张三',
-    delivererTel: '156254577545',
-    certifications: '1',
-  }
-  // for (const item of menu) {
-  //   item.searchFunc()
-  // }
-  // })
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList
+    taskForm.value.measureSendBackList = res.data.measureSendBackList
+  })
 }
 
 // 点击标签绑定的扫描
@@ -260,7 +247,7 @@
     fd.append('multipartFile', event.target.files[0])
     // UploadFile(fd).then((res) => {
     //   if (res.code === 200) {
-    //     dataForm.value.minioFileName = res.data[0]
+    //     sampleForm.value.minioFileName = res.data[0]
     //     // 重置当前验证
     //     ElMessage.success('文件上传成功')
     //   }
@@ -273,18 +260,30 @@
 const upload = () => {
   fileRef.value.click()
 }
-// 获取样品详情
-getInfo()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.role) {
+  roleType.value = $route.params.role as string // 使用角色
+
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+    getSampleInfo()
+  }
+}
 </script>
 
 <template>
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -294,7 +293,7 @@
       <div id="form">
         <el-form
           ref="ruleFormRef"
-          :model="dataForm"
+          :model="sampleForm"
           :label-width="120"
           label-position="right"
           :rules="rules"
@@ -303,9 +302,9 @@
             <el-col :span="6">
               <el-form-item label="样品编号:" prop="sampleNo">
                 <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -313,9 +312,9 @@
             <el-col :span="6">
               <el-form-item label="样品名称:" prop="sampleName">
                 <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -323,9 +322,9 @@
             <el-col :span="6">
               <el-form-item label="样品型号:" prop="sampleModel">
                 <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -333,9 +332,9 @@
             <el-col :span="6">
               <el-form-item label="出厂编号:" prop="manufacturingNo">
                 <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -343,9 +342,9 @@
             <el-col :span="6">
               <el-form-item label="委托方代码" prop="customerNo">
                 <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -353,9 +352,9 @@
             <el-col :span="6">
               <el-form-item label="委托方名称" prop="customerName">
                 <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -363,9 +362,9 @@
             <el-col :span="6">
               <el-form-item label="委托方电话" prop="phone">
                 <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -373,9 +372,9 @@
             <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -383,11 +382,11 @@
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
-                  v-model="dataForm.companyAddress"
+                  v-model="sampleForm.customerAddress"
                   type="textarea"
                   autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -395,9 +394,9 @@
             <el-col :span="6">
               <el-form-item label="校检类别:">
                 <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
@@ -407,19 +406,19 @@
             <el-col :span="6">
               <el-form-item label="生产厂家:">
                 <el-input
-                  v-model="dataForm.manufacturer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="厂家国别:">
                 <el-select
-                  v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
@@ -429,23 +428,23 @@
             <el-col :span="6">
               <el-form-item label="出厂年月:">
                 <el-date-picker
-                  v-model="dataForm.manufacturingDate"
+                  v-model="sampleForm.manufacturingDate"
                   type="month"
                   format="YYYY-MM"
                   value-format="YYYY-MM"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="ABC:">
                 <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
@@ -455,9 +454,9 @@
             <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -465,9 +464,9 @@
             <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
-                  v-model="dataForm.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -475,49 +474,20 @@
             <el-col :span="24">
               <el-form-item label="检定项目:" prop="mesureContent">
                 <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定周期（月）:">
                 <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="上次检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  disabled
-                  class="full-width-input"
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
@@ -526,21 +496,21 @@
             <el-col :span="24">
               <el-form-item label="备注:">
                 <el-input
-                  v-model="dataForm.remark"
+                  v-model="sampleForm.remark"
                   type="textarea"
                   :rows="2"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
-                  v-model="dataForm.mesureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
@@ -550,10 +520,10 @@
             <el-col :span="6">
               <el-form-item label="标签绑定:">
                 <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 >
                   <template #append>
                     <el-button>扫描</el-button>
@@ -565,11 +535,11 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="14">
               <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
             </el-col>
@@ -586,7 +556,7 @@
           保存
         </el-button>
       </template>
-      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
@@ -604,11 +574,11 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="dataForm.id!" :order-id="dataForm.orderId" />
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
       <!-- 检定记录 -->
-      <measure-records v-if="currentMenu === '检定记录'" :sample-id="dataForm.id!" />
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
-      <certification-records v-if="currentMenu === '检定证书'" :sample-id="dataForm.id!" />
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index f784804..461c518 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -31,7 +31,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
@@ -39,30 +39,30 @@
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
-  { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center' },
-  { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
-  { text: '分发性质', value: 'distributeState', align: 'center', width: '90px' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return row.alreadyCertifications ? `${row.alreadyCertifications}/${row.requireCertifications}` : '0/0' } },
+  { text: '分发性质', value: 'handOutProperty', align: 'center', width: '90px' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -80,15 +80,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // // 模拟数据
-  // list.value = [
-  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  // ]
-  // loadingTable.value = false
-  // console.log(listQuery.value)
   getTaskList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -111,15 +107,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
+    sampleBelong: '', // 样品属性
     sampleStatus: '2', // 分发状态
+    startTime: '', //	应检定开始时间
+    endTime: '', //	应检定结束时间
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -271,8 +269,8 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue
index 629b33c..2300f4c 100644
--- a/src/views/customer/advice/adviceEdit.vue
+++ b/src/views/customer/advice/adviceEdit.vue
@@ -51,7 +51,7 @@
 const companyInfo: SimpleCompany = reactive({
   customerName: '', // 公司名称
   customerNo: '', //	客户编号
-  customerId: '', // 客户id
+  id: '', // 客户id
   grade: '', // 履约评级
   gradeName: '', // 履约评级
   companySize: '', // 公司规模
@@ -121,12 +121,13 @@
   const item = select as SimpleCompany
   companyInfo.customerName = item.customerName
   companyInfo.customerNo = item.customerNo
-  companyInfo.customerId = item.customerId
+  companyInfo.id = item.id
   companyInfo.gradeName = item.gradeName
   companyInfo.companySizeName = item.companySizeName
   companyInfo.businessSizeName = item.businessSizeName
   companyInfo.evaluationName = item.evaluationName
   dataForm.value.customerNo = item.customerNo
+  dataForm.value.customerId = item.id
 }
 // 打印表单
 const printObj = ref({
@@ -154,8 +155,6 @@
         if (dataForm.value.id) {
           updateAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -164,8 +163,6 @@
         else {
           addAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
diff --git a/src/views/customer/advice/advice_interface.ts b/src/views/customer/advice/advice_interface.ts
index b08f85b..a8bf311 100644
--- a/src/views/customer/advice/advice_interface.ts
+++ b/src/views/customer/advice/advice_interface.ts
@@ -40,9 +40,10 @@
 
 // 公司简易
 export interface SimpleCompany {
+  id: string // 客户id
   customerName: string // 公司名称
   customerNo: string //	客户编号
-  customerId: string // 客户id
+  grade: string // 履约评级
   gradeName: string // 履约评级
   companySizeName: string // 公司规模
   businessSizeName: string // 业务规模
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index f9ee314..4893c4f 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -26,6 +26,7 @@
 const visible = ref(false) // 控制对话框显隐
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -54,17 +55,7 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
-})
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
+})// 表单
 const ruleFormRef = ref<FormInstance>()
 
 // 自定义校验规则--检定周期为正整数
@@ -111,6 +102,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -479,7 +474,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index aceea6a..abcada5 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -36,7 +36,14 @@
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
-  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: ISampleList) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ISampleList[]>([])
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index aafed2a..256ed9f 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -24,6 +24,7 @@
   measurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
   remark: string // 备注
+  validDeadline?: string // 证书过期时间
 }
 
 export interface ISampleEdit {
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 3b03275..d04456b 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -163,7 +163,7 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
+          <el-select v-model="listQuery.businessSize" placeholder="业务规模">
             <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
@@ -183,7 +183,16 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirm">
           确定
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 59f2feb..4deeed8 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -20,18 +20,9 @@
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 
 const dataForm: Ref<ISampleDetail> = ref({
   id: '',
@@ -74,6 +65,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -358,7 +353,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 05fe276..7251eda 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -4,12 +4,16 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOvertimeList, IOvertimeListQuery } from './overtime_list_interface'
+import { ITEM_RENDER_EVT } from 'element-plus/es/components/virtual-list/src/defaults'
+import type { IOvertimeList, IOvertimeListQuery, dictType } from './overtime_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportSapmleList, getSampleList } from '@/api/customer/sampleList'
+import { getDictByCode } from '@/api/system/dict'
+
 const { proxy } = getCurrentInstance() as any
+const certificationStatusMap = ref<dictType[]>([]) as any // 证书状况
 const $router = useRouter()
 
 // 查询条件
@@ -25,12 +29,7 @@
   offset: 1,
   limit: 20,
 })
-// 证书状况字典
-const certificationStatusMap = {
-  0: '未超期',
-  1: '即将超期',
-  2: '已超期',
-}
+
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
@@ -42,7 +41,13 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
-  { text: '证书状况', value: 'certificationStatus', align: 'center' },
+  {
+    text: '证书状况',
+    value: 'certificationStatus',
+    align: 'center',
+    width: '90px',
+    styleFilter: (row: IOvertimeList) => { return row.certificationStatus === '即将超期' ? 'color: red' : '' },
+  },
 ])
 // 表格数据
 const list = ref<IOvertimeList[]>([])
@@ -53,6 +58,16 @@
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
+// 获取字典值
+async function getDict() {
+  // 证书状况
+  const res = await getDictByCode('certificationStatus')
+  // 证书状况字典 {1：即将过期}
+  res.data.forEach((item: any) => {
+    certificationStatusMap.value[`${item.value}`] = item.name
+  })
+}
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -63,7 +78,12 @@
   listQuery.value.startTime = timeRange.value[0] as string || ''
   listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: IOvertimeList) => {
+      return {
+        ...item,
+        certificationStatus: certificationStatusMap.value[item.certificationStatus],
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -161,7 +181,10 @@
   }
 }
 
-fetchData(true)
+onMounted(async () => {
+  await getDict()
+  fetchData(true)
+})
 </script>
 
 <template>
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 519f0af..cceb09b 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -135,7 +135,7 @@
         @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 4eb62ec..9d75cff 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -8,6 +8,7 @@
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { getpDeptApi, listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -19,9 +20,12 @@
   director: '', // 负责人
   administrationJob: '', // 行政职务
   technologyJob: '', // 技术职务
+  meterMajor: '', // 计量专业
   remark: '', // 备注
-  pDeptId: '',
-  pDeptName: '',
+  pDeptId: '', // 父级
+  pDeptName: '', // 父级
+  isLab: '1', // 是否为实验室
+  labCapacity: [], // 实验室能力
 }) // 表单
 // 展示父级组织
 const pDept = ref({
@@ -33,10 +37,11 @@
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
-  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+  organizeName: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
+  director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: ['blur', 'change'] }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: ['blur', 'change'] }],
+  isLab: [{ required: true, message: '是否为实验室不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 // 获取计量人员列表
@@ -53,13 +58,26 @@
     }
   })
 }
-const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
-// 获取技术职务列表
-const getTechnologyJobList = () => {
+const measureTypeList = ref<dictType[]>([]) // 实验室能力
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+const technologyJobList = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  // 获取技术职务列表
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
+  // 获取检校类型
+  getDictByCode('checkType').then((response) => {
+    measureTypeList.value = response.data
+  })
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
 }
+getDict()
+
 const administrationJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
@@ -91,7 +109,8 @@
           type: 'warning',
         },
       ).then((res) => {
-        updateApi({ ...ruleForm.value, title: undefined }).then((res) => {
+        const form = { ...ruleForm.value, labCapacity: ruleForm.value.labCapacity.join(',') }
+        updateApi(form).then((res) => {
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('提交成功')
@@ -117,6 +136,8 @@
   ruleForm.value.administrationJob = '' // 行政职务
   ruleForm.value.technologyJob = '' // 技术职务
   ruleForm.value.remark = '' // 备注
+  ruleForm.value.isLab = ''
+  ruleForm.value.labCapacity = []
 }
 const multipleTableRef = ref()
 const current = ref('')
@@ -141,7 +162,7 @@
       },
       {
         label: '计量专业',
-        data: 'meterMajor',
+        data: 'meterMajorName',
       },
       {
         label: '创建时间',
@@ -196,7 +217,7 @@
       },
       {
         label: '计量专业',
-        data: 'meterMajor',
+        data: 'meterMajorName',
       },
       {
         label: '创建时间',
@@ -434,10 +455,12 @@
   reset()
   title.value = row.title
   path.value = row.path
+  ruleForm.value = row
   ruleForm.value.organizeType = row.organizeType
   ruleForm.value.deptId = row.deptId
+  ruleForm.value.labCapacity = row.labCapacity ? row.labCapacity.split(',') : []
+  ruleForm.value.meterMajor = row.meterMajor
   getuser()
-  getTechnologyJobList()
   getAdministrationJob()
   getDepartmentList()
   getuserInfoList()
@@ -445,7 +468,6 @@
     getInstrumentInfo()
     getDeviceInfo()
   }
-  ruleForm.value = row
   console.log(row, 'row')
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
@@ -538,6 +560,53 @@
           </el-col>
         </el-row>
         <el-row :gutter="24">
+          <el-col v-if="title.split('-')[1] === '科室'" :span="6">
+            <el-form-item label="是否为实验室" prop="isLab">
+              <el-select v-model="ruleForm.isLab" :placeholder="title.split('-')[2] === '详情' ? '' : ''" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
+                <el-option label="是" value="1" />
+                <el-option label="否" value="0" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="title.split('-')[1] !== '部门'" :span="6">
+            <el-form-item label="计量专业" prop="meterMajor">
+              <el-select
+                v-model.trim="ruleForm.meterMajor"
+                clearable
+                :placeholder="title.split('-')[2] === '详情' ? '' : '请选择'"
+                :disabled="ruleForm.isLab === '0' || title.split('-')[2] === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="title.split('-')[1] === '科室'" :span="12">
+            <el-form-item label="实验室能力" prop="labCapacity">
+              <el-select
+                v-model.trim="ruleForm.labCapacity"
+                clearable
+                multiple
+                :placeholder="title.split('-')[2] === '详情' ? '' : '请选择'"
+                :disabled="ruleForm.isLab === '0' || title.split('-')[2] === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureTypeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
@@ -586,13 +655,5 @@
 </template>
 
 <style lang="scss" scoped>
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      content: "";
-      display: none;
-    }
-  }
-}
+// 样式代码
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index f7fd689..33e63c8 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -66,7 +66,7 @@
     columns: [
       { text: '科室编号', value: 'organizeNo', align: 'center' },
       { text: '科室名称', value: 'organizeName', align: 'center' },
-      { text: '专业', value: 'meterMajor', align: 'center' },
+      { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '技术职务', value: 'technologyJobName', align: 'center' },
       { text: '行政职务', value: 'administrationJobName', align: 'center' },
@@ -79,7 +79,7 @@
     columns: [
       { text: '工程组编号', value: 'organizeNo', align: 'center' },
       { text: '工程组名', value: 'organizeName', align: 'center' },
-      { text: '计量专业', value: 'meterMajor', align: 'center' },
+      { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
       { text: '所属科室', value: 'pDeptName', align: 'center' },
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index f7911fa..0528cc7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -7,7 +7,7 @@
   organizeType?: string // 类型
   createTime?: string // 创建时间
   director?: string // 负责人
-  meterMajor?: string // 专业
+  meterMajor: string // 专业
   pDeptId?: string // 所属科室
   createEndTime?: string
   createStartTime?: string
@@ -45,4 +45,6 @@
   technologyJobName: string
   updateTime: string
   title?: string
+  isLab: string // 是否为实验室
+  labCapacity: string | string[]
 }

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
new file mode 100644
index 0000000..d6827e4
--- /dev/null
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts" name="DistributeDialog">
+import processConfig from './processConfig.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { getTaskDetail } from '@/api/business/task'
+// 任务分发弹窗
+
+// 自定义方法：close关闭弹窗
+const emit = defineEmits(['close'])
+const dialogVisible = ref(false) // 弹窗显示
+const sampleId = ref('') // 样品id
+const orderId = ref('') // 委托单id
+
+// 委托书-证书类别列表
+const certificationTypes = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  getDictByCode('certificationType').then((response) => {
+    certificationTypes.value = response.data
+  })
+}
+
+getDict()
+// 样品详情
+const sampleDetail = ref({
+  sampleName: '压力表',
+  mesureContent: '压力、ip68',
+  certifications: ['1', '2'],
+  remark: '这是备注',
+  measureProcessList: [],
+  measureSendBackList: [],
+})
+
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    sampleDetail.value.sampleName = res.data.sampleName
+    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.remark = res.data.remark
+    sampleDetail.value.certifications = res.data.certifications
+    sampleDetail.value.measureProcessList = res.data.measureProcessList
+    sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+  })
+}
+// 初始化弹窗
+const initDialog = (orderid: string, sampleid: string) => {
+  dialogVisible.value = true
+  sampleId.value = sampleid
+  orderId.value = orderid
+  getInfo()
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+  emit('close')
+}
+function cancel() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="任务分发" width="1000" @close="cancel">
+    <div class="simple-info">
+      <div class="simple-info-line">
+        <span class="label">样品名称:</span>
+        <el-input v-model="sampleDetail.sampleName" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">证书类别:</span>
+        <el-checkbox-group v-model="sampleDetail.certifications" disabled>
+          <el-checkbox v-for="item in certificationTypes" :key="item.value" :label="item.value">
+            {{ item.name }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="simple-info-line">
+        <span class="label">检定项目:</span>
+        <el-input v-model="sampleDetail.mesureContent" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">备注:</span>
+        <el-input v-model="sampleDetail.remark" disabled />
+      </div>
+    </div>
+    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+      批量添加
+    </el-button>
+    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <template #footer>
+      <el-button type="primary" @click="saveProcess">
+        确定
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//  样式
+.simple-info {
+  margin-top: -10px;
+  margin-bottom: 10px;
+
+  .simple-info-line {
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    .label {
+      width: 90px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/components/lab-interface.ts b/src/views/business/schedule/task/components/lab-interface.ts
index d6355c6..02b0d1d 100644
--- a/src/views/business/schedule/task/components/lab-interface.ts
+++ b/src/views/business/schedule/task/components/lab-interface.ts
@@ -6,7 +6,8 @@
   isLab: '1' // 是否是实验室
   director: string // 负责人
   meterMajor: string // 专业
-  measureItems: string// 检测能力
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
 }
 
 // 部门返回值对象类型
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 4ccab04..1efb8a9 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -1,11 +1,18 @@
 <script setup lang="ts" name="ProcessConfig">
 import { ref } from 'vue'
 import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
 import ProcessNode from './processNode.vue'
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/task'
 const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
   // 是否为详情展示页面
   detail: {
     type: Boolean,
@@ -21,81 +28,35 @@
     type: String,
     required: true,
   },
+  list: {
+    type: Array,
+    default: () => [],
+  },
 })
 const emits = defineEmits(['saveOver'])
 // 默认流程节点
-const defaultProcess = {
-  id: '', // 检测节点id
-  executiveItem: '', // 检测项目
-  executiveDept: '', // 检测部门
-  executiveDeptName: '', // 检测部门
-  executivePerson: '', // 检测人员
-  executivePersonName: '', // 检测人员
-  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-  measureStateName: '', // 检测状态
-  currentCertifications: '', // 当前证书数
-  requireCertifications: '', // 应出具证书数
-  updateTime: '', // 更新时间
-  backPerson: '', // 退回人
-  backReason: '', // 退回原因
-  backTime: '', // 退回时间
-  distributePerson: '', // 分配人
-  distributeTime: '', // 分配时间
-  startTime: '', // 检测开始时间
-  overTime: '', // 检测结束时间
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
 }
 // 检定流程列表
-const processList = ref([
+const processList = ref<IScheduleSet[]>([
   { ...defaultProcess },
 ])
 
-// 获取当前样品检测流程，参数待定
-const fetchProcess = () => {
-  // TODO: 模拟数据
-  processList.value = [
-    {
-      id: '1', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423635973935106', // 检测部门
-      executiveDeptName: '力学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '张三', // 检测人员
-      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待检测', // 检测状态
-      currentCertifications: '0', // 当前证书数
-      requireCertifications: '2', // 应出具证书数
-      updateTime: '2023-02-01 09:00:05', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-    {
-      id: '2', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423577505337346', // 检测部门
-      executiveDeptName: '热学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待分配', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-  ]
-}
-fetchProcess()
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+})
 
 // 点击添加流程
 const processAdd = () => {
@@ -121,25 +82,17 @@
 // 批量添加实验室
 const batchChooseOver = (labs: ILabList[]) => {
   for (const item of labs) {
-    const processTemp = {
-      id: '',
-      executiveItem: '', // 检测项目
-      executiveDept: item.deptId, // 检测部门
-      executiveDeptName: item.organizeName, // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
     }
     processList.value.push(processTemp)
   }
@@ -147,9 +100,24 @@
 
 // 保存流程
 const saveProcess = () => {
-  // TODO: 保存流程
-  console.log(processList.value)
-  emits('saveOver')
+  const form = {
+    measureProcessList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  console.log(form)
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
 }
 // 删除流程
 const deleteProcess = (index: number) => {
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index 6cbdf10..31dfae4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -12,24 +12,16 @@
     type: Object,
     default: () => {
       return {
-        id: '', // 检测节点id
-        executiveItem: '', // 检测项目
-        executiveDept: '', // 检测部门
-        executiveDeptName: '', // 检测部门
-        executivePerson: '', // 检测人员
-        executivePersonName: '', // 检测人员
-        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-        measureStateName: '', // 检测状态
-        currentCertifications: '', // 当前证书数
-        requireCertifications: '', // 应出具证书数
-        updateTime: '', // 更新时间
-        backPerson: '', // 退回人
-        backReason: '', // 退回原因
-        backTime: '', // 退回时间
-        distributePerson: '', // 分配人
-        distributeTime: '', // 分配时间
-        startTime: '', // 检测开始时间
-        overTime: '', // 检测结束时间
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
       }
     },
   },
@@ -56,22 +48,23 @@
 })
 // 检定环节可编辑-只有待分发状态可编辑
 const deptEdit = computed(() => {
-  return processNodeData.value.measureState == '0'
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 检定人可编辑-待分配状态可编辑
 const personEdit = computed(() => {
-  const editStates = ['0', '1']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 证书可编辑-待分发、待分配、待检测状态可编辑
 const certificationEdit = computed(() => {
-  const editStates = ['0', '1', '2']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 节点可移动
 const canMove = computed(() => {
-  const editStates = ['0']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 
 // 选择实验室
@@ -82,8 +75,8 @@
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
   console.log(lab)
-  processNodeData.value.executiveDept = lab.deptId
-  processNodeData.value.executiveDeptName = lab.organizeName
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
 }
 
 // 选择人员
@@ -93,8 +86,8 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
-  processNodeData.value.executivePerson = person.id
-  processNodeData.value.executivePersonName = person.name
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
 }
 
@@ -122,7 +115,7 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit">
           <template v-if="deptEdit" #append>
             <el-button :icon="Aim" size="small" link @click="clickChoose" />
           </template>
@@ -130,7 +123,7 @@
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit">
           <template v-if="personEdit" #append>
             <el-button :icon="Aim" size="small" link @click="choosePerson" />
           </template>
@@ -140,7 +133,7 @@
         <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
       <div class="line">
-        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
       </div>
       <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
@@ -149,7 +142,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 1d02839..493fbba 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,5 +1,3 @@
-import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
-
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -8,12 +6,29 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
   offset: number
 }
 
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
 // 任务列表-返回值
 export interface ITaskList {
   orderId: string // 委托书编号
@@ -25,41 +40,127 @@
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  isUrgent: string // 是否加急
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
   requireOverTime: string // 应检完时间
-  sampleAttr: string // 样品属性
-  sampleAttrName: string // 样品属性
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
   currentMeasureState: string // 当前检定环节
   currentMeasureStateName: string // 当前检定环节
-  currentCertifications: number // 已出具证书总数
+  alreadyCertifications: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
-  distributeStateName: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
 }
 
-// 检测流程节点
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+}
+
+// 全部检测流程节点
 export interface ISchedule {
-  executivePerson: string // 执行人
-  executivePersonName: string // 执行人名称
-  executiveDept: string // 执行部门
-  executiveDeptName: string // 执行部门名称
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
   executiveItem: string // 检定项目
-  currentCertifications?: number // 已出具证书总数
+  alreadyCertifications?: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  measureState: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
   updateTime: string // 流程更新时间
-  backTime: string // 退回时间
-  backReason: string // 退回原因
-  backPerson: string // 退回人
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
   distributePerson: string // 分配人
   distributeTime: string // 分配时间
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
 
 // 样品检测信息
-export interface ISampleMeasure extends ISampleEdit {
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
   orderId: string // 委托单id
+  orderCode: string // 委托单编号
   certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
 }
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 465b2e7..547ee3e 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,28 +1,27 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
-import type { ISampleMeasure } from './task-interface'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
 import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getTaskDetail } from '@/api/business/task'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // 样品详情id
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -39,32 +38,49 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleMeasure> = ref({
-  id: '',
-  orderId: '', // 委托单id
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
   postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
   manufacturer: '', // 生产厂家
   manufacturerCountry: '', // 厂家国别
   manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
   remark: '', // 备注
   minioFileName: '', // 说明书
   labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-  certifications: '',
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
 })
 const ruleFormRef = ref<FormInstance>()
 
@@ -143,14 +159,6 @@
   return menu.find(item => item.name === currentMenu.value)
 })
 
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
 const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
@@ -181,11 +189,9 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(dataForm.value).then((res) => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -195,42 +201,23 @@
     }
   })
 }
-
-// 获取样品详情
+//
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
 const getInfo = () => {
-  // getSapmleDetail({ id: infoId.value }).then((res) => {
-  dataForm.value = {
-    orderId: '123',
-    ABC: 'A',
-    companyAddress: '北京/北京市',
-    customerName: '京东集团',
-    customerNo: 'sygf202211290001',
-    id: '111111',
-    labelBind: '11222',
-    manufacturer: '北京某厂家',
-    manufacturerCountry: 'CN',
-    manufacturingDate: '2023-03',
-    manufacturingNo: '123121',
-    mesureCategory: '',
-    mesureContent: '项目1',
-    mesurePeriod: '1',
-    mesureType: '',
-    minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-    phone: '950618',
-    postalCode: 'test',
-    remark: '无备注',
-    sampleModel: '型号1',
-    sampleName: '样品1',
-    sampleNo: '123456',
-    measureResultCode: 'bhg',
-    deliverer: '张三',
-    delivererTel: '156254577545',
-    certifications: '1',
-  }
-  // for (const item of menu) {
-  //   item.searchFunc()
-  // }
-  // })
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList
+    taskForm.value.measureSendBackList = res.data.measureSendBackList
+  })
 }
 
 // 点击标签绑定的扫描
@@ -260,7 +247,7 @@
     fd.append('multipartFile', event.target.files[0])
     // UploadFile(fd).then((res) => {
     //   if (res.code === 200) {
-    //     dataForm.value.minioFileName = res.data[0]
+    //     sampleForm.value.minioFileName = res.data[0]
     //     // 重置当前验证
     //     ElMessage.success('文件上传成功')
     //   }
@@ -273,18 +260,30 @@
 const upload = () => {
   fileRef.value.click()
 }
-// 获取样品详情
-getInfo()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.role) {
+  roleType.value = $route.params.role as string // 使用角色
+
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+    getSampleInfo()
+  }
+}
 </script>
 
 <template>
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -294,7 +293,7 @@
       <div id="form">
         <el-form
           ref="ruleFormRef"
-          :model="dataForm"
+          :model="sampleForm"
           :label-width="120"
           label-position="right"
           :rules="rules"
@@ -303,9 +302,9 @@
             <el-col :span="6">
               <el-form-item label="样品编号:" prop="sampleNo">
                 <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -313,9 +312,9 @@
             <el-col :span="6">
               <el-form-item label="样品名称:" prop="sampleName">
                 <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -323,9 +322,9 @@
             <el-col :span="6">
               <el-form-item label="样品型号:" prop="sampleModel">
                 <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -333,9 +332,9 @@
             <el-col :span="6">
               <el-form-item label="出厂编号:" prop="manufacturingNo">
                 <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -343,9 +342,9 @@
             <el-col :span="6">
               <el-form-item label="委托方代码" prop="customerNo">
                 <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -353,9 +352,9 @@
             <el-col :span="6">
               <el-form-item label="委托方名称" prop="customerName">
                 <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -363,9 +362,9 @@
             <el-col :span="6">
               <el-form-item label="委托方电话" prop="phone">
                 <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -373,9 +372,9 @@
             <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -383,11 +382,11 @@
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
-                  v-model="dataForm.companyAddress"
+                  v-model="sampleForm.customerAddress"
                   type="textarea"
                   autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -395,9 +394,9 @@
             <el-col :span="6">
               <el-form-item label="校检类别:">
                 <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
@@ -407,19 +406,19 @@
             <el-col :span="6">
               <el-form-item label="生产厂家:">
                 <el-input
-                  v-model="dataForm.manufacturer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="厂家国别:">
                 <el-select
-                  v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
@@ -429,23 +428,23 @@
             <el-col :span="6">
               <el-form-item label="出厂年月:">
                 <el-date-picker
-                  v-model="dataForm.manufacturingDate"
+                  v-model="sampleForm.manufacturingDate"
                   type="month"
                   format="YYYY-MM"
                   value-format="YYYY-MM"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="ABC:">
                 <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
@@ -455,9 +454,9 @@
             <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -465,9 +464,9 @@
             <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
-                  v-model="dataForm.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -475,49 +474,20 @@
             <el-col :span="24">
               <el-form-item label="检定项目:" prop="mesureContent">
                 <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定周期（月）:">
                 <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="上次检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  disabled
-                  class="full-width-input"
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
@@ -526,21 +496,21 @@
             <el-col :span="24">
               <el-form-item label="备注:">
                 <el-input
-                  v-model="dataForm.remark"
+                  v-model="sampleForm.remark"
                   type="textarea"
                   :rows="2"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
-                  v-model="dataForm.mesureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
@@ -550,10 +520,10 @@
             <el-col :span="6">
               <el-form-item label="标签绑定:">
                 <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 >
                   <template #append>
                     <el-button>扫描</el-button>
@@ -565,11 +535,11 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="14">
               <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
             </el-col>
@@ -586,7 +556,7 @@
           保存
         </el-button>
       </template>
-      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
@@ -604,11 +574,11 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="dataForm.id!" :order-id="dataForm.orderId" />
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
       <!-- 检定记录 -->
-      <measure-records v-if="currentMenu === '检定记录'" :sample-id="dataForm.id!" />
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
-      <certification-records v-if="currentMenu === '检定证书'" :sample-id="dataForm.id!" />
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index f784804..461c518 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -31,7 +31,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
@@ -39,30 +39,30 @@
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
-  { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center' },
-  { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
-  { text: '分发性质', value: 'distributeState', align: 'center', width: '90px' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return row.alreadyCertifications ? `${row.alreadyCertifications}/${row.requireCertifications}` : '0/0' } },
+  { text: '分发性质', value: 'handOutProperty', align: 'center', width: '90px' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -80,15 +80,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // // 模拟数据
-  // list.value = [
-  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  // ]
-  // loadingTable.value = false
-  // console.log(listQuery.value)
   getTaskList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -111,15 +107,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
+    sampleBelong: '', // 样品属性
     sampleStatus: '2', // 分发状态
+    startTime: '', //	应检定开始时间
+    endTime: '', //	应检定结束时间
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -271,8 +269,8 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue
index 629b33c..2300f4c 100644
--- a/src/views/customer/advice/adviceEdit.vue
+++ b/src/views/customer/advice/adviceEdit.vue
@@ -51,7 +51,7 @@
 const companyInfo: SimpleCompany = reactive({
   customerName: '', // 公司名称
   customerNo: '', //	客户编号
-  customerId: '', // 客户id
+  id: '', // 客户id
   grade: '', // 履约评级
   gradeName: '', // 履约评级
   companySize: '', // 公司规模
@@ -121,12 +121,13 @@
   const item = select as SimpleCompany
   companyInfo.customerName = item.customerName
   companyInfo.customerNo = item.customerNo
-  companyInfo.customerId = item.customerId
+  companyInfo.id = item.id
   companyInfo.gradeName = item.gradeName
   companyInfo.companySizeName = item.companySizeName
   companyInfo.businessSizeName = item.businessSizeName
   companyInfo.evaluationName = item.evaluationName
   dataForm.value.customerNo = item.customerNo
+  dataForm.value.customerId = item.id
 }
 // 打印表单
 const printObj = ref({
@@ -154,8 +155,6 @@
         if (dataForm.value.id) {
           updateAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -164,8 +163,6 @@
         else {
           addAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
diff --git a/src/views/customer/advice/advice_interface.ts b/src/views/customer/advice/advice_interface.ts
index b08f85b..a8bf311 100644
--- a/src/views/customer/advice/advice_interface.ts
+++ b/src/views/customer/advice/advice_interface.ts
@@ -40,9 +40,10 @@
 
 // 公司简易
 export interface SimpleCompany {
+  id: string // 客户id
   customerName: string // 公司名称
   customerNo: string //	客户编号
-  customerId: string // 客户id
+  grade: string // 履约评级
   gradeName: string // 履约评级
   companySizeName: string // 公司规模
   businessSizeName: string // 业务规模
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index f9ee314..4893c4f 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -26,6 +26,7 @@
 const visible = ref(false) // 控制对话框显隐
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -54,17 +55,7 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
-})
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
+})// 表单
 const ruleFormRef = ref<FormInstance>()
 
 // 自定义校验规则--检定周期为正整数
@@ -111,6 +102,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -479,7 +474,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index aceea6a..abcada5 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -36,7 +36,14 @@
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
-  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: ISampleList) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ISampleList[]>([])
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index aafed2a..256ed9f 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -24,6 +24,7 @@
   measurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
   remark: string // 备注
+  validDeadline?: string // 证书过期时间
 }
 
 export interface ISampleEdit {
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 3b03275..d04456b 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -163,7 +163,7 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
+          <el-select v-model="listQuery.businessSize" placeholder="业务规模">
             <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
@@ -183,7 +183,16 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirm">
           确定
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 59f2feb..4deeed8 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -20,18 +20,9 @@
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 
 const dataForm: Ref<ISampleDetail> = ref({
   id: '',
@@ -74,6 +65,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -358,7 +353,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 05fe276..7251eda 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -4,12 +4,16 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOvertimeList, IOvertimeListQuery } from './overtime_list_interface'
+import { ITEM_RENDER_EVT } from 'element-plus/es/components/virtual-list/src/defaults'
+import type { IOvertimeList, IOvertimeListQuery, dictType } from './overtime_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportSapmleList, getSampleList } from '@/api/customer/sampleList'
+import { getDictByCode } from '@/api/system/dict'
+
 const { proxy } = getCurrentInstance() as any
+const certificationStatusMap = ref<dictType[]>([]) as any // 证书状况
 const $router = useRouter()
 
 // 查询条件
@@ -25,12 +29,7 @@
   offset: 1,
   limit: 20,
 })
-// 证书状况字典
-const certificationStatusMap = {
-  0: '未超期',
-  1: '即将超期',
-  2: '已超期',
-}
+
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
@@ -42,7 +41,13 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
-  { text: '证书状况', value: 'certificationStatus', align: 'center' },
+  {
+    text: '证书状况',
+    value: 'certificationStatus',
+    align: 'center',
+    width: '90px',
+    styleFilter: (row: IOvertimeList) => { return row.certificationStatus === '即将超期' ? 'color: red' : '' },
+  },
 ])
 // 表格数据
 const list = ref<IOvertimeList[]>([])
@@ -53,6 +58,16 @@
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
+// 获取字典值
+async function getDict() {
+  // 证书状况
+  const res = await getDictByCode('certificationStatus')
+  // 证书状况字典 {1：即将过期}
+  res.data.forEach((item: any) => {
+    certificationStatusMap.value[`${item.value}`] = item.name
+  })
+}
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -63,7 +78,12 @@
   listQuery.value.startTime = timeRange.value[0] as string || ''
   listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: IOvertimeList) => {
+      return {
+        ...item,
+        certificationStatus: certificationStatusMap.value[item.certificationStatus],
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -161,7 +181,10 @@
   }
 }
 
-fetchData(true)
+onMounted(async () => {
+  await getDict()
+  fetchData(true)
+})
 </script>
 
 <template>
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 519f0af..cceb09b 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -135,7 +135,7 @@
         @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 4eb62ec..9d75cff 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -8,6 +8,7 @@
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { getpDeptApi, listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -19,9 +20,12 @@
   director: '', // 负责人
   administrationJob: '', // 行政职务
   technologyJob: '', // 技术职务
+  meterMajor: '', // 计量专业
   remark: '', // 备注
-  pDeptId: '',
-  pDeptName: '',
+  pDeptId: '', // 父级
+  pDeptName: '', // 父级
+  isLab: '1', // 是否为实验室
+  labCapacity: [], // 实验室能力
 }) // 表单
 // 展示父级组织
 const pDept = ref({
@@ -33,10 +37,11 @@
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
-  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+  organizeName: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
+  director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: ['blur', 'change'] }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: ['blur', 'change'] }],
+  isLab: [{ required: true, message: '是否为实验室不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 // 获取计量人员列表
@@ -53,13 +58,26 @@
     }
   })
 }
-const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
-// 获取技术职务列表
-const getTechnologyJobList = () => {
+const measureTypeList = ref<dictType[]>([]) // 实验室能力
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+const technologyJobList = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  // 获取技术职务列表
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
+  // 获取检校类型
+  getDictByCode('checkType').then((response) => {
+    measureTypeList.value = response.data
+  })
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
 }
+getDict()
+
 const administrationJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
@@ -91,7 +109,8 @@
           type: 'warning',
         },
       ).then((res) => {
-        updateApi({ ...ruleForm.value, title: undefined }).then((res) => {
+        const form = { ...ruleForm.value, labCapacity: ruleForm.value.labCapacity.join(',') }
+        updateApi(form).then((res) => {
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('提交成功')
@@ -117,6 +136,8 @@
   ruleForm.value.administrationJob = '' // 行政职务
   ruleForm.value.technologyJob = '' // 技术职务
   ruleForm.value.remark = '' // 备注
+  ruleForm.value.isLab = ''
+  ruleForm.value.labCapacity = []
 }
 const multipleTableRef = ref()
 const current = ref('')
@@ -141,7 +162,7 @@
       },
       {
         label: '计量专业',
-        data: 'meterMajor',
+        data: 'meterMajorName',
       },
       {
         label: '创建时间',
@@ -196,7 +217,7 @@
       },
       {
         label: '计量专业',
-        data: 'meterMajor',
+        data: 'meterMajorName',
       },
       {
         label: '创建时间',
@@ -434,10 +455,12 @@
   reset()
   title.value = row.title
   path.value = row.path
+  ruleForm.value = row
   ruleForm.value.organizeType = row.organizeType
   ruleForm.value.deptId = row.deptId
+  ruleForm.value.labCapacity = row.labCapacity ? row.labCapacity.split(',') : []
+  ruleForm.value.meterMajor = row.meterMajor
   getuser()
-  getTechnologyJobList()
   getAdministrationJob()
   getDepartmentList()
   getuserInfoList()
@@ -445,7 +468,6 @@
     getInstrumentInfo()
     getDeviceInfo()
   }
-  ruleForm.value = row
   console.log(row, 'row')
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
@@ -538,6 +560,53 @@
           </el-col>
         </el-row>
         <el-row :gutter="24">
+          <el-col v-if="title.split('-')[1] === '科室'" :span="6">
+            <el-form-item label="是否为实验室" prop="isLab">
+              <el-select v-model="ruleForm.isLab" :placeholder="title.split('-')[2] === '详情' ? '' : ''" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
+                <el-option label="是" value="1" />
+                <el-option label="否" value="0" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="title.split('-')[1] !== '部门'" :span="6">
+            <el-form-item label="计量专业" prop="meterMajor">
+              <el-select
+                v-model.trim="ruleForm.meterMajor"
+                clearable
+                :placeholder="title.split('-')[2] === '详情' ? '' : '请选择'"
+                :disabled="ruleForm.isLab === '0' || title.split('-')[2] === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="title.split('-')[1] === '科室'" :span="12">
+            <el-form-item label="实验室能力" prop="labCapacity">
+              <el-select
+                v-model.trim="ruleForm.labCapacity"
+                clearable
+                multiple
+                :placeholder="title.split('-')[2] === '详情' ? '' : '请选择'"
+                :disabled="ruleForm.isLab === '0' || title.split('-')[2] === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureTypeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
@@ -586,13 +655,5 @@
 </template>
 
 <style lang="scss" scoped>
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      content: "";
-      display: none;
-    }
-  }
-}
+// 样式代码
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index f7fd689..33e63c8 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -66,7 +66,7 @@
     columns: [
       { text: '科室编号', value: 'organizeNo', align: 'center' },
       { text: '科室名称', value: 'organizeName', align: 'center' },
-      { text: '专业', value: 'meterMajor', align: 'center' },
+      { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '技术职务', value: 'technologyJobName', align: 'center' },
       { text: '行政职务', value: 'administrationJobName', align: 'center' },
@@ -79,7 +79,7 @@
     columns: [
       { text: '工程组编号', value: 'organizeNo', align: 'center' },
       { text: '工程组名', value: 'organizeName', align: 'center' },
-      { text: '计量专业', value: 'meterMajor', align: 'center' },
+      { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
       { text: '所属科室', value: 'pDeptName', align: 'center' },
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index f7911fa..0528cc7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -7,7 +7,7 @@
   organizeType?: string // 类型
   createTime?: string // 创建时间
   director?: string // 负责人
-  meterMajor?: string // 专业
+  meterMajor: string // 专业
   pDeptId?: string // 所属科室
   createEndTime?: string
   createStartTime?: string
@@ -45,4 +45,6 @@
   technologyJobName: string
   updateTime: string
   title?: string
+  isLab: string // 是否为实验室
+  labCapacity: string | string[]
 }
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 4941fbb..90c6daf 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -21,25 +21,25 @@
 const total = ref<number>(0)
 const select = ref()
 const columns = ref([
-  {
-    text: '人员编号',
-    value: 'staffNo',
-  },
-  {
-    text: '姓名',
-    value: 'name',
-  },
-  {
-    text: '所在部门',
-    value: 'deptId',
-  },
+  { text: '人员编号', value: 'staffNo', width: '160', fixed: true },
+  { text: '姓名', value: 'name', fixed: true },
+  { text: '所在部门', value: 'deptId' },
+  { text: '学历', value: 'education', align: 'center' },
+  { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  { text: '计量专业', value: 'major', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '技术考核', value: 'technologyExam', align: 'center' },
 ])
 // 获取部门
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
 const deptIdList = ref([])
-const getDeptList = () => {
+const getDeptList = () => { // 获取部门
   getDeptTreeList().then((res) => {
     deptIdList.value = toTreeList(res.data, '0', true)
   })
@@ -50,7 +50,7 @@
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records
-      total.value = Number(res.data.total)
+      total.value = parseInt(res.data.total)
     }
   })
 }
@@ -81,8 +81,8 @@
   }
   search()
 }
-// 点击保存
-const submitForm = () => {
+// 点击确定
+const confirmSelect = () => {
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     getStaffDetail(person).then((res) => {
@@ -143,17 +143,17 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <el-table-column label="#" width="55" align="center">
-          <template #default="scope">
-            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column> -->
+          <!-- <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column> -->
         </template>
       </normal-table>
     </div>
     <template #footer>
       <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
         <el-button @click="resetForm">
           取消
         </el-button>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
new file mode 100644
index 0000000..d6827e4
--- /dev/null
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts" name="DistributeDialog">
+import processConfig from './processConfig.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { getTaskDetail } from '@/api/business/task'
+// 任务分发弹窗
+
+// 自定义方法：close关闭弹窗
+const emit = defineEmits(['close'])
+const dialogVisible = ref(false) // 弹窗显示
+const sampleId = ref('') // 样品id
+const orderId = ref('') // 委托单id
+
+// 委托书-证书类别列表
+const certificationTypes = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  getDictByCode('certificationType').then((response) => {
+    certificationTypes.value = response.data
+  })
+}
+
+getDict()
+// 样品详情
+const sampleDetail = ref({
+  sampleName: '压力表',
+  mesureContent: '压力、ip68',
+  certifications: ['1', '2'],
+  remark: '这是备注',
+  measureProcessList: [],
+  measureSendBackList: [],
+})
+
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    sampleDetail.value.sampleName = res.data.sampleName
+    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.remark = res.data.remark
+    sampleDetail.value.certifications = res.data.certifications
+    sampleDetail.value.measureProcessList = res.data.measureProcessList
+    sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+  })
+}
+// 初始化弹窗
+const initDialog = (orderid: string, sampleid: string) => {
+  dialogVisible.value = true
+  sampleId.value = sampleid
+  orderId.value = orderid
+  getInfo()
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+  emit('close')
+}
+function cancel() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="任务分发" width="1000" @close="cancel">
+    <div class="simple-info">
+      <div class="simple-info-line">
+        <span class="label">样品名称:</span>
+        <el-input v-model="sampleDetail.sampleName" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">证书类别:</span>
+        <el-checkbox-group v-model="sampleDetail.certifications" disabled>
+          <el-checkbox v-for="item in certificationTypes" :key="item.value" :label="item.value">
+            {{ item.name }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="simple-info-line">
+        <span class="label">检定项目:</span>
+        <el-input v-model="sampleDetail.mesureContent" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">备注:</span>
+        <el-input v-model="sampleDetail.remark" disabled />
+      </div>
+    </div>
+    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+      批量添加
+    </el-button>
+    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <template #footer>
+      <el-button type="primary" @click="saveProcess">
+        确定
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//  样式
+.simple-info {
+  margin-top: -10px;
+  margin-bottom: 10px;
+
+  .simple-info-line {
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    .label {
+      width: 90px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/components/lab-interface.ts b/src/views/business/schedule/task/components/lab-interface.ts
index d6355c6..02b0d1d 100644
--- a/src/views/business/schedule/task/components/lab-interface.ts
+++ b/src/views/business/schedule/task/components/lab-interface.ts
@@ -6,7 +6,8 @@
   isLab: '1' // 是否是实验室
   director: string // 负责人
   meterMajor: string // 专业
-  measureItems: string// 检测能力
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
 }
 
 // 部门返回值对象类型
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 4ccab04..1efb8a9 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -1,11 +1,18 @@
 <script setup lang="ts" name="ProcessConfig">
 import { ref } from 'vue'
 import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
 import ProcessNode from './processNode.vue'
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/task'
 const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
   // 是否为详情展示页面
   detail: {
     type: Boolean,
@@ -21,81 +28,35 @@
     type: String,
     required: true,
   },
+  list: {
+    type: Array,
+    default: () => [],
+  },
 })
 const emits = defineEmits(['saveOver'])
 // 默认流程节点
-const defaultProcess = {
-  id: '', // 检测节点id
-  executiveItem: '', // 检测项目
-  executiveDept: '', // 检测部门
-  executiveDeptName: '', // 检测部门
-  executivePerson: '', // 检测人员
-  executivePersonName: '', // 检测人员
-  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-  measureStateName: '', // 检测状态
-  currentCertifications: '', // 当前证书数
-  requireCertifications: '', // 应出具证书数
-  updateTime: '', // 更新时间
-  backPerson: '', // 退回人
-  backReason: '', // 退回原因
-  backTime: '', // 退回时间
-  distributePerson: '', // 分配人
-  distributeTime: '', // 分配时间
-  startTime: '', // 检测开始时间
-  overTime: '', // 检测结束时间
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
 }
 // 检定流程列表
-const processList = ref([
+const processList = ref<IScheduleSet[]>([
   { ...defaultProcess },
 ])
 
-// 获取当前样品检测流程，参数待定
-const fetchProcess = () => {
-  // TODO: 模拟数据
-  processList.value = [
-    {
-      id: '1', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423635973935106', // 检测部门
-      executiveDeptName: '力学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '张三', // 检测人员
-      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待检测', // 检测状态
-      currentCertifications: '0', // 当前证书数
-      requireCertifications: '2', // 应出具证书数
-      updateTime: '2023-02-01 09:00:05', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-    {
-      id: '2', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423577505337346', // 检测部门
-      executiveDeptName: '热学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待分配', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-  ]
-}
-fetchProcess()
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+})
 
 // 点击添加流程
 const processAdd = () => {
@@ -121,25 +82,17 @@
 // 批量添加实验室
 const batchChooseOver = (labs: ILabList[]) => {
   for (const item of labs) {
-    const processTemp = {
-      id: '',
-      executiveItem: '', // 检测项目
-      executiveDept: item.deptId, // 检测部门
-      executiveDeptName: item.organizeName, // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
     }
     processList.value.push(processTemp)
   }
@@ -147,9 +100,24 @@
 
 // 保存流程
 const saveProcess = () => {
-  // TODO: 保存流程
-  console.log(processList.value)
-  emits('saveOver')
+  const form = {
+    measureProcessList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  console.log(form)
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
 }
 // 删除流程
 const deleteProcess = (index: number) => {
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index 6cbdf10..31dfae4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -12,24 +12,16 @@
     type: Object,
     default: () => {
       return {
-        id: '', // 检测节点id
-        executiveItem: '', // 检测项目
-        executiveDept: '', // 检测部门
-        executiveDeptName: '', // 检测部门
-        executivePerson: '', // 检测人员
-        executivePersonName: '', // 检测人员
-        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-        measureStateName: '', // 检测状态
-        currentCertifications: '', // 当前证书数
-        requireCertifications: '', // 应出具证书数
-        updateTime: '', // 更新时间
-        backPerson: '', // 退回人
-        backReason: '', // 退回原因
-        backTime: '', // 退回时间
-        distributePerson: '', // 分配人
-        distributeTime: '', // 分配时间
-        startTime: '', // 检测开始时间
-        overTime: '', // 检测结束时间
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
       }
     },
   },
@@ -56,22 +48,23 @@
 })
 // 检定环节可编辑-只有待分发状态可编辑
 const deptEdit = computed(() => {
-  return processNodeData.value.measureState == '0'
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 检定人可编辑-待分配状态可编辑
 const personEdit = computed(() => {
-  const editStates = ['0', '1']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 证书可编辑-待分发、待分配、待检测状态可编辑
 const certificationEdit = computed(() => {
-  const editStates = ['0', '1', '2']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 节点可移动
 const canMove = computed(() => {
-  const editStates = ['0']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 
 // 选择实验室
@@ -82,8 +75,8 @@
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
   console.log(lab)
-  processNodeData.value.executiveDept = lab.deptId
-  processNodeData.value.executiveDeptName = lab.organizeName
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
 }
 
 // 选择人员
@@ -93,8 +86,8 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
-  processNodeData.value.executivePerson = person.id
-  processNodeData.value.executivePersonName = person.name
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
 }
 
@@ -122,7 +115,7 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit">
           <template v-if="deptEdit" #append>
             <el-button :icon="Aim" size="small" link @click="clickChoose" />
           </template>
@@ -130,7 +123,7 @@
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit">
           <template v-if="personEdit" #append>
             <el-button :icon="Aim" size="small" link @click="choosePerson" />
           </template>
@@ -140,7 +133,7 @@
         <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
       <div class="line">
-        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
       </div>
       <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
@@ -149,7 +142,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 1d02839..493fbba 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,5 +1,3 @@
-import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
-
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -8,12 +6,29 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
   offset: number
 }
 
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
 // 任务列表-返回值
 export interface ITaskList {
   orderId: string // 委托书编号
@@ -25,41 +40,127 @@
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  isUrgent: string // 是否加急
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
   requireOverTime: string // 应检完时间
-  sampleAttr: string // 样品属性
-  sampleAttrName: string // 样品属性
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
   currentMeasureState: string // 当前检定环节
   currentMeasureStateName: string // 当前检定环节
-  currentCertifications: number // 已出具证书总数
+  alreadyCertifications: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
-  distributeStateName: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
 }
 
-// 检测流程节点
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+}
+
+// 全部检测流程节点
 export interface ISchedule {
-  executivePerson: string // 执行人
-  executivePersonName: string // 执行人名称
-  executiveDept: string // 执行部门
-  executiveDeptName: string // 执行部门名称
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
   executiveItem: string // 检定项目
-  currentCertifications?: number // 已出具证书总数
+  alreadyCertifications?: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  measureState: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
   updateTime: string // 流程更新时间
-  backTime: string // 退回时间
-  backReason: string // 退回原因
-  backPerson: string // 退回人
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
   distributePerson: string // 分配人
   distributeTime: string // 分配时间
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
 
 // 样品检测信息
-export interface ISampleMeasure extends ISampleEdit {
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
   orderId: string // 委托单id
+  orderCode: string // 委托单编号
   certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
 }
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 465b2e7..547ee3e 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,28 +1,27 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
-import type { ISampleMeasure } from './task-interface'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
 import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getTaskDetail } from '@/api/business/task'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // 样品详情id
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -39,32 +38,49 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleMeasure> = ref({
-  id: '',
-  orderId: '', // 委托单id
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
   postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
   manufacturer: '', // 生产厂家
   manufacturerCountry: '', // 厂家国别
   manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
   remark: '', // 备注
   minioFileName: '', // 说明书
   labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-  certifications: '',
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
 })
 const ruleFormRef = ref<FormInstance>()
 
@@ -143,14 +159,6 @@
   return menu.find(item => item.name === currentMenu.value)
 })
 
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
 const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
@@ -181,11 +189,9 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(dataForm.value).then((res) => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -195,42 +201,23 @@
     }
   })
 }
-
-// 获取样品详情
+//
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
 const getInfo = () => {
-  // getSapmleDetail({ id: infoId.value }).then((res) => {
-  dataForm.value = {
-    orderId: '123',
-    ABC: 'A',
-    companyAddress: '北京/北京市',
-    customerName: '京东集团',
-    customerNo: 'sygf202211290001',
-    id: '111111',
-    labelBind: '11222',
-    manufacturer: '北京某厂家',
-    manufacturerCountry: 'CN',
-    manufacturingDate: '2023-03',
-    manufacturingNo: '123121',
-    mesureCategory: '',
-    mesureContent: '项目1',
-    mesurePeriod: '1',
-    mesureType: '',
-    minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-    phone: '950618',
-    postalCode: 'test',
-    remark: '无备注',
-    sampleModel: '型号1',
-    sampleName: '样品1',
-    sampleNo: '123456',
-    measureResultCode: 'bhg',
-    deliverer: '张三',
-    delivererTel: '156254577545',
-    certifications: '1',
-  }
-  // for (const item of menu) {
-  //   item.searchFunc()
-  // }
-  // })
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList
+    taskForm.value.measureSendBackList = res.data.measureSendBackList
+  })
 }
 
 // 点击标签绑定的扫描
@@ -260,7 +247,7 @@
     fd.append('multipartFile', event.target.files[0])
     // UploadFile(fd).then((res) => {
     //   if (res.code === 200) {
-    //     dataForm.value.minioFileName = res.data[0]
+    //     sampleForm.value.minioFileName = res.data[0]
     //     // 重置当前验证
     //     ElMessage.success('文件上传成功')
     //   }
@@ -273,18 +260,30 @@
 const upload = () => {
   fileRef.value.click()
 }
-// 获取样品详情
-getInfo()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.role) {
+  roleType.value = $route.params.role as string // 使用角色
+
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+    getSampleInfo()
+  }
+}
 </script>
 
 <template>
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -294,7 +293,7 @@
       <div id="form">
         <el-form
           ref="ruleFormRef"
-          :model="dataForm"
+          :model="sampleForm"
           :label-width="120"
           label-position="right"
           :rules="rules"
@@ -303,9 +302,9 @@
             <el-col :span="6">
               <el-form-item label="样品编号:" prop="sampleNo">
                 <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -313,9 +312,9 @@
             <el-col :span="6">
               <el-form-item label="样品名称:" prop="sampleName">
                 <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -323,9 +322,9 @@
             <el-col :span="6">
               <el-form-item label="样品型号:" prop="sampleModel">
                 <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -333,9 +332,9 @@
             <el-col :span="6">
               <el-form-item label="出厂编号:" prop="manufacturingNo">
                 <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -343,9 +342,9 @@
             <el-col :span="6">
               <el-form-item label="委托方代码" prop="customerNo">
                 <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -353,9 +352,9 @@
             <el-col :span="6">
               <el-form-item label="委托方名称" prop="customerName">
                 <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -363,9 +362,9 @@
             <el-col :span="6">
               <el-form-item label="委托方电话" prop="phone">
                 <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -373,9 +372,9 @@
             <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -383,11 +382,11 @@
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
-                  v-model="dataForm.companyAddress"
+                  v-model="sampleForm.customerAddress"
                   type="textarea"
                   autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -395,9 +394,9 @@
             <el-col :span="6">
               <el-form-item label="校检类别:">
                 <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
@@ -407,19 +406,19 @@
             <el-col :span="6">
               <el-form-item label="生产厂家:">
                 <el-input
-                  v-model="dataForm.manufacturer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="厂家国别:">
                 <el-select
-                  v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
@@ -429,23 +428,23 @@
             <el-col :span="6">
               <el-form-item label="出厂年月:">
                 <el-date-picker
-                  v-model="dataForm.manufacturingDate"
+                  v-model="sampleForm.manufacturingDate"
                   type="month"
                   format="YYYY-MM"
                   value-format="YYYY-MM"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="ABC:">
                 <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
@@ -455,9 +454,9 @@
             <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -465,9 +464,9 @@
             <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
-                  v-model="dataForm.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -475,49 +474,20 @@
             <el-col :span="24">
               <el-form-item label="检定项目:" prop="mesureContent">
                 <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定周期（月）:">
                 <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="上次检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  disabled
-                  class="full-width-input"
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
@@ -526,21 +496,21 @@
             <el-col :span="24">
               <el-form-item label="备注:">
                 <el-input
-                  v-model="dataForm.remark"
+                  v-model="sampleForm.remark"
                   type="textarea"
                   :rows="2"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
-                  v-model="dataForm.mesureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
@@ -550,10 +520,10 @@
             <el-col :span="6">
               <el-form-item label="标签绑定:">
                 <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 >
                   <template #append>
                     <el-button>扫描</el-button>
@@ -565,11 +535,11 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="14">
               <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
             </el-col>
@@ -586,7 +556,7 @@
           保存
         </el-button>
       </template>
-      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
@@ -604,11 +574,11 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="dataForm.id!" :order-id="dataForm.orderId" />
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
       <!-- 检定记录 -->
-      <measure-records v-if="currentMenu === '检定记录'" :sample-id="dataForm.id!" />
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
-      <certification-records v-if="currentMenu === '检定证书'" :sample-id="dataForm.id!" />
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index f784804..461c518 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -31,7 +31,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
@@ -39,30 +39,30 @@
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
-  { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center' },
-  { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
-  { text: '分发性质', value: 'distributeState', align: 'center', width: '90px' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return row.alreadyCertifications ? `${row.alreadyCertifications}/${row.requireCertifications}` : '0/0' } },
+  { text: '分发性质', value: 'handOutProperty', align: 'center', width: '90px' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -80,15 +80,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // // 模拟数据
-  // list.value = [
-  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  // ]
-  // loadingTable.value = false
-  // console.log(listQuery.value)
   getTaskList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -111,15 +107,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
+    sampleBelong: '', // 样品属性
     sampleStatus: '2', // 分发状态
+    startTime: '', //	应检定开始时间
+    endTime: '', //	应检定结束时间
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -271,8 +269,8 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue
index 629b33c..2300f4c 100644
--- a/src/views/customer/advice/adviceEdit.vue
+++ b/src/views/customer/advice/adviceEdit.vue
@@ -51,7 +51,7 @@
 const companyInfo: SimpleCompany = reactive({
   customerName: '', // 公司名称
   customerNo: '', //	客户编号
-  customerId: '', // 客户id
+  id: '', // 客户id
   grade: '', // 履约评级
   gradeName: '', // 履约评级
   companySize: '', // 公司规模
@@ -121,12 +121,13 @@
   const item = select as SimpleCompany
   companyInfo.customerName = item.customerName
   companyInfo.customerNo = item.customerNo
-  companyInfo.customerId = item.customerId
+  companyInfo.id = item.id
   companyInfo.gradeName = item.gradeName
   companyInfo.companySizeName = item.companySizeName
   companyInfo.businessSizeName = item.businessSizeName
   companyInfo.evaluationName = item.evaluationName
   dataForm.value.customerNo = item.customerNo
+  dataForm.value.customerId = item.id
 }
 // 打印表单
 const printObj = ref({
@@ -154,8 +155,6 @@
         if (dataForm.value.id) {
           updateAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -164,8 +163,6 @@
         else {
           addAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
diff --git a/src/views/customer/advice/advice_interface.ts b/src/views/customer/advice/advice_interface.ts
index b08f85b..a8bf311 100644
--- a/src/views/customer/advice/advice_interface.ts
+++ b/src/views/customer/advice/advice_interface.ts
@@ -40,9 +40,10 @@
 
 // 公司简易
 export interface SimpleCompany {
+  id: string // 客户id
   customerName: string // 公司名称
   customerNo: string //	客户编号
-  customerId: string // 客户id
+  grade: string // 履约评级
   gradeName: string // 履约评级
   companySizeName: string // 公司规模
   businessSizeName: string // 业务规模
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index f9ee314..4893c4f 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -26,6 +26,7 @@
 const visible = ref(false) // 控制对话框显隐
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -54,17 +55,7 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
-})
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
+})// 表单
 const ruleFormRef = ref<FormInstance>()
 
 // 自定义校验规则--检定周期为正整数
@@ -111,6 +102,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -479,7 +474,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index aceea6a..abcada5 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -36,7 +36,14 @@
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
-  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: ISampleList) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ISampleList[]>([])
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index aafed2a..256ed9f 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -24,6 +24,7 @@
   measurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
   remark: string // 备注
+  validDeadline?: string // 证书过期时间
 }
 
 export interface ISampleEdit {
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 3b03275..d04456b 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -163,7 +163,7 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
+          <el-select v-model="listQuery.businessSize" placeholder="业务规模">
             <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
@@ -183,7 +183,16 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirm">
           确定
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 59f2feb..4deeed8 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -20,18 +20,9 @@
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 
 const dataForm: Ref<ISampleDetail> = ref({
   id: '',
@@ -74,6 +65,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -358,7 +353,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 05fe276..7251eda 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -4,12 +4,16 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOvertimeList, IOvertimeListQuery } from './overtime_list_interface'
+import { ITEM_RENDER_EVT } from 'element-plus/es/components/virtual-list/src/defaults'
+import type { IOvertimeList, IOvertimeListQuery, dictType } from './overtime_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportSapmleList, getSampleList } from '@/api/customer/sampleList'
+import { getDictByCode } from '@/api/system/dict'
+
 const { proxy } = getCurrentInstance() as any
+const certificationStatusMap = ref<dictType[]>([]) as any // 证书状况
 const $router = useRouter()
 
 // 查询条件
@@ -25,12 +29,7 @@
   offset: 1,
   limit: 20,
 })
-// 证书状况字典
-const certificationStatusMap = {
-  0: '未超期',
-  1: '即将超期',
-  2: '已超期',
-}
+
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
@@ -42,7 +41,13 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
-  { text: '证书状况', value: 'certificationStatus', align: 'center' },
+  {
+    text: '证书状况',
+    value: 'certificationStatus',
+    align: 'center',
+    width: '90px',
+    styleFilter: (row: IOvertimeList) => { return row.certificationStatus === '即将超期' ? 'color: red' : '' },
+  },
 ])
 // 表格数据
 const list = ref<IOvertimeList[]>([])
@@ -53,6 +58,16 @@
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
+// 获取字典值
+async function getDict() {
+  // 证书状况
+  const res = await getDictByCode('certificationStatus')
+  // 证书状况字典 {1：即将过期}
+  res.data.forEach((item: any) => {
+    certificationStatusMap.value[`${item.value}`] = item.name
+  })
+}
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -63,7 +78,12 @@
   listQuery.value.startTime = timeRange.value[0] as string || ''
   listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: IOvertimeList) => {
+      return {
+        ...item,
+        certificationStatus: certificationStatusMap.value[item.certificationStatus],
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -161,7 +181,10 @@
   }
 }
 
-fetchData(true)
+onMounted(async () => {
+  await getDict()
+  fetchData(true)
+})
 </script>
 
 <template>
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 519f0af..cceb09b 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -135,7 +135,7 @@
         @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 4eb62ec..9d75cff 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -8,6 +8,7 @@
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { getpDeptApi, listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -19,9 +20,12 @@
   director: '', // 负责人
   administrationJob: '', // 行政职务
   technologyJob: '', // 技术职务
+  meterMajor: '', // 计量专业
   remark: '', // 备注
-  pDeptId: '',
-  pDeptName: '',
+  pDeptId: '', // 父级
+  pDeptName: '', // 父级
+  isLab: '1', // 是否为实验室
+  labCapacity: [], // 实验室能力
 }) // 表单
 // 展示父级组织
 const pDept = ref({
@@ -33,10 +37,11 @@
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
-  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+  organizeName: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
+  director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: ['blur', 'change'] }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: ['blur', 'change'] }],
+  isLab: [{ required: true, message: '是否为实验室不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 // 获取计量人员列表
@@ -53,13 +58,26 @@
     }
   })
 }
-const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
-// 获取技术职务列表
-const getTechnologyJobList = () => {
+const measureTypeList = ref<dictType[]>([]) // 实验室能力
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+const technologyJobList = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  // 获取技术职务列表
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
+  // 获取检校类型
+  getDictByCode('checkType').then((response) => {
+    measureTypeList.value = response.data
+  })
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
 }
+getDict()
+
 const administrationJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
@@ -91,7 +109,8 @@
           type: 'warning',
         },
       ).then((res) => {
-        updateApi({ ...ruleForm.value, title: undefined }).then((res) => {
+        const form = { ...ruleForm.value, labCapacity: ruleForm.value.labCapacity.join(',') }
+        updateApi(form).then((res) => {
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('提交成功')
@@ -117,6 +136,8 @@
   ruleForm.value.administrationJob = '' // 行政职务
   ruleForm.value.technologyJob = '' // 技术职务
   ruleForm.value.remark = '' // 备注
+  ruleForm.value.isLab = ''
+  ruleForm.value.labCapacity = []
 }
 const multipleTableRef = ref()
 const current = ref('')
@@ -141,7 +162,7 @@
       },
       {
         label: '计量专业',
-        data: 'meterMajor',
+        data: 'meterMajorName',
       },
       {
         label: '创建时间',
@@ -196,7 +217,7 @@
       },
       {
         label: '计量专业',
-        data: 'meterMajor',
+        data: 'meterMajorName',
       },
       {
         label: '创建时间',
@@ -434,10 +455,12 @@
   reset()
   title.value = row.title
   path.value = row.path
+  ruleForm.value = row
   ruleForm.value.organizeType = row.organizeType
   ruleForm.value.deptId = row.deptId
+  ruleForm.value.labCapacity = row.labCapacity ? row.labCapacity.split(',') : []
+  ruleForm.value.meterMajor = row.meterMajor
   getuser()
-  getTechnologyJobList()
   getAdministrationJob()
   getDepartmentList()
   getuserInfoList()
@@ -445,7 +468,6 @@
     getInstrumentInfo()
     getDeviceInfo()
   }
-  ruleForm.value = row
   console.log(row, 'row')
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
@@ -538,6 +560,53 @@
           </el-col>
         </el-row>
         <el-row :gutter="24">
+          <el-col v-if="title.split('-')[1] === '科室'" :span="6">
+            <el-form-item label="是否为实验室" prop="isLab">
+              <el-select v-model="ruleForm.isLab" :placeholder="title.split('-')[2] === '详情' ? '' : ''" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
+                <el-option label="是" value="1" />
+                <el-option label="否" value="0" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="title.split('-')[1] !== '部门'" :span="6">
+            <el-form-item label="计量专业" prop="meterMajor">
+              <el-select
+                v-model.trim="ruleForm.meterMajor"
+                clearable
+                :placeholder="title.split('-')[2] === '详情' ? '' : '请选择'"
+                :disabled="ruleForm.isLab === '0' || title.split('-')[2] === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="title.split('-')[1] === '科室'" :span="12">
+            <el-form-item label="实验室能力" prop="labCapacity">
+              <el-select
+                v-model.trim="ruleForm.labCapacity"
+                clearable
+                multiple
+                :placeholder="title.split('-')[2] === '详情' ? '' : '请选择'"
+                :disabled="ruleForm.isLab === '0' || title.split('-')[2] === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureTypeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
@@ -586,13 +655,5 @@
 </template>
 
 <style lang="scss" scoped>
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      content: "";
-      display: none;
-    }
-  }
-}
+// 样式代码
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index f7fd689..33e63c8 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -66,7 +66,7 @@
     columns: [
       { text: '科室编号', value: 'organizeNo', align: 'center' },
       { text: '科室名称', value: 'organizeName', align: 'center' },
-      { text: '专业', value: 'meterMajor', align: 'center' },
+      { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '技术职务', value: 'technologyJobName', align: 'center' },
       { text: '行政职务', value: 'administrationJobName', align: 'center' },
@@ -79,7 +79,7 @@
     columns: [
       { text: '工程组编号', value: 'organizeNo', align: 'center' },
       { text: '工程组名', value: 'organizeName', align: 'center' },
-      { text: '计量专业', value: 'meterMajor', align: 'center' },
+      { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
       { text: '所属科室', value: 'pDeptName', align: 'center' },
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index f7911fa..0528cc7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -7,7 +7,7 @@
   organizeType?: string // 类型
   createTime?: string // 创建时间
   director?: string // 负责人
-  meterMajor?: string // 专业
+  meterMajor: string // 专业
   pDeptId?: string // 所属科室
   createEndTime?: string
   createStartTime?: string
@@ -45,4 +45,6 @@
   technologyJobName: string
   updateTime: string
   title?: string
+  isLab: string // 是否为实验室
+  labCapacity: string | string[]
 }
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 4941fbb..90c6daf 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -21,25 +21,25 @@
 const total = ref<number>(0)
 const select = ref()
 const columns = ref([
-  {
-    text: '人员编号',
-    value: 'staffNo',
-  },
-  {
-    text: '姓名',
-    value: 'name',
-  },
-  {
-    text: '所在部门',
-    value: 'deptId',
-  },
+  { text: '人员编号', value: 'staffNo', width: '160', fixed: true },
+  { text: '姓名', value: 'name', fixed: true },
+  { text: '所在部门', value: 'deptId' },
+  { text: '学历', value: 'education', align: 'center' },
+  { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  { text: '计量专业', value: 'major', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '技术考核', value: 'technologyExam', align: 'center' },
 ])
 // 获取部门
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
 const deptIdList = ref([])
-const getDeptList = () => {
+const getDeptList = () => { // 获取部门
   getDeptTreeList().then((res) => {
     deptIdList.value = toTreeList(res.data, '0', true)
   })
@@ -50,7 +50,7 @@
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records
-      total.value = Number(res.data.total)
+      total.value = parseInt(res.data.total)
     }
   })
 }
@@ -81,8 +81,8 @@
   }
   search()
 }
-// 点击保存
-const submitForm = () => {
+// 点击确定
+const confirmSelect = () => {
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     getStaffDetail(person).then((res) => {
@@ -143,17 +143,17 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <el-table-column label="#" width="55" align="center">
-          <template #default="scope">
-            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column> -->
+          <!-- <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column> -->
         </template>
       </normal-table>
     </div>
     <template #footer>
       <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
         <el-button @click="resetForm">
           取消
         </el-button>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index d0d3ba2..84dd465 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -6,6 +6,8 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -17,22 +19,15 @@
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref([
-  {
-    text: '姓名',
-    value: 'name',
-  },
-  {
-    text: '账户',
-    value: 'account',
-  },
-  {
-    text: '所在部门',
-    value: 'deptName',
-  },
+const total = ref(0)
+const select = ref(-1)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '姓名', value: 'name' },
+  { text: '账户', value: 'account' },
+  { text: '所在部门', value: 'deptName' },
 ])
+// 所在部门
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
@@ -43,7 +38,7 @@
     deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
-// 获取数据列表
+// 获取人员数据列表
 const fetchData = () => {
   select.value = -1
   getUserList(listQuery.value).then((res) => {
@@ -100,8 +95,8 @@
 const initDialog = () => {
   // reset()
   dialogFormVisible.value = true
-  getDeptList()
-  fetchData()
+  getDeptList() // 获取部门信息
+  fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
 </script>
@@ -135,11 +130,11 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <el-table-column label="#" width="55" align="center">
-          <template #default="scope">
-            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column> -->
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
         </template>
       </normal-table>
     </div>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
new file mode 100644
index 0000000..d6827e4
--- /dev/null
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts" name="DistributeDialog">
+import processConfig from './processConfig.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { getTaskDetail } from '@/api/business/task'
+// 任务分发弹窗
+
+// 自定义方法：close关闭弹窗
+const emit = defineEmits(['close'])
+const dialogVisible = ref(false) // 弹窗显示
+const sampleId = ref('') // 样品id
+const orderId = ref('') // 委托单id
+
+// 委托书-证书类别列表
+const certificationTypes = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  getDictByCode('certificationType').then((response) => {
+    certificationTypes.value = response.data
+  })
+}
+
+getDict()
+// 样品详情
+const sampleDetail = ref({
+  sampleName: '压力表',
+  mesureContent: '压力、ip68',
+  certifications: ['1', '2'],
+  remark: '这是备注',
+  measureProcessList: [],
+  measureSendBackList: [],
+})
+
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    sampleDetail.value.sampleName = res.data.sampleName
+    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.remark = res.data.remark
+    sampleDetail.value.certifications = res.data.certifications
+    sampleDetail.value.measureProcessList = res.data.measureProcessList
+    sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+  })
+}
+// 初始化弹窗
+const initDialog = (orderid: string, sampleid: string) => {
+  dialogVisible.value = true
+  sampleId.value = sampleid
+  orderId.value = orderid
+  getInfo()
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+  emit('close')
+}
+function cancel() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="任务分发" width="1000" @close="cancel">
+    <div class="simple-info">
+      <div class="simple-info-line">
+        <span class="label">样品名称:</span>
+        <el-input v-model="sampleDetail.sampleName" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">证书类别:</span>
+        <el-checkbox-group v-model="sampleDetail.certifications" disabled>
+          <el-checkbox v-for="item in certificationTypes" :key="item.value" :label="item.value">
+            {{ item.name }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="simple-info-line">
+        <span class="label">检定项目:</span>
+        <el-input v-model="sampleDetail.mesureContent" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">备注:</span>
+        <el-input v-model="sampleDetail.remark" disabled />
+      </div>
+    </div>
+    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+      批量添加
+    </el-button>
+    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <template #footer>
+      <el-button type="primary" @click="saveProcess">
+        确定
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//  样式
+.simple-info {
+  margin-top: -10px;
+  margin-bottom: 10px;
+
+  .simple-info-line {
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    .label {
+      width: 90px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/components/lab-interface.ts b/src/views/business/schedule/task/components/lab-interface.ts
index d6355c6..02b0d1d 100644
--- a/src/views/business/schedule/task/components/lab-interface.ts
+++ b/src/views/business/schedule/task/components/lab-interface.ts
@@ -6,7 +6,8 @@
   isLab: '1' // 是否是实验室
   director: string // 负责人
   meterMajor: string // 专业
-  measureItems: string// 检测能力
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
 }
 
 // 部门返回值对象类型
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 4ccab04..1efb8a9 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -1,11 +1,18 @@
 <script setup lang="ts" name="ProcessConfig">
 import { ref } from 'vue'
 import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
 import ProcessNode from './processNode.vue'
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/task'
 const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
   // 是否为详情展示页面
   detail: {
     type: Boolean,
@@ -21,81 +28,35 @@
     type: String,
     required: true,
   },
+  list: {
+    type: Array,
+    default: () => [],
+  },
 })
 const emits = defineEmits(['saveOver'])
 // 默认流程节点
-const defaultProcess = {
-  id: '', // 检测节点id
-  executiveItem: '', // 检测项目
-  executiveDept: '', // 检测部门
-  executiveDeptName: '', // 检测部门
-  executivePerson: '', // 检测人员
-  executivePersonName: '', // 检测人员
-  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-  measureStateName: '', // 检测状态
-  currentCertifications: '', // 当前证书数
-  requireCertifications: '', // 应出具证书数
-  updateTime: '', // 更新时间
-  backPerson: '', // 退回人
-  backReason: '', // 退回原因
-  backTime: '', // 退回时间
-  distributePerson: '', // 分配人
-  distributeTime: '', // 分配时间
-  startTime: '', // 检测开始时间
-  overTime: '', // 检测结束时间
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
 }
 // 检定流程列表
-const processList = ref([
+const processList = ref<IScheduleSet[]>([
   { ...defaultProcess },
 ])
 
-// 获取当前样品检测流程，参数待定
-const fetchProcess = () => {
-  // TODO: 模拟数据
-  processList.value = [
-    {
-      id: '1', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423635973935106', // 检测部门
-      executiveDeptName: '力学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '张三', // 检测人员
-      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待检测', // 检测状态
-      currentCertifications: '0', // 当前证书数
-      requireCertifications: '2', // 应出具证书数
-      updateTime: '2023-02-01 09:00:05', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-    {
-      id: '2', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423577505337346', // 检测部门
-      executiveDeptName: '热学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待分配', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-  ]
-}
-fetchProcess()
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+})
 
 // 点击添加流程
 const processAdd = () => {
@@ -121,25 +82,17 @@
 // 批量添加实验室
 const batchChooseOver = (labs: ILabList[]) => {
   for (const item of labs) {
-    const processTemp = {
-      id: '',
-      executiveItem: '', // 检测项目
-      executiveDept: item.deptId, // 检测部门
-      executiveDeptName: item.organizeName, // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
     }
     processList.value.push(processTemp)
   }
@@ -147,9 +100,24 @@
 
 // 保存流程
 const saveProcess = () => {
-  // TODO: 保存流程
-  console.log(processList.value)
-  emits('saveOver')
+  const form = {
+    measureProcessList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  console.log(form)
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
 }
 // 删除流程
 const deleteProcess = (index: number) => {
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index 6cbdf10..31dfae4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -12,24 +12,16 @@
     type: Object,
     default: () => {
       return {
-        id: '', // 检测节点id
-        executiveItem: '', // 检测项目
-        executiveDept: '', // 检测部门
-        executiveDeptName: '', // 检测部门
-        executivePerson: '', // 检测人员
-        executivePersonName: '', // 检测人员
-        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-        measureStateName: '', // 检测状态
-        currentCertifications: '', // 当前证书数
-        requireCertifications: '', // 应出具证书数
-        updateTime: '', // 更新时间
-        backPerson: '', // 退回人
-        backReason: '', // 退回原因
-        backTime: '', // 退回时间
-        distributePerson: '', // 分配人
-        distributeTime: '', // 分配时间
-        startTime: '', // 检测开始时间
-        overTime: '', // 检测结束时间
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
       }
     },
   },
@@ -56,22 +48,23 @@
 })
 // 检定环节可编辑-只有待分发状态可编辑
 const deptEdit = computed(() => {
-  return processNodeData.value.measureState == '0'
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 检定人可编辑-待分配状态可编辑
 const personEdit = computed(() => {
-  const editStates = ['0', '1']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 证书可编辑-待分发、待分配、待检测状态可编辑
 const certificationEdit = computed(() => {
-  const editStates = ['0', '1', '2']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 节点可移动
 const canMove = computed(() => {
-  const editStates = ['0']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 
 // 选择实验室
@@ -82,8 +75,8 @@
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
   console.log(lab)
-  processNodeData.value.executiveDept = lab.deptId
-  processNodeData.value.executiveDeptName = lab.organizeName
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
 }
 
 // 选择人员
@@ -93,8 +86,8 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
-  processNodeData.value.executivePerson = person.id
-  processNodeData.value.executivePersonName = person.name
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
 }
 
@@ -122,7 +115,7 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit">
           <template v-if="deptEdit" #append>
             <el-button :icon="Aim" size="small" link @click="clickChoose" />
           </template>
@@ -130,7 +123,7 @@
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit">
           <template v-if="personEdit" #append>
             <el-button :icon="Aim" size="small" link @click="choosePerson" />
           </template>
@@ -140,7 +133,7 @@
         <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
       <div class="line">
-        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
       </div>
       <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
@@ -149,7 +142,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 1d02839..493fbba 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,5 +1,3 @@
-import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
-
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -8,12 +6,29 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
   offset: number
 }
 
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
 // 任务列表-返回值
 export interface ITaskList {
   orderId: string // 委托书编号
@@ -25,41 +40,127 @@
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  isUrgent: string // 是否加急
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
   requireOverTime: string // 应检完时间
-  sampleAttr: string // 样品属性
-  sampleAttrName: string // 样品属性
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
   currentMeasureState: string // 当前检定环节
   currentMeasureStateName: string // 当前检定环节
-  currentCertifications: number // 已出具证书总数
+  alreadyCertifications: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
-  distributeStateName: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
 }
 
-// 检测流程节点
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+}
+
+// 全部检测流程节点
 export interface ISchedule {
-  executivePerson: string // 执行人
-  executivePersonName: string // 执行人名称
-  executiveDept: string // 执行部门
-  executiveDeptName: string // 执行部门名称
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
   executiveItem: string // 检定项目
-  currentCertifications?: number // 已出具证书总数
+  alreadyCertifications?: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  measureState: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
   updateTime: string // 流程更新时间
-  backTime: string // 退回时间
-  backReason: string // 退回原因
-  backPerson: string // 退回人
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
   distributePerson: string // 分配人
   distributeTime: string // 分配时间
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
 
 // 样品检测信息
-export interface ISampleMeasure extends ISampleEdit {
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
   orderId: string // 委托单id
+  orderCode: string // 委托单编号
   certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
 }
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 465b2e7..547ee3e 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,28 +1,27 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
-import type { ISampleMeasure } from './task-interface'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
 import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getTaskDetail } from '@/api/business/task'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // 样品详情id
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -39,32 +38,49 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleMeasure> = ref({
-  id: '',
-  orderId: '', // 委托单id
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
   postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
   manufacturer: '', // 生产厂家
   manufacturerCountry: '', // 厂家国别
   manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
   remark: '', // 备注
   minioFileName: '', // 说明书
   labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-  certifications: '',
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
 })
 const ruleFormRef = ref<FormInstance>()
 
@@ -143,14 +159,6 @@
   return menu.find(item => item.name === currentMenu.value)
 })
 
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
 const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
@@ -181,11 +189,9 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(dataForm.value).then((res) => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -195,42 +201,23 @@
     }
   })
 }
-
-// 获取样品详情
+//
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
 const getInfo = () => {
-  // getSapmleDetail({ id: infoId.value }).then((res) => {
-  dataForm.value = {
-    orderId: '123',
-    ABC: 'A',
-    companyAddress: '北京/北京市',
-    customerName: '京东集团',
-    customerNo: 'sygf202211290001',
-    id: '111111',
-    labelBind: '11222',
-    manufacturer: '北京某厂家',
-    manufacturerCountry: 'CN',
-    manufacturingDate: '2023-03',
-    manufacturingNo: '123121',
-    mesureCategory: '',
-    mesureContent: '项目1',
-    mesurePeriod: '1',
-    mesureType: '',
-    minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-    phone: '950618',
-    postalCode: 'test',
-    remark: '无备注',
-    sampleModel: '型号1',
-    sampleName: '样品1',
-    sampleNo: '123456',
-    measureResultCode: 'bhg',
-    deliverer: '张三',
-    delivererTel: '156254577545',
-    certifications: '1',
-  }
-  // for (const item of menu) {
-  //   item.searchFunc()
-  // }
-  // })
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList
+    taskForm.value.measureSendBackList = res.data.measureSendBackList
+  })
 }
 
 // 点击标签绑定的扫描
@@ -260,7 +247,7 @@
     fd.append('multipartFile', event.target.files[0])
     // UploadFile(fd).then((res) => {
     //   if (res.code === 200) {
-    //     dataForm.value.minioFileName = res.data[0]
+    //     sampleForm.value.minioFileName = res.data[0]
     //     // 重置当前验证
     //     ElMessage.success('文件上传成功')
     //   }
@@ -273,18 +260,30 @@
 const upload = () => {
   fileRef.value.click()
 }
-// 获取样品详情
-getInfo()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.role) {
+  roleType.value = $route.params.role as string // 使用角色
+
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+    getSampleInfo()
+  }
+}
 </script>
 
 <template>
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -294,7 +293,7 @@
       <div id="form">
         <el-form
           ref="ruleFormRef"
-          :model="dataForm"
+          :model="sampleForm"
           :label-width="120"
           label-position="right"
           :rules="rules"
@@ -303,9 +302,9 @@
             <el-col :span="6">
               <el-form-item label="样品编号:" prop="sampleNo">
                 <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -313,9 +312,9 @@
             <el-col :span="6">
               <el-form-item label="样品名称:" prop="sampleName">
                 <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -323,9 +322,9 @@
             <el-col :span="6">
               <el-form-item label="样品型号:" prop="sampleModel">
                 <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -333,9 +332,9 @@
             <el-col :span="6">
               <el-form-item label="出厂编号:" prop="manufacturingNo">
                 <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -343,9 +342,9 @@
             <el-col :span="6">
               <el-form-item label="委托方代码" prop="customerNo">
                 <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -353,9 +352,9 @@
             <el-col :span="6">
               <el-form-item label="委托方名称" prop="customerName">
                 <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -363,9 +362,9 @@
             <el-col :span="6">
               <el-form-item label="委托方电话" prop="phone">
                 <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -373,9 +372,9 @@
             <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -383,11 +382,11 @@
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
-                  v-model="dataForm.companyAddress"
+                  v-model="sampleForm.customerAddress"
                   type="textarea"
                   autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -395,9 +394,9 @@
             <el-col :span="6">
               <el-form-item label="校检类别:">
                 <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
@@ -407,19 +406,19 @@
             <el-col :span="6">
               <el-form-item label="生产厂家:">
                 <el-input
-                  v-model="dataForm.manufacturer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="厂家国别:">
                 <el-select
-                  v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
@@ -429,23 +428,23 @@
             <el-col :span="6">
               <el-form-item label="出厂年月:">
                 <el-date-picker
-                  v-model="dataForm.manufacturingDate"
+                  v-model="sampleForm.manufacturingDate"
                   type="month"
                   format="YYYY-MM"
                   value-format="YYYY-MM"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="ABC:">
                 <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
@@ -455,9 +454,9 @@
             <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -465,9 +464,9 @@
             <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
-                  v-model="dataForm.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -475,49 +474,20 @@
             <el-col :span="24">
               <el-form-item label="检定项目:" prop="mesureContent">
                 <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定周期（月）:">
                 <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="上次检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  disabled
-                  class="full-width-input"
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
@@ -526,21 +496,21 @@
             <el-col :span="24">
               <el-form-item label="备注:">
                 <el-input
-                  v-model="dataForm.remark"
+                  v-model="sampleForm.remark"
                   type="textarea"
                   :rows="2"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
-                  v-model="dataForm.mesureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
@@ -550,10 +520,10 @@
             <el-col :span="6">
               <el-form-item label="标签绑定:">
                 <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 >
                   <template #append>
                     <el-button>扫描</el-button>
@@ -565,11 +535,11 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="14">
               <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
             </el-col>
@@ -586,7 +556,7 @@
           保存
         </el-button>
       </template>
-      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
@@ -604,11 +574,11 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="dataForm.id!" :order-id="dataForm.orderId" />
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
       <!-- 检定记录 -->
-      <measure-records v-if="currentMenu === '检定记录'" :sample-id="dataForm.id!" />
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
-      <certification-records v-if="currentMenu === '检定证书'" :sample-id="dataForm.id!" />
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index f784804..461c518 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -31,7 +31,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
@@ -39,30 +39,30 @@
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
-  { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center' },
-  { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
-  { text: '分发性质', value: 'distributeState', align: 'center', width: '90px' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return row.alreadyCertifications ? `${row.alreadyCertifications}/${row.requireCertifications}` : '0/0' } },
+  { text: '分发性质', value: 'handOutProperty', align: 'center', width: '90px' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -80,15 +80,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // // 模拟数据
-  // list.value = [
-  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  // ]
-  // loadingTable.value = false
-  // console.log(listQuery.value)
   getTaskList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -111,15 +107,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
+    sampleBelong: '', // 样品属性
     sampleStatus: '2', // 分发状态
+    startTime: '', //	应检定开始时间
+    endTime: '', //	应检定结束时间
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -271,8 +269,8 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue
index 629b33c..2300f4c 100644
--- a/src/views/customer/advice/adviceEdit.vue
+++ b/src/views/customer/advice/adviceEdit.vue
@@ -51,7 +51,7 @@
 const companyInfo: SimpleCompany = reactive({
   customerName: '', // 公司名称
   customerNo: '', //	客户编号
-  customerId: '', // 客户id
+  id: '', // 客户id
   grade: '', // 履约评级
   gradeName: '', // 履约评级
   companySize: '', // 公司规模
@@ -121,12 +121,13 @@
   const item = select as SimpleCompany
   companyInfo.customerName = item.customerName
   companyInfo.customerNo = item.customerNo
-  companyInfo.customerId = item.customerId
+  companyInfo.id = item.id
   companyInfo.gradeName = item.gradeName
   companyInfo.companySizeName = item.companySizeName
   companyInfo.businessSizeName = item.businessSizeName
   companyInfo.evaluationName = item.evaluationName
   dataForm.value.customerNo = item.customerNo
+  dataForm.value.customerId = item.id
 }
 // 打印表单
 const printObj = ref({
@@ -154,8 +155,6 @@
         if (dataForm.value.id) {
           updateAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -164,8 +163,6 @@
         else {
           addAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
diff --git a/src/views/customer/advice/advice_interface.ts b/src/views/customer/advice/advice_interface.ts
index b08f85b..a8bf311 100644
--- a/src/views/customer/advice/advice_interface.ts
+++ b/src/views/customer/advice/advice_interface.ts
@@ -40,9 +40,10 @@
 
 // 公司简易
 export interface SimpleCompany {
+  id: string // 客户id
   customerName: string // 公司名称
   customerNo: string //	客户编号
-  customerId: string // 客户id
+  grade: string // 履约评级
   gradeName: string // 履约评级
   companySizeName: string // 公司规模
   businessSizeName: string // 业务规模
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index f9ee314..4893c4f 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -26,6 +26,7 @@
 const visible = ref(false) // 控制对话框显隐
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -54,17 +55,7 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
-})
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
+})// 表单
 const ruleFormRef = ref<FormInstance>()
 
 // 自定义校验规则--检定周期为正整数
@@ -111,6 +102,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -479,7 +474,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index aceea6a..abcada5 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -36,7 +36,14 @@
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
-  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: ISampleList) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ISampleList[]>([])
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index aafed2a..256ed9f 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -24,6 +24,7 @@
   measurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
   remark: string // 备注
+  validDeadline?: string // 证书过期时间
 }
 
 export interface ISampleEdit {
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 3b03275..d04456b 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -163,7 +163,7 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
+          <el-select v-model="listQuery.businessSize" placeholder="业务规模">
             <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
@@ -183,7 +183,16 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirm">
           确定
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 59f2feb..4deeed8 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -20,18 +20,9 @@
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 
 const dataForm: Ref<ISampleDetail> = ref({
   id: '',
@@ -74,6 +65,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -358,7 +353,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 05fe276..7251eda 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -4,12 +4,16 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOvertimeList, IOvertimeListQuery } from './overtime_list_interface'
+import { ITEM_RENDER_EVT } from 'element-plus/es/components/virtual-list/src/defaults'
+import type { IOvertimeList, IOvertimeListQuery, dictType } from './overtime_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportSapmleList, getSampleList } from '@/api/customer/sampleList'
+import { getDictByCode } from '@/api/system/dict'
+
 const { proxy } = getCurrentInstance() as any
+const certificationStatusMap = ref<dictType[]>([]) as any // 证书状况
 const $router = useRouter()
 
 // 查询条件
@@ -25,12 +29,7 @@
   offset: 1,
   limit: 20,
 })
-// 证书状况字典
-const certificationStatusMap = {
-  0: '未超期',
-  1: '即将超期',
-  2: '已超期',
-}
+
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
@@ -42,7 +41,13 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
-  { text: '证书状况', value: 'certificationStatus', align: 'center' },
+  {
+    text: '证书状况',
+    value: 'certificationStatus',
+    align: 'center',
+    width: '90px',
+    styleFilter: (row: IOvertimeList) => { return row.certificationStatus === '即将超期' ? 'color: red' : '' },
+  },
 ])
 // 表格数据
 const list = ref<IOvertimeList[]>([])
@@ -53,6 +58,16 @@
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
+// 获取字典值
+async function getDict() {
+  // 证书状况
+  const res = await getDictByCode('certificationStatus')
+  // 证书状况字典 {1：即将过期}
+  res.data.forEach((item: any) => {
+    certificationStatusMap.value[`${item.value}`] = item.name
+  })
+}
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -63,7 +78,12 @@
   listQuery.value.startTime = timeRange.value[0] as string || ''
   listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: IOvertimeList) => {
+      return {
+        ...item,
+        certificationStatus: certificationStatusMap.value[item.certificationStatus],
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -161,7 +181,10 @@
   }
 }
 
-fetchData(true)
+onMounted(async () => {
+  await getDict()
+  fetchData(true)
+})
 </script>
 
 <template>
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 519f0af..cceb09b 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -135,7 +135,7 @@
         @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 4eb62ec..9d75cff 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -8,6 +8,7 @@
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { getpDeptApi, listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -19,9 +20,12 @@
   director: '', // 负责人
   administrationJob: '', // 行政职务
   technologyJob: '', // 技术职务
+  meterMajor: '', // 计量专业
   remark: '', // 备注
-  pDeptId: '',
-  pDeptName: '',
+  pDeptId: '', // 父级
+  pDeptName: '', // 父级
+  isLab: '1', // 是否为实验室
+  labCapacity: [], // 实验室能力
 }) // 表单
 // 展示父级组织
 const pDept = ref({
@@ -33,10 +37,11 @@
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
-  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+  organizeName: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
+  director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: ['blur', 'change'] }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: ['blur', 'change'] }],
+  isLab: [{ required: true, message: '是否为实验室不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 // 获取计量人员列表
@@ -53,13 +58,26 @@
     }
   })
 }
-const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
-// 获取技术职务列表
-const getTechnologyJobList = () => {
+const measureTypeList = ref<dictType[]>([]) // 实验室能力
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+const technologyJobList = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  // 获取技术职务列表
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
+  // 获取检校类型
+  getDictByCode('checkType').then((response) => {
+    measureTypeList.value = response.data
+  })
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
 }
+getDict()
+
 const administrationJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
@@ -91,7 +109,8 @@
           type: 'warning',
         },
       ).then((res) => {
-        updateApi({ ...ruleForm.value, title: undefined }).then((res) => {
+        const form = { ...ruleForm.value, labCapacity: ruleForm.value.labCapacity.join(',') }
+        updateApi(form).then((res) => {
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('提交成功')
@@ -117,6 +136,8 @@
   ruleForm.value.administrationJob = '' // 行政职务
   ruleForm.value.technologyJob = '' // 技术职务
   ruleForm.value.remark = '' // 备注
+  ruleForm.value.isLab = ''
+  ruleForm.value.labCapacity = []
 }
 const multipleTableRef = ref()
 const current = ref('')
@@ -141,7 +162,7 @@
       },
       {
         label: '计量专业',
-        data: 'meterMajor',
+        data: 'meterMajorName',
       },
       {
         label: '创建时间',
@@ -196,7 +217,7 @@
       },
       {
         label: '计量专业',
-        data: 'meterMajor',
+        data: 'meterMajorName',
       },
       {
         label: '创建时间',
@@ -434,10 +455,12 @@
   reset()
   title.value = row.title
   path.value = row.path
+  ruleForm.value = row
   ruleForm.value.organizeType = row.organizeType
   ruleForm.value.deptId = row.deptId
+  ruleForm.value.labCapacity = row.labCapacity ? row.labCapacity.split(',') : []
+  ruleForm.value.meterMajor = row.meterMajor
   getuser()
-  getTechnologyJobList()
   getAdministrationJob()
   getDepartmentList()
   getuserInfoList()
@@ -445,7 +468,6 @@
     getInstrumentInfo()
     getDeviceInfo()
   }
-  ruleForm.value = row
   console.log(row, 'row')
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
@@ -538,6 +560,53 @@
           </el-col>
         </el-row>
         <el-row :gutter="24">
+          <el-col v-if="title.split('-')[1] === '科室'" :span="6">
+            <el-form-item label="是否为实验室" prop="isLab">
+              <el-select v-model="ruleForm.isLab" :placeholder="title.split('-')[2] === '详情' ? '' : ''" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
+                <el-option label="是" value="1" />
+                <el-option label="否" value="0" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="title.split('-')[1] !== '部门'" :span="6">
+            <el-form-item label="计量专业" prop="meterMajor">
+              <el-select
+                v-model.trim="ruleForm.meterMajor"
+                clearable
+                :placeholder="title.split('-')[2] === '详情' ? '' : '请选择'"
+                :disabled="ruleForm.isLab === '0' || title.split('-')[2] === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="title.split('-')[1] === '科室'" :span="12">
+            <el-form-item label="实验室能力" prop="labCapacity">
+              <el-select
+                v-model.trim="ruleForm.labCapacity"
+                clearable
+                multiple
+                :placeholder="title.split('-')[2] === '详情' ? '' : '请选择'"
+                :disabled="ruleForm.isLab === '0' || title.split('-')[2] === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureTypeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
@@ -586,13 +655,5 @@
 </template>
 
 <style lang="scss" scoped>
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      content: "";
-      display: none;
-    }
-  }
-}
+// 样式代码
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index f7fd689..33e63c8 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -66,7 +66,7 @@
     columns: [
       { text: '科室编号', value: 'organizeNo', align: 'center' },
       { text: '科室名称', value: 'organizeName', align: 'center' },
-      { text: '专业', value: 'meterMajor', align: 'center' },
+      { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '技术职务', value: 'technologyJobName', align: 'center' },
       { text: '行政职务', value: 'administrationJobName', align: 'center' },
@@ -79,7 +79,7 @@
     columns: [
       { text: '工程组编号', value: 'organizeNo', align: 'center' },
       { text: '工程组名', value: 'organizeName', align: 'center' },
-      { text: '计量专业', value: 'meterMajor', align: 'center' },
+      { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
       { text: '所属科室', value: 'pDeptName', align: 'center' },
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index f7911fa..0528cc7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -7,7 +7,7 @@
   organizeType?: string // 类型
   createTime?: string // 创建时间
   director?: string // 负责人
-  meterMajor?: string // 专业
+  meterMajor: string // 专业
   pDeptId?: string // 所属科室
   createEndTime?: string
   createStartTime?: string
@@ -45,4 +45,6 @@
   technologyJobName: string
   updateTime: string
   title?: string
+  isLab: string // 是否为实验室
+  labCapacity: string | string[]
 }
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 4941fbb..90c6daf 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -21,25 +21,25 @@
 const total = ref<number>(0)
 const select = ref()
 const columns = ref([
-  {
-    text: '人员编号',
-    value: 'staffNo',
-  },
-  {
-    text: '姓名',
-    value: 'name',
-  },
-  {
-    text: '所在部门',
-    value: 'deptId',
-  },
+  { text: '人员编号', value: 'staffNo', width: '160', fixed: true },
+  { text: '姓名', value: 'name', fixed: true },
+  { text: '所在部门', value: 'deptId' },
+  { text: '学历', value: 'education', align: 'center' },
+  { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  { text: '计量专业', value: 'major', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '技术考核', value: 'technologyExam', align: 'center' },
 ])
 // 获取部门
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
 const deptIdList = ref([])
-const getDeptList = () => {
+const getDeptList = () => { // 获取部门
   getDeptTreeList().then((res) => {
     deptIdList.value = toTreeList(res.data, '0', true)
   })
@@ -50,7 +50,7 @@
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records
-      total.value = Number(res.data.total)
+      total.value = parseInt(res.data.total)
     }
   })
 }
@@ -81,8 +81,8 @@
   }
   search()
 }
-// 点击保存
-const submitForm = () => {
+// 点击确定
+const confirmSelect = () => {
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     getStaffDetail(person).then((res) => {
@@ -143,17 +143,17 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <el-table-column label="#" width="55" align="center">
-          <template #default="scope">
-            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column> -->
+          <!-- <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column> -->
         </template>
       </normal-table>
     </div>
     <template #footer>
       <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
         <el-button @click="resetForm">
           取消
         </el-button>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index d0d3ba2..84dd465 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -6,6 +6,8 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -17,22 +19,15 @@
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref([
-  {
-    text: '姓名',
-    value: 'name',
-  },
-  {
-    text: '账户',
-    value: 'account',
-  },
-  {
-    text: '所在部门',
-    value: 'deptName',
-  },
+const total = ref(0)
+const select = ref(-1)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '姓名', value: 'name' },
+  { text: '账户', value: 'account' },
+  { text: '所在部门', value: 'deptName' },
 ])
+// 所在部门
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
@@ -43,7 +38,7 @@
     deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
-// 获取数据列表
+// 获取人员数据列表
 const fetchData = () => {
   select.value = -1
   getUserList(listQuery.value).then((res) => {
@@ -100,8 +95,8 @@
 const initDialog = () => {
   // reset()
   dialogFormVisible.value = true
-  getDeptList()
-  fetchData()
+  getDeptList() // 获取部门信息
+  fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
 </script>
@@ -135,11 +130,11 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <el-table-column label="#" width="55" align="center">
-          <template #default="scope">
-            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column> -->
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
         </template>
       </normal-table>
     </div>
diff --git a/src/views/measure/train/components/selectMeasurePersonDialog.vue b/src/views/measure/train/components/selectMeasurePersonDialog.vue
new file mode 100644
index 0000000..251b1e5
--- /dev/null
+++ b/src/views/measure/train/components/selectMeasurePersonDialog.vue
@@ -0,0 +1,176 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectMeasurePersonDialog">
+import { ElMessage } from 'element-plus'
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 10,
+  offset: 1,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const singleChecked = ref('') // 单选选中id
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref<TableColumn[]>([
+  { text: '人员编号', value: 'staffNo', width: '160', align: 'center', fixed: true },
+  { text: '姓名', value: 'name', align: 'center', fixed: true },
+  { text: '学历', value: 'education', align: 'center' },
+  { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  { text: '计量专业', value: 'major', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '技术考核', value: 'technologyExam', align: 'center' },
+])
+// 获取部门
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
+const getDeptList = () => { // 获取部门
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records.map((item: any) => {
+        return {
+          ...item,
+          sex: item.sex === '1' ? '男' : '女',
+        }
+      })
+      total.value = parseInt(res.data.total)
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请先选择计量人员')
+  }
+  else {
+    emits('add', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
+      </search-item>
+      <search-item>
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
new file mode 100644
index 0000000..d6827e4
--- /dev/null
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts" name="DistributeDialog">
+import processConfig from './processConfig.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { getTaskDetail } from '@/api/business/task'
+// 任务分发弹窗
+
+// 自定义方法：close关闭弹窗
+const emit = defineEmits(['close'])
+const dialogVisible = ref(false) // 弹窗显示
+const sampleId = ref('') // 样品id
+const orderId = ref('') // 委托单id
+
+// 委托书-证书类别列表
+const certificationTypes = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  getDictByCode('certificationType').then((response) => {
+    certificationTypes.value = response.data
+  })
+}
+
+getDict()
+// 样品详情
+const sampleDetail = ref({
+  sampleName: '压力表',
+  mesureContent: '压力、ip68',
+  certifications: ['1', '2'],
+  remark: '这是备注',
+  measureProcessList: [],
+  measureSendBackList: [],
+})
+
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    sampleDetail.value.sampleName = res.data.sampleName
+    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.remark = res.data.remark
+    sampleDetail.value.certifications = res.data.certifications
+    sampleDetail.value.measureProcessList = res.data.measureProcessList
+    sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+  })
+}
+// 初始化弹窗
+const initDialog = (orderid: string, sampleid: string) => {
+  dialogVisible.value = true
+  sampleId.value = sampleid
+  orderId.value = orderid
+  getInfo()
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+  emit('close')
+}
+function cancel() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="任务分发" width="1000" @close="cancel">
+    <div class="simple-info">
+      <div class="simple-info-line">
+        <span class="label">样品名称:</span>
+        <el-input v-model="sampleDetail.sampleName" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">证书类别:</span>
+        <el-checkbox-group v-model="sampleDetail.certifications" disabled>
+          <el-checkbox v-for="item in certificationTypes" :key="item.value" :label="item.value">
+            {{ item.name }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="simple-info-line">
+        <span class="label">检定项目:</span>
+        <el-input v-model="sampleDetail.mesureContent" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">备注:</span>
+        <el-input v-model="sampleDetail.remark" disabled />
+      </div>
+    </div>
+    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+      批量添加
+    </el-button>
+    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <template #footer>
+      <el-button type="primary" @click="saveProcess">
+        确定
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//  样式
+.simple-info {
+  margin-top: -10px;
+  margin-bottom: 10px;
+
+  .simple-info-line {
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    .label {
+      width: 90px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/components/lab-interface.ts b/src/views/business/schedule/task/components/lab-interface.ts
index d6355c6..02b0d1d 100644
--- a/src/views/business/schedule/task/components/lab-interface.ts
+++ b/src/views/business/schedule/task/components/lab-interface.ts
@@ -6,7 +6,8 @@
   isLab: '1' // 是否是实验室
   director: string // 负责人
   meterMajor: string // 专业
-  measureItems: string// 检测能力
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
 }
 
 // 部门返回值对象类型
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 4ccab04..1efb8a9 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -1,11 +1,18 @@
 <script setup lang="ts" name="ProcessConfig">
 import { ref } from 'vue'
 import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
 import ProcessNode from './processNode.vue'
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/task'
 const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
   // 是否为详情展示页面
   detail: {
     type: Boolean,
@@ -21,81 +28,35 @@
     type: String,
     required: true,
   },
+  list: {
+    type: Array,
+    default: () => [],
+  },
 })
 const emits = defineEmits(['saveOver'])
 // 默认流程节点
-const defaultProcess = {
-  id: '', // 检测节点id
-  executiveItem: '', // 检测项目
-  executiveDept: '', // 检测部门
-  executiveDeptName: '', // 检测部门
-  executivePerson: '', // 检测人员
-  executivePersonName: '', // 检测人员
-  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-  measureStateName: '', // 检测状态
-  currentCertifications: '', // 当前证书数
-  requireCertifications: '', // 应出具证书数
-  updateTime: '', // 更新时间
-  backPerson: '', // 退回人
-  backReason: '', // 退回原因
-  backTime: '', // 退回时间
-  distributePerson: '', // 分配人
-  distributeTime: '', // 分配时间
-  startTime: '', // 检测开始时间
-  overTime: '', // 检测结束时间
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
 }
 // 检定流程列表
-const processList = ref([
+const processList = ref<IScheduleSet[]>([
   { ...defaultProcess },
 ])
 
-// 获取当前样品检测流程，参数待定
-const fetchProcess = () => {
-  // TODO: 模拟数据
-  processList.value = [
-    {
-      id: '1', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423635973935106', // 检测部门
-      executiveDeptName: '力学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '张三', // 检测人员
-      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待检测', // 检测状态
-      currentCertifications: '0', // 当前证书数
-      requireCertifications: '2', // 应出具证书数
-      updateTime: '2023-02-01 09:00:05', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-    {
-      id: '2', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423577505337346', // 检测部门
-      executiveDeptName: '热学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待分配', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-  ]
-}
-fetchProcess()
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+})
 
 // 点击添加流程
 const processAdd = () => {
@@ -121,25 +82,17 @@
 // 批量添加实验室
 const batchChooseOver = (labs: ILabList[]) => {
   for (const item of labs) {
-    const processTemp = {
-      id: '',
-      executiveItem: '', // 检测项目
-      executiveDept: item.deptId, // 检测部门
-      executiveDeptName: item.organizeName, // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
     }
     processList.value.push(processTemp)
   }
@@ -147,9 +100,24 @@
 
 // 保存流程
 const saveProcess = () => {
-  // TODO: 保存流程
-  console.log(processList.value)
-  emits('saveOver')
+  const form = {
+    measureProcessList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  console.log(form)
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
 }
 // 删除流程
 const deleteProcess = (index: number) => {
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index 6cbdf10..31dfae4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -12,24 +12,16 @@
     type: Object,
     default: () => {
       return {
-        id: '', // 检测节点id
-        executiveItem: '', // 检测项目
-        executiveDept: '', // 检测部门
-        executiveDeptName: '', // 检测部门
-        executivePerson: '', // 检测人员
-        executivePersonName: '', // 检测人员
-        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-        measureStateName: '', // 检测状态
-        currentCertifications: '', // 当前证书数
-        requireCertifications: '', // 应出具证书数
-        updateTime: '', // 更新时间
-        backPerson: '', // 退回人
-        backReason: '', // 退回原因
-        backTime: '', // 退回时间
-        distributePerson: '', // 分配人
-        distributeTime: '', // 分配时间
-        startTime: '', // 检测开始时间
-        overTime: '', // 检测结束时间
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
       }
     },
   },
@@ -56,22 +48,23 @@
 })
 // 检定环节可编辑-只有待分发状态可编辑
 const deptEdit = computed(() => {
-  return processNodeData.value.measureState == '0'
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 检定人可编辑-待分配状态可编辑
 const personEdit = computed(() => {
-  const editStates = ['0', '1']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 证书可编辑-待分发、待分配、待检测状态可编辑
 const certificationEdit = computed(() => {
-  const editStates = ['0', '1', '2']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 节点可移动
 const canMove = computed(() => {
-  const editStates = ['0']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 
 // 选择实验室
@@ -82,8 +75,8 @@
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
   console.log(lab)
-  processNodeData.value.executiveDept = lab.deptId
-  processNodeData.value.executiveDeptName = lab.organizeName
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
 }
 
 // 选择人员
@@ -93,8 +86,8 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
-  processNodeData.value.executivePerson = person.id
-  processNodeData.value.executivePersonName = person.name
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
 }
 
@@ -122,7 +115,7 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit">
           <template v-if="deptEdit" #append>
             <el-button :icon="Aim" size="small" link @click="clickChoose" />
           </template>
@@ -130,7 +123,7 @@
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit">
           <template v-if="personEdit" #append>
             <el-button :icon="Aim" size="small" link @click="choosePerson" />
           </template>
@@ -140,7 +133,7 @@
         <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
       <div class="line">
-        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
       </div>
       <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
@@ -149,7 +142,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 1d02839..493fbba 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,5 +1,3 @@
-import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
-
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -8,12 +6,29 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
   offset: number
 }
 
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
 // 任务列表-返回值
 export interface ITaskList {
   orderId: string // 委托书编号
@@ -25,41 +40,127 @@
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  isUrgent: string // 是否加急
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
   requireOverTime: string // 应检完时间
-  sampleAttr: string // 样品属性
-  sampleAttrName: string // 样品属性
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
   currentMeasureState: string // 当前检定环节
   currentMeasureStateName: string // 当前检定环节
-  currentCertifications: number // 已出具证书总数
+  alreadyCertifications: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
-  distributeStateName: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
 }
 
-// 检测流程节点
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+}
+
+// 全部检测流程节点
 export interface ISchedule {
-  executivePerson: string // 执行人
-  executivePersonName: string // 执行人名称
-  executiveDept: string // 执行部门
-  executiveDeptName: string // 执行部门名称
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
   executiveItem: string // 检定项目
-  currentCertifications?: number // 已出具证书总数
+  alreadyCertifications?: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  measureState: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
   updateTime: string // 流程更新时间
-  backTime: string // 退回时间
-  backReason: string // 退回原因
-  backPerson: string // 退回人
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
   distributePerson: string // 分配人
   distributeTime: string // 分配时间
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
 
 // 样品检测信息
-export interface ISampleMeasure extends ISampleEdit {
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
   orderId: string // 委托单id
+  orderCode: string // 委托单编号
   certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
 }
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 465b2e7..547ee3e 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,28 +1,27 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
-import type { ISampleMeasure } from './task-interface'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
 import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getTaskDetail } from '@/api/business/task'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // 样品详情id
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -39,32 +38,49 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleMeasure> = ref({
-  id: '',
-  orderId: '', // 委托单id
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
   postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
   manufacturer: '', // 生产厂家
   manufacturerCountry: '', // 厂家国别
   manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
   remark: '', // 备注
   minioFileName: '', // 说明书
   labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-  certifications: '',
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
 })
 const ruleFormRef = ref<FormInstance>()
 
@@ -143,14 +159,6 @@
   return menu.find(item => item.name === currentMenu.value)
 })
 
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
 const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
@@ -181,11 +189,9 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(dataForm.value).then((res) => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -195,42 +201,23 @@
     }
   })
 }
-
-// 获取样品详情
+//
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
 const getInfo = () => {
-  // getSapmleDetail({ id: infoId.value }).then((res) => {
-  dataForm.value = {
-    orderId: '123',
-    ABC: 'A',
-    companyAddress: '北京/北京市',
-    customerName: '京东集团',
-    customerNo: 'sygf202211290001',
-    id: '111111',
-    labelBind: '11222',
-    manufacturer: '北京某厂家',
-    manufacturerCountry: 'CN',
-    manufacturingDate: '2023-03',
-    manufacturingNo: '123121',
-    mesureCategory: '',
-    mesureContent: '项目1',
-    mesurePeriod: '1',
-    mesureType: '',
-    minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-    phone: '950618',
-    postalCode: 'test',
-    remark: '无备注',
-    sampleModel: '型号1',
-    sampleName: '样品1',
-    sampleNo: '123456',
-    measureResultCode: 'bhg',
-    deliverer: '张三',
-    delivererTel: '156254577545',
-    certifications: '1',
-  }
-  // for (const item of menu) {
-  //   item.searchFunc()
-  // }
-  // })
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList
+    taskForm.value.measureSendBackList = res.data.measureSendBackList
+  })
 }
 
 // 点击标签绑定的扫描
@@ -260,7 +247,7 @@
     fd.append('multipartFile', event.target.files[0])
     // UploadFile(fd).then((res) => {
     //   if (res.code === 200) {
-    //     dataForm.value.minioFileName = res.data[0]
+    //     sampleForm.value.minioFileName = res.data[0]
     //     // 重置当前验证
     //     ElMessage.success('文件上传成功')
     //   }
@@ -273,18 +260,30 @@
 const upload = () => {
   fileRef.value.click()
 }
-// 获取样品详情
-getInfo()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.role) {
+  roleType.value = $route.params.role as string // 使用角色
+
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+    getSampleInfo()
+  }
+}
 </script>
 
 <template>
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -294,7 +293,7 @@
       <div id="form">
         <el-form
           ref="ruleFormRef"
-          :model="dataForm"
+          :model="sampleForm"
           :label-width="120"
           label-position="right"
           :rules="rules"
@@ -303,9 +302,9 @@
             <el-col :span="6">
               <el-form-item label="样品编号:" prop="sampleNo">
                 <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -313,9 +312,9 @@
             <el-col :span="6">
               <el-form-item label="样品名称:" prop="sampleName">
                 <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -323,9 +322,9 @@
             <el-col :span="6">
               <el-form-item label="样品型号:" prop="sampleModel">
                 <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -333,9 +332,9 @@
             <el-col :span="6">
               <el-form-item label="出厂编号:" prop="manufacturingNo">
                 <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -343,9 +342,9 @@
             <el-col :span="6">
               <el-form-item label="委托方代码" prop="customerNo">
                 <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -353,9 +352,9 @@
             <el-col :span="6">
               <el-form-item label="委托方名称" prop="customerName">
                 <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -363,9 +362,9 @@
             <el-col :span="6">
               <el-form-item label="委托方电话" prop="phone">
                 <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -373,9 +372,9 @@
             <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -383,11 +382,11 @@
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
-                  v-model="dataForm.companyAddress"
+                  v-model="sampleForm.customerAddress"
                   type="textarea"
                   autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -395,9 +394,9 @@
             <el-col :span="6">
               <el-form-item label="校检类别:">
                 <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
@@ -407,19 +406,19 @@
             <el-col :span="6">
               <el-form-item label="生产厂家:">
                 <el-input
-                  v-model="dataForm.manufacturer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="厂家国别:">
                 <el-select
-                  v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
@@ -429,23 +428,23 @@
             <el-col :span="6">
               <el-form-item label="出厂年月:">
                 <el-date-picker
-                  v-model="dataForm.manufacturingDate"
+                  v-model="sampleForm.manufacturingDate"
                   type="month"
                   format="YYYY-MM"
                   value-format="YYYY-MM"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="ABC:">
                 <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
@@ -455,9 +454,9 @@
             <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -465,9 +464,9 @@
             <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
-                  v-model="dataForm.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -475,49 +474,20 @@
             <el-col :span="24">
               <el-form-item label="检定项目:" prop="mesureContent">
                 <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定周期（月）:">
                 <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="上次检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  disabled
-                  class="full-width-input"
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
@@ -526,21 +496,21 @@
             <el-col :span="24">
               <el-form-item label="备注:">
                 <el-input
-                  v-model="dataForm.remark"
+                  v-model="sampleForm.remark"
                   type="textarea"
                   :rows="2"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
-                  v-model="dataForm.mesureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
@@ -550,10 +520,10 @@
             <el-col :span="6">
               <el-form-item label="标签绑定:">
                 <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 >
                   <template #append>
                     <el-button>扫描</el-button>
@@ -565,11 +535,11 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="14">
               <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
             </el-col>
@@ -586,7 +556,7 @@
           保存
         </el-button>
       </template>
-      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
@@ -604,11 +574,11 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="dataForm.id!" :order-id="dataForm.orderId" />
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
       <!-- 检定记录 -->
-      <measure-records v-if="currentMenu === '检定记录'" :sample-id="dataForm.id!" />
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
-      <certification-records v-if="currentMenu === '检定证书'" :sample-id="dataForm.id!" />
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index f784804..461c518 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -31,7 +31,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
@@ -39,30 +39,30 @@
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
-  { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center' },
-  { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
-  { text: '分发性质', value: 'distributeState', align: 'center', width: '90px' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return row.alreadyCertifications ? `${row.alreadyCertifications}/${row.requireCertifications}` : '0/0' } },
+  { text: '分发性质', value: 'handOutProperty', align: 'center', width: '90px' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -80,15 +80,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // // 模拟数据
-  // list.value = [
-  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  // ]
-  // loadingTable.value = false
-  // console.log(listQuery.value)
   getTaskList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -111,15 +107,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
+    sampleBelong: '', // 样品属性
     sampleStatus: '2', // 分发状态
+    startTime: '', //	应检定开始时间
+    endTime: '', //	应检定结束时间
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -271,8 +269,8 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue
index 629b33c..2300f4c 100644
--- a/src/views/customer/advice/adviceEdit.vue
+++ b/src/views/customer/advice/adviceEdit.vue
@@ -51,7 +51,7 @@
 const companyInfo: SimpleCompany = reactive({
   customerName: '', // 公司名称
   customerNo: '', //	客户编号
-  customerId: '', // 客户id
+  id: '', // 客户id
   grade: '', // 履约评级
   gradeName: '', // 履约评级
   companySize: '', // 公司规模
@@ -121,12 +121,13 @@
   const item = select as SimpleCompany
   companyInfo.customerName = item.customerName
   companyInfo.customerNo = item.customerNo
-  companyInfo.customerId = item.customerId
+  companyInfo.id = item.id
   companyInfo.gradeName = item.gradeName
   companyInfo.companySizeName = item.companySizeName
   companyInfo.businessSizeName = item.businessSizeName
   companyInfo.evaluationName = item.evaluationName
   dataForm.value.customerNo = item.customerNo
+  dataForm.value.customerId = item.id
 }
 // 打印表单
 const printObj = ref({
@@ -154,8 +155,6 @@
         if (dataForm.value.id) {
           updateAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -164,8 +163,6 @@
         else {
           addAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
diff --git a/src/views/customer/advice/advice_interface.ts b/src/views/customer/advice/advice_interface.ts
index b08f85b..a8bf311 100644
--- a/src/views/customer/advice/advice_interface.ts
+++ b/src/views/customer/advice/advice_interface.ts
@@ -40,9 +40,10 @@
 
 // 公司简易
 export interface SimpleCompany {
+  id: string // 客户id
   customerName: string // 公司名称
   customerNo: string //	客户编号
-  customerId: string // 客户id
+  grade: string // 履约评级
   gradeName: string // 履约评级
   companySizeName: string // 公司规模
   businessSizeName: string // 业务规模
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index f9ee314..4893c4f 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -26,6 +26,7 @@
 const visible = ref(false) // 控制对话框显隐
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -54,17 +55,7 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
-})
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
+})// 表单
 const ruleFormRef = ref<FormInstance>()
 
 // 自定义校验规则--检定周期为正整数
@@ -111,6 +102,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -479,7 +474,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index aceea6a..abcada5 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -36,7 +36,14 @@
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
-  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: ISampleList) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ISampleList[]>([])
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index aafed2a..256ed9f 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -24,6 +24,7 @@
   measurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
   remark: string // 备注
+  validDeadline?: string // 证书过期时间
 }
 
 export interface ISampleEdit {
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 3b03275..d04456b 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -163,7 +163,7 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
+          <el-select v-model="listQuery.businessSize" placeholder="业务规模">
             <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
@@ -183,7 +183,16 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirm">
           确定
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 59f2feb..4deeed8 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -20,18 +20,9 @@
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 
 const dataForm: Ref<ISampleDetail> = ref({
   id: '',
@@ -74,6 +65,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -358,7 +353,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 05fe276..7251eda 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -4,12 +4,16 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOvertimeList, IOvertimeListQuery } from './overtime_list_interface'
+import { ITEM_RENDER_EVT } from 'element-plus/es/components/virtual-list/src/defaults'
+import type { IOvertimeList, IOvertimeListQuery, dictType } from './overtime_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportSapmleList, getSampleList } from '@/api/customer/sampleList'
+import { getDictByCode } from '@/api/system/dict'
+
 const { proxy } = getCurrentInstance() as any
+const certificationStatusMap = ref<dictType[]>([]) as any // 证书状况
 const $router = useRouter()
 
 // 查询条件
@@ -25,12 +29,7 @@
   offset: 1,
   limit: 20,
 })
-// 证书状况字典
-const certificationStatusMap = {
-  0: '未超期',
-  1: '即将超期',
-  2: '已超期',
-}
+
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
@@ -42,7 +41,13 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
-  { text: '证书状况', value: 'certificationStatus', align: 'center' },
+  {
+    text: '证书状况',
+    value: 'certificationStatus',
+    align: 'center',
+    width: '90px',
+    styleFilter: (row: IOvertimeList) => { return row.certificationStatus === '即将超期' ? 'color: red' : '' },
+  },
 ])
 // 表格数据
 const list = ref<IOvertimeList[]>([])
@@ -53,6 +58,16 @@
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
+// 获取字典值
+async function getDict() {
+  // 证书状况
+  const res = await getDictByCode('certificationStatus')
+  // 证书状况字典 {1：即将过期}
+  res.data.forEach((item: any) => {
+    certificationStatusMap.value[`${item.value}`] = item.name
+  })
+}
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -63,7 +78,12 @@
   listQuery.value.startTime = timeRange.value[0] as string || ''
   listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: IOvertimeList) => {
+      return {
+        ...item,
+        certificationStatus: certificationStatusMap.value[item.certificationStatus],
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -161,7 +181,10 @@
   }
 }
 
-fetchData(true)
+onMounted(async () => {
+  await getDict()
+  fetchData(true)
+})
 </script>
 
 <template>
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 519f0af..cceb09b 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -135,7 +135,7 @@
         @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 4eb62ec..9d75cff 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -8,6 +8,7 @@
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { getpDeptApi, listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -19,9 +20,12 @@
   director: '', // 负责人
   administrationJob: '', // 行政职务
   technologyJob: '', // 技术职务
+  meterMajor: '', // 计量专业
   remark: '', // 备注
-  pDeptId: '',
-  pDeptName: '',
+  pDeptId: '', // 父级
+  pDeptName: '', // 父级
+  isLab: '1', // 是否为实验室
+  labCapacity: [], // 实验室能力
 }) // 表单
 // 展示父级组织
 const pDept = ref({
@@ -33,10 +37,11 @@
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
-  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+  organizeName: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
+  director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: ['blur', 'change'] }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: ['blur', 'change'] }],
+  isLab: [{ required: true, message: '是否为实验室不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 // 获取计量人员列表
@@ -53,13 +58,26 @@
     }
   })
 }
-const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
-// 获取技术职务列表
-const getTechnologyJobList = () => {
+const measureTypeList = ref<dictType[]>([]) // 实验室能力
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+const technologyJobList = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  // 获取技术职务列表
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
+  // 获取检校类型
+  getDictByCode('checkType').then((response) => {
+    measureTypeList.value = response.data
+  })
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
 }
+getDict()
+
 const administrationJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
@@ -91,7 +109,8 @@
           type: 'warning',
         },
       ).then((res) => {
-        updateApi({ ...ruleForm.value, title: undefined }).then((res) => {
+        const form = { ...ruleForm.value, labCapacity: ruleForm.value.labCapacity.join(',') }
+        updateApi(form).then((res) => {
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('提交成功')
@@ -117,6 +136,8 @@
   ruleForm.value.administrationJob = '' // 行政职务
   ruleForm.value.technologyJob = '' // 技术职务
   ruleForm.value.remark = '' // 备注
+  ruleForm.value.isLab = ''
+  ruleForm.value.labCapacity = []
 }
 const multipleTableRef = ref()
 const current = ref('')
@@ -141,7 +162,7 @@
       },
       {
         label: '计量专业',
-        data: 'meterMajor',
+        data: 'meterMajorName',
       },
       {
         label: '创建时间',
@@ -196,7 +217,7 @@
       },
       {
         label: '计量专业',
-        data: 'meterMajor',
+        data: 'meterMajorName',
       },
       {
         label: '创建时间',
@@ -434,10 +455,12 @@
   reset()
   title.value = row.title
   path.value = row.path
+  ruleForm.value = row
   ruleForm.value.organizeType = row.organizeType
   ruleForm.value.deptId = row.deptId
+  ruleForm.value.labCapacity = row.labCapacity ? row.labCapacity.split(',') : []
+  ruleForm.value.meterMajor = row.meterMajor
   getuser()
-  getTechnologyJobList()
   getAdministrationJob()
   getDepartmentList()
   getuserInfoList()
@@ -445,7 +468,6 @@
     getInstrumentInfo()
     getDeviceInfo()
   }
-  ruleForm.value = row
   console.log(row, 'row')
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
@@ -538,6 +560,53 @@
           </el-col>
         </el-row>
         <el-row :gutter="24">
+          <el-col v-if="title.split('-')[1] === '科室'" :span="6">
+            <el-form-item label="是否为实验室" prop="isLab">
+              <el-select v-model="ruleForm.isLab" :placeholder="title.split('-')[2] === '详情' ? '' : ''" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
+                <el-option label="是" value="1" />
+                <el-option label="否" value="0" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="title.split('-')[1] !== '部门'" :span="6">
+            <el-form-item label="计量专业" prop="meterMajor">
+              <el-select
+                v-model.trim="ruleForm.meterMajor"
+                clearable
+                :placeholder="title.split('-')[2] === '详情' ? '' : '请选择'"
+                :disabled="ruleForm.isLab === '0' || title.split('-')[2] === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="title.split('-')[1] === '科室'" :span="12">
+            <el-form-item label="实验室能力" prop="labCapacity">
+              <el-select
+                v-model.trim="ruleForm.labCapacity"
+                clearable
+                multiple
+                :placeholder="title.split('-')[2] === '详情' ? '' : '请选择'"
+                :disabled="ruleForm.isLab === '0' || title.split('-')[2] === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureTypeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
@@ -586,13 +655,5 @@
 </template>
 
 <style lang="scss" scoped>
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      content: "";
-      display: none;
-    }
-  }
-}
+// 样式代码
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index f7fd689..33e63c8 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -66,7 +66,7 @@
     columns: [
       { text: '科室编号', value: 'organizeNo', align: 'center' },
       { text: '科室名称', value: 'organizeName', align: 'center' },
-      { text: '专业', value: 'meterMajor', align: 'center' },
+      { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '技术职务', value: 'technologyJobName', align: 'center' },
       { text: '行政职务', value: 'administrationJobName', align: 'center' },
@@ -79,7 +79,7 @@
     columns: [
       { text: '工程组编号', value: 'organizeNo', align: 'center' },
       { text: '工程组名', value: 'organizeName', align: 'center' },
-      { text: '计量专业', value: 'meterMajor', align: 'center' },
+      { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
       { text: '所属科室', value: 'pDeptName', align: 'center' },
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index f7911fa..0528cc7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -7,7 +7,7 @@
   organizeType?: string // 类型
   createTime?: string // 创建时间
   director?: string // 负责人
-  meterMajor?: string // 专业
+  meterMajor: string // 专业
   pDeptId?: string // 所属科室
   createEndTime?: string
   createStartTime?: string
@@ -45,4 +45,6 @@
   technologyJobName: string
   updateTime: string
   title?: string
+  isLab: string // 是否为实验室
+  labCapacity: string | string[]
 }
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 4941fbb..90c6daf 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -21,25 +21,25 @@
 const total = ref<number>(0)
 const select = ref()
 const columns = ref([
-  {
-    text: '人员编号',
-    value: 'staffNo',
-  },
-  {
-    text: '姓名',
-    value: 'name',
-  },
-  {
-    text: '所在部门',
-    value: 'deptId',
-  },
+  { text: '人员编号', value: 'staffNo', width: '160', fixed: true },
+  { text: '姓名', value: 'name', fixed: true },
+  { text: '所在部门', value: 'deptId' },
+  { text: '学历', value: 'education', align: 'center' },
+  { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  { text: '计量专业', value: 'major', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '技术考核', value: 'technologyExam', align: 'center' },
 ])
 // 获取部门
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
 const deptIdList = ref([])
-const getDeptList = () => {
+const getDeptList = () => { // 获取部门
   getDeptTreeList().then((res) => {
     deptIdList.value = toTreeList(res.data, '0', true)
   })
@@ -50,7 +50,7 @@
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records
-      total.value = Number(res.data.total)
+      total.value = parseInt(res.data.total)
     }
   })
 }
@@ -81,8 +81,8 @@
   }
   search()
 }
-// 点击保存
-const submitForm = () => {
+// 点击确定
+const confirmSelect = () => {
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     getStaffDetail(person).then((res) => {
@@ -143,17 +143,17 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <el-table-column label="#" width="55" align="center">
-          <template #default="scope">
-            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column> -->
+          <!-- <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column> -->
         </template>
       </normal-table>
     </div>
     <template #footer>
       <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
         <el-button @click="resetForm">
           取消
         </el-button>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index d0d3ba2..84dd465 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -6,6 +6,8 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -17,22 +19,15 @@
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref([
-  {
-    text: '姓名',
-    value: 'name',
-  },
-  {
-    text: '账户',
-    value: 'account',
-  },
-  {
-    text: '所在部门',
-    value: 'deptName',
-  },
+const total = ref(0)
+const select = ref(-1)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '姓名', value: 'name' },
+  { text: '账户', value: 'account' },
+  { text: '所在部门', value: 'deptName' },
 ])
+// 所在部门
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
@@ -43,7 +38,7 @@
     deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
-// 获取数据列表
+// 获取人员数据列表
 const fetchData = () => {
   select.value = -1
   getUserList(listQuery.value).then((res) => {
@@ -100,8 +95,8 @@
 const initDialog = () => {
   // reset()
   dialogFormVisible.value = true
-  getDeptList()
-  fetchData()
+  getDeptList() // 获取部门信息
+  fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
 </script>
@@ -135,11 +130,11 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <el-table-column label="#" width="55" align="center">
-          <template #default="scope">
-            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column> -->
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
         </template>
       </normal-table>
     </div>
diff --git a/src/views/measure/train/components/selectMeasurePersonDialog.vue b/src/views/measure/train/components/selectMeasurePersonDialog.vue
new file mode 100644
index 0000000..251b1e5
--- /dev/null
+++ b/src/views/measure/train/components/selectMeasurePersonDialog.vue
@@ -0,0 +1,176 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectMeasurePersonDialog">
+import { ElMessage } from 'element-plus'
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 10,
+  offset: 1,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const singleChecked = ref('') // 单选选中id
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref<TableColumn[]>([
+  { text: '人员编号', value: 'staffNo', width: '160', align: 'center', fixed: true },
+  { text: '姓名', value: 'name', align: 'center', fixed: true },
+  { text: '学历', value: 'education', align: 'center' },
+  { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  { text: '计量专业', value: 'major', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '技术考核', value: 'technologyExam', align: 'center' },
+])
+// 获取部门
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
+const getDeptList = () => { // 获取部门
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records.map((item: any) => {
+        return {
+          ...item,
+          sex: item.sex === '1' ? '男' : '女',
+        }
+      })
+      total.value = parseInt(res.data.total)
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请先选择计量人员')
+  }
+  else {
+    emits('add', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
+      </search-item>
+      <search-item>
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/train/components/selectUser.vue b/src/views/measure/train/components/selectUser.vue
new file mode 100644
index 0000000..67eebdb
--- /dev/null
+++ b/src/views/measure/train/components/selectUser.vue
@@ -0,0 +1,237 @@
+<!-- 选择用户 -->
+<!-- 选择成员 -->
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
+import { getUserList } from '@/api/system/user'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
+})
+const emits = defineEmits(['update:visible', 'change'])
+const table = ref() // 表格ref
+
+// 表格表头
+const columns = ref<TableColumn[]>([
+  { text: '真实姓名', value: 'name', align: 'center' },
+  { text: '所在组织机构', value: 'deptName', align: 'center' },
+])
+
+// 表格数据
+const list = ref<IEmployees[]>([])
+
+const loading = ref(false)
+const total = ref(0)
+// 查询参数
+const listQuery = reactive({
+  keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
+  offset: 1,
+  limit: 10,
+  sort: 'id',
+  deptType: '',
+})
+const checkedList = ref([])
+// 多选的数据
+const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
+const closeDialog = () => {
+  emits('update:visible', false)
+}
+const visibleDialog = computed({
+  get() {
+    return props.visible
+  },
+  set() {
+    closeDialog()
+  },
+})
+
+watch(() => props.visible, (val) => {
+  // 清除上次选中
+  if (!val) {
+    table.value.clearMulti()
+  }
+})
+
+// 点击确定，保存选择的成员配置
+const saveDialog = () => {
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
+}
+
+const select = ref('')
+// 获取列表数据
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
+  getUserList(listQuery).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    loading.value = false
+  })
+}
+
+// 多选
+const multiSelect = (val: any) => {
+  multipleTable.value = val
+}
+
+// 查询数据
+const search = () => {
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
+
+onMounted(() => {
+  // 获取列表数据
+  fetchData(true)
+})
+</script>
+
+<template>
+  <div class="select-emplotees-dialog">
+    <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table-area">
+        <!-- 筛选条件 -->
+        <search-area @search="search">
+          <search-item>
+            <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
+          </search-item>
+        </search-area>
+        <!-- 表头标题 -->
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
+          <!-- 查询结果Table显示 -->
+          <normal-table
+            ref="table"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
+          >
+            <!-- 序号 -->
+            <template #preColumns>
+              <el-table-column label="#" width="55" align="center">
+                <template #default="scope">
+                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
+            </template>
+            <!-- 状态 -->
+            <template #columns>
+              <el-table-column label="状态" align="center" width="80">
+                <template #default="scope">
+                  <el-tag :type="scope.row.statusName === '启用' ? 'success' : 'danger'">
+                    {{ scope.row.statusName }}
+                  </el-tag>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+      <!-- </div> -->
+      <template #footer>
+        <el-button @click="closeDialog">
+          取 消
+        </el-button>
+        <el-button type="primary" @click="saveDialog">
+          确 定
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss">
+@import "@/css/dialog.css";
+
+.chengyuan-dialog {
+  .el-table .cell {
+    white-space: nowrap;
+  }
+
+  .el-dialog__body {
+    display: flex;
+    overflow: auto;
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+.chengyuan-dialog {
+  width: 100%;
+
+  .left-container {
+    white-space: nowrap;
+    height: 100%;
+  }
+
+  .table-area {
+    flex: 1;
+    overflow: auto;
+
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
+    .pagination {
+      margin-top: 10px;
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+    }
+  }
+}
+</style>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
new file mode 100644
index 0000000..d6827e4
--- /dev/null
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts" name="DistributeDialog">
+import processConfig from './processConfig.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { getTaskDetail } from '@/api/business/task'
+// 任务分发弹窗
+
+// 自定义方法：close关闭弹窗
+const emit = defineEmits(['close'])
+const dialogVisible = ref(false) // 弹窗显示
+const sampleId = ref('') // 样品id
+const orderId = ref('') // 委托单id
+
+// 委托书-证书类别列表
+const certificationTypes = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  getDictByCode('certificationType').then((response) => {
+    certificationTypes.value = response.data
+  })
+}
+
+getDict()
+// 样品详情
+const sampleDetail = ref({
+  sampleName: '压力表',
+  mesureContent: '压力、ip68',
+  certifications: ['1', '2'],
+  remark: '这是备注',
+  measureProcessList: [],
+  measureSendBackList: [],
+})
+
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    sampleDetail.value.sampleName = res.data.sampleName
+    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.remark = res.data.remark
+    sampleDetail.value.certifications = res.data.certifications
+    sampleDetail.value.measureProcessList = res.data.measureProcessList
+    sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+  })
+}
+// 初始化弹窗
+const initDialog = (orderid: string, sampleid: string) => {
+  dialogVisible.value = true
+  sampleId.value = sampleid
+  orderId.value = orderid
+  getInfo()
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+  emit('close')
+}
+function cancel() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="任务分发" width="1000" @close="cancel">
+    <div class="simple-info">
+      <div class="simple-info-line">
+        <span class="label">样品名称:</span>
+        <el-input v-model="sampleDetail.sampleName" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">证书类别:</span>
+        <el-checkbox-group v-model="sampleDetail.certifications" disabled>
+          <el-checkbox v-for="item in certificationTypes" :key="item.value" :label="item.value">
+            {{ item.name }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="simple-info-line">
+        <span class="label">检定项目:</span>
+        <el-input v-model="sampleDetail.mesureContent" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">备注:</span>
+        <el-input v-model="sampleDetail.remark" disabled />
+      </div>
+    </div>
+    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+      批量添加
+    </el-button>
+    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <template #footer>
+      <el-button type="primary" @click="saveProcess">
+        确定
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//  样式
+.simple-info {
+  margin-top: -10px;
+  margin-bottom: 10px;
+
+  .simple-info-line {
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    .label {
+      width: 90px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/components/lab-interface.ts b/src/views/business/schedule/task/components/lab-interface.ts
index d6355c6..02b0d1d 100644
--- a/src/views/business/schedule/task/components/lab-interface.ts
+++ b/src/views/business/schedule/task/components/lab-interface.ts
@@ -6,7 +6,8 @@
   isLab: '1' // 是否是实验室
   director: string // 负责人
   meterMajor: string // 专业
-  measureItems: string// 检测能力
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
 }
 
 // 部门返回值对象类型
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 4ccab04..1efb8a9 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -1,11 +1,18 @@
 <script setup lang="ts" name="ProcessConfig">
 import { ref } from 'vue'
 import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
 import ProcessNode from './processNode.vue'
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/task'
 const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
   // 是否为详情展示页面
   detail: {
     type: Boolean,
@@ -21,81 +28,35 @@
     type: String,
     required: true,
   },
+  list: {
+    type: Array,
+    default: () => [],
+  },
 })
 const emits = defineEmits(['saveOver'])
 // 默认流程节点
-const defaultProcess = {
-  id: '', // 检测节点id
-  executiveItem: '', // 检测项目
-  executiveDept: '', // 检测部门
-  executiveDeptName: '', // 检测部门
-  executivePerson: '', // 检测人员
-  executivePersonName: '', // 检测人员
-  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-  measureStateName: '', // 检测状态
-  currentCertifications: '', // 当前证书数
-  requireCertifications: '', // 应出具证书数
-  updateTime: '', // 更新时间
-  backPerson: '', // 退回人
-  backReason: '', // 退回原因
-  backTime: '', // 退回时间
-  distributePerson: '', // 分配人
-  distributeTime: '', // 分配时间
-  startTime: '', // 检测开始时间
-  overTime: '', // 检测结束时间
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
 }
 // 检定流程列表
-const processList = ref([
+const processList = ref<IScheduleSet[]>([
   { ...defaultProcess },
 ])
 
-// 获取当前样品检测流程，参数待定
-const fetchProcess = () => {
-  // TODO: 模拟数据
-  processList.value = [
-    {
-      id: '1', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423635973935106', // 检测部门
-      executiveDeptName: '力学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '张三', // 检测人员
-      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待检测', // 检测状态
-      currentCertifications: '0', // 当前证书数
-      requireCertifications: '2', // 应出具证书数
-      updateTime: '2023-02-01 09:00:05', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-    {
-      id: '2', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423577505337346', // 检测部门
-      executiveDeptName: '热学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待分配', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-  ]
-}
-fetchProcess()
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+})
 
 // 点击添加流程
 const processAdd = () => {
@@ -121,25 +82,17 @@
 // 批量添加实验室
 const batchChooseOver = (labs: ILabList[]) => {
   for (const item of labs) {
-    const processTemp = {
-      id: '',
-      executiveItem: '', // 检测项目
-      executiveDept: item.deptId, // 检测部门
-      executiveDeptName: item.organizeName, // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
     }
     processList.value.push(processTemp)
   }
@@ -147,9 +100,24 @@
 
 // 保存流程
 const saveProcess = () => {
-  // TODO: 保存流程
-  console.log(processList.value)
-  emits('saveOver')
+  const form = {
+    measureProcessList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  console.log(form)
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
 }
 // 删除流程
 const deleteProcess = (index: number) => {
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index 6cbdf10..31dfae4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -12,24 +12,16 @@
     type: Object,
     default: () => {
       return {
-        id: '', // 检测节点id
-        executiveItem: '', // 检测项目
-        executiveDept: '', // 检测部门
-        executiveDeptName: '', // 检测部门
-        executivePerson: '', // 检测人员
-        executivePersonName: '', // 检测人员
-        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-        measureStateName: '', // 检测状态
-        currentCertifications: '', // 当前证书数
-        requireCertifications: '', // 应出具证书数
-        updateTime: '', // 更新时间
-        backPerson: '', // 退回人
-        backReason: '', // 退回原因
-        backTime: '', // 退回时间
-        distributePerson: '', // 分配人
-        distributeTime: '', // 分配时间
-        startTime: '', // 检测开始时间
-        overTime: '', // 检测结束时间
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
       }
     },
   },
@@ -56,22 +48,23 @@
 })
 // 检定环节可编辑-只有待分发状态可编辑
 const deptEdit = computed(() => {
-  return processNodeData.value.measureState == '0'
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 检定人可编辑-待分配状态可编辑
 const personEdit = computed(() => {
-  const editStates = ['0', '1']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 证书可编辑-待分发、待分配、待检测状态可编辑
 const certificationEdit = computed(() => {
-  const editStates = ['0', '1', '2']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 节点可移动
 const canMove = computed(() => {
-  const editStates = ['0']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 
 // 选择实验室
@@ -82,8 +75,8 @@
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
   console.log(lab)
-  processNodeData.value.executiveDept = lab.deptId
-  processNodeData.value.executiveDeptName = lab.organizeName
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
 }
 
 // 选择人员
@@ -93,8 +86,8 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
-  processNodeData.value.executivePerson = person.id
-  processNodeData.value.executivePersonName = person.name
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
 }
 
@@ -122,7 +115,7 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit">
           <template v-if="deptEdit" #append>
             <el-button :icon="Aim" size="small" link @click="clickChoose" />
           </template>
@@ -130,7 +123,7 @@
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit">
           <template v-if="personEdit" #append>
             <el-button :icon="Aim" size="small" link @click="choosePerson" />
           </template>
@@ -140,7 +133,7 @@
         <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
       <div class="line">
-        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
       </div>
       <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
@@ -149,7 +142,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 1d02839..493fbba 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,5 +1,3 @@
-import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
-
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -8,12 +6,29 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
   offset: number
 }
 
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
 // 任务列表-返回值
 export interface ITaskList {
   orderId: string // 委托书编号
@@ -25,41 +40,127 @@
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  isUrgent: string // 是否加急
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
   requireOverTime: string // 应检完时间
-  sampleAttr: string // 样品属性
-  sampleAttrName: string // 样品属性
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
   currentMeasureState: string // 当前检定环节
   currentMeasureStateName: string // 当前检定环节
-  currentCertifications: number // 已出具证书总数
+  alreadyCertifications: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
-  distributeStateName: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
 }
 
-// 检测流程节点
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+}
+
+// 全部检测流程节点
 export interface ISchedule {
-  executivePerson: string // 执行人
-  executivePersonName: string // 执行人名称
-  executiveDept: string // 执行部门
-  executiveDeptName: string // 执行部门名称
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
   executiveItem: string // 检定项目
-  currentCertifications?: number // 已出具证书总数
+  alreadyCertifications?: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  measureState: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
   updateTime: string // 流程更新时间
-  backTime: string // 退回时间
-  backReason: string // 退回原因
-  backPerson: string // 退回人
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
   distributePerson: string // 分配人
   distributeTime: string // 分配时间
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
 
 // 样品检测信息
-export interface ISampleMeasure extends ISampleEdit {
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
   orderId: string // 委托单id
+  orderCode: string // 委托单编号
   certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
 }
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 465b2e7..547ee3e 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,28 +1,27 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
-import type { ISampleMeasure } from './task-interface'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
 import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getTaskDetail } from '@/api/business/task'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // 样品详情id
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -39,32 +38,49 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleMeasure> = ref({
-  id: '',
-  orderId: '', // 委托单id
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
   postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
   manufacturer: '', // 生产厂家
   manufacturerCountry: '', // 厂家国别
   manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
   remark: '', // 备注
   minioFileName: '', // 说明书
   labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-  certifications: '',
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
 })
 const ruleFormRef = ref<FormInstance>()
 
@@ -143,14 +159,6 @@
   return menu.find(item => item.name === currentMenu.value)
 })
 
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
 const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
@@ -181,11 +189,9 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(dataForm.value).then((res) => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -195,42 +201,23 @@
     }
   })
 }
-
-// 获取样品详情
+//
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
 const getInfo = () => {
-  // getSapmleDetail({ id: infoId.value }).then((res) => {
-  dataForm.value = {
-    orderId: '123',
-    ABC: 'A',
-    companyAddress: '北京/北京市',
-    customerName: '京东集团',
-    customerNo: 'sygf202211290001',
-    id: '111111',
-    labelBind: '11222',
-    manufacturer: '北京某厂家',
-    manufacturerCountry: 'CN',
-    manufacturingDate: '2023-03',
-    manufacturingNo: '123121',
-    mesureCategory: '',
-    mesureContent: '项目1',
-    mesurePeriod: '1',
-    mesureType: '',
-    minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-    phone: '950618',
-    postalCode: 'test',
-    remark: '无备注',
-    sampleModel: '型号1',
-    sampleName: '样品1',
-    sampleNo: '123456',
-    measureResultCode: 'bhg',
-    deliverer: '张三',
-    delivererTel: '156254577545',
-    certifications: '1',
-  }
-  // for (const item of menu) {
-  //   item.searchFunc()
-  // }
-  // })
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList
+    taskForm.value.measureSendBackList = res.data.measureSendBackList
+  })
 }
 
 // 点击标签绑定的扫描
@@ -260,7 +247,7 @@
     fd.append('multipartFile', event.target.files[0])
     // UploadFile(fd).then((res) => {
     //   if (res.code === 200) {
-    //     dataForm.value.minioFileName = res.data[0]
+    //     sampleForm.value.minioFileName = res.data[0]
     //     // 重置当前验证
     //     ElMessage.success('文件上传成功')
     //   }
@@ -273,18 +260,30 @@
 const upload = () => {
   fileRef.value.click()
 }
-// 获取样品详情
-getInfo()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.role) {
+  roleType.value = $route.params.role as string // 使用角色
+
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+    getSampleInfo()
+  }
+}
 </script>
 
 <template>
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -294,7 +293,7 @@
       <div id="form">
         <el-form
           ref="ruleFormRef"
-          :model="dataForm"
+          :model="sampleForm"
           :label-width="120"
           label-position="right"
           :rules="rules"
@@ -303,9 +302,9 @@
             <el-col :span="6">
               <el-form-item label="样品编号:" prop="sampleNo">
                 <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -313,9 +312,9 @@
             <el-col :span="6">
               <el-form-item label="样品名称:" prop="sampleName">
                 <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -323,9 +322,9 @@
             <el-col :span="6">
               <el-form-item label="样品型号:" prop="sampleModel">
                 <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -333,9 +332,9 @@
             <el-col :span="6">
               <el-form-item label="出厂编号:" prop="manufacturingNo">
                 <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -343,9 +342,9 @@
             <el-col :span="6">
               <el-form-item label="委托方代码" prop="customerNo">
                 <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -353,9 +352,9 @@
             <el-col :span="6">
               <el-form-item label="委托方名称" prop="customerName">
                 <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -363,9 +362,9 @@
             <el-col :span="6">
               <el-form-item label="委托方电话" prop="phone">
                 <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -373,9 +372,9 @@
             <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -383,11 +382,11 @@
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
-                  v-model="dataForm.companyAddress"
+                  v-model="sampleForm.customerAddress"
                   type="textarea"
                   autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -395,9 +394,9 @@
             <el-col :span="6">
               <el-form-item label="校检类别:">
                 <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
@@ -407,19 +406,19 @@
             <el-col :span="6">
               <el-form-item label="生产厂家:">
                 <el-input
-                  v-model="dataForm.manufacturer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="厂家国别:">
                 <el-select
-                  v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
@@ -429,23 +428,23 @@
             <el-col :span="6">
               <el-form-item label="出厂年月:">
                 <el-date-picker
-                  v-model="dataForm.manufacturingDate"
+                  v-model="sampleForm.manufacturingDate"
                   type="month"
                   format="YYYY-MM"
                   value-format="YYYY-MM"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="ABC:">
                 <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
@@ -455,9 +454,9 @@
             <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -465,9 +464,9 @@
             <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
-                  v-model="dataForm.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -475,49 +474,20 @@
             <el-col :span="24">
               <el-form-item label="检定项目:" prop="mesureContent">
                 <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定周期（月）:">
                 <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="上次检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  disabled
-                  class="full-width-input"
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
@@ -526,21 +496,21 @@
             <el-col :span="24">
               <el-form-item label="备注:">
                 <el-input
-                  v-model="dataForm.remark"
+                  v-model="sampleForm.remark"
                   type="textarea"
                   :rows="2"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
-                  v-model="dataForm.mesureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
@@ -550,10 +520,10 @@
             <el-col :span="6">
               <el-form-item label="标签绑定:">
                 <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 >
                   <template #append>
                     <el-button>扫描</el-button>
@@ -565,11 +535,11 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="14">
               <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
             </el-col>
@@ -586,7 +556,7 @@
           保存
         </el-button>
       </template>
-      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
@@ -604,11 +574,11 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="dataForm.id!" :order-id="dataForm.orderId" />
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
       <!-- 检定记录 -->
-      <measure-records v-if="currentMenu === '检定记录'" :sample-id="dataForm.id!" />
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
-      <certification-records v-if="currentMenu === '检定证书'" :sample-id="dataForm.id!" />
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index f784804..461c518 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -31,7 +31,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
@@ -39,30 +39,30 @@
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
-  { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center' },
-  { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
-  { text: '分发性质', value: 'distributeState', align: 'center', width: '90px' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return row.alreadyCertifications ? `${row.alreadyCertifications}/${row.requireCertifications}` : '0/0' } },
+  { text: '分发性质', value: 'handOutProperty', align: 'center', width: '90px' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -80,15 +80,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // // 模拟数据
-  // list.value = [
-  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  // ]
-  // loadingTable.value = false
-  // console.log(listQuery.value)
   getTaskList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -111,15 +107,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
+    sampleBelong: '', // 样品属性
     sampleStatus: '2', // 分发状态
+    startTime: '', //	应检定开始时间
+    endTime: '', //	应检定结束时间
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -271,8 +269,8 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue
index 629b33c..2300f4c 100644
--- a/src/views/customer/advice/adviceEdit.vue
+++ b/src/views/customer/advice/adviceEdit.vue
@@ -51,7 +51,7 @@
 const companyInfo: SimpleCompany = reactive({
   customerName: '', // 公司名称
   customerNo: '', //	客户编号
-  customerId: '', // 客户id
+  id: '', // 客户id
   grade: '', // 履约评级
   gradeName: '', // 履约评级
   companySize: '', // 公司规模
@@ -121,12 +121,13 @@
   const item = select as SimpleCompany
   companyInfo.customerName = item.customerName
   companyInfo.customerNo = item.customerNo
-  companyInfo.customerId = item.customerId
+  companyInfo.id = item.id
   companyInfo.gradeName = item.gradeName
   companyInfo.companySizeName = item.companySizeName
   companyInfo.businessSizeName = item.businessSizeName
   companyInfo.evaluationName = item.evaluationName
   dataForm.value.customerNo = item.customerNo
+  dataForm.value.customerId = item.id
 }
 // 打印表单
 const printObj = ref({
@@ -154,8 +155,6 @@
         if (dataForm.value.id) {
           updateAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -164,8 +163,6 @@
         else {
           addAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
diff --git a/src/views/customer/advice/advice_interface.ts b/src/views/customer/advice/advice_interface.ts
index b08f85b..a8bf311 100644
--- a/src/views/customer/advice/advice_interface.ts
+++ b/src/views/customer/advice/advice_interface.ts
@@ -40,9 +40,10 @@
 
 // 公司简易
 export interface SimpleCompany {
+  id: string // 客户id
   customerName: string // 公司名称
   customerNo: string //	客户编号
-  customerId: string // 客户id
+  grade: string // 履约评级
   gradeName: string // 履约评级
   companySizeName: string // 公司规模
   businessSizeName: string // 业务规模
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index f9ee314..4893c4f 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -26,6 +26,7 @@
 const visible = ref(false) // 控制对话框显隐
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -54,17 +55,7 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
-})
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
+})// 表单
 const ruleFormRef = ref<FormInstance>()
 
 // 自定义校验规则--检定周期为正整数
@@ -111,6 +102,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -479,7 +474,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index aceea6a..abcada5 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -36,7 +36,14 @@
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
-  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: ISampleList) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ISampleList[]>([])
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index aafed2a..256ed9f 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -24,6 +24,7 @@
   measurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
   remark: string // 备注
+  validDeadline?: string // 证书过期时间
 }
 
 export interface ISampleEdit {
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 3b03275..d04456b 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -163,7 +163,7 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
+          <el-select v-model="listQuery.businessSize" placeholder="业务规模">
             <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
@@ -183,7 +183,16 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirm">
           确定
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 59f2feb..4deeed8 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -20,18 +20,9 @@
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 
 const dataForm: Ref<ISampleDetail> = ref({
   id: '',
@@ -74,6 +65,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -358,7 +353,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 05fe276..7251eda 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -4,12 +4,16 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOvertimeList, IOvertimeListQuery } from './overtime_list_interface'
+import { ITEM_RENDER_EVT } from 'element-plus/es/components/virtual-list/src/defaults'
+import type { IOvertimeList, IOvertimeListQuery, dictType } from './overtime_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportSapmleList, getSampleList } from '@/api/customer/sampleList'
+import { getDictByCode } from '@/api/system/dict'
+
 const { proxy } = getCurrentInstance() as any
+const certificationStatusMap = ref<dictType[]>([]) as any // 证书状况
 const $router = useRouter()
 
 // 查询条件
@@ -25,12 +29,7 @@
   offset: 1,
   limit: 20,
 })
-// 证书状况字典
-const certificationStatusMap = {
-  0: '未超期',
-  1: '即将超期',
-  2: '已超期',
-}
+
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
@@ -42,7 +41,13 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
-  { text: '证书状况', value: 'certificationStatus', align: 'center' },
+  {
+    text: '证书状况',
+    value: 'certificationStatus',
+    align: 'center',
+    width: '90px',
+    styleFilter: (row: IOvertimeList) => { return row.certificationStatus === '即将超期' ? 'color: red' : '' },
+  },
 ])
 // 表格数据
 const list = ref<IOvertimeList[]>([])
@@ -53,6 +58,16 @@
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
+// 获取字典值
+async function getDict() {
+  // 证书状况
+  const res = await getDictByCode('certificationStatus')
+  // 证书状况字典 {1：即将过期}
+  res.data.forEach((item: any) => {
+    certificationStatusMap.value[`${item.value}`] = item.name
+  })
+}
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -63,7 +78,12 @@
   listQuery.value.startTime = timeRange.value[0] as string || ''
   listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: IOvertimeList) => {
+      return {
+        ...item,
+        certificationStatus: certificationStatusMap.value[item.certificationStatus],
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -161,7 +181,10 @@
   }
 }
 
-fetchData(true)
+onMounted(async () => {
+  await getDict()
+  fetchData(true)
+})
 </script>
 
 <template>
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 519f0af..cceb09b 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -135,7 +135,7 @@
         @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 4eb62ec..9d75cff 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -8,6 +8,7 @@
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { getpDeptApi, listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -19,9 +20,12 @@
   director: '', // 负责人
   administrationJob: '', // 行政职务
   technologyJob: '', // 技术职务
+  meterMajor: '', // 计量专业
   remark: '', // 备注
-  pDeptId: '',
-  pDeptName: '',
+  pDeptId: '', // 父级
+  pDeptName: '', // 父级
+  isLab: '1', // 是否为实验室
+  labCapacity: [], // 实验室能力
 }) // 表单
 // 展示父级组织
 const pDept = ref({
@@ -33,10 +37,11 @@
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
-  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+  organizeName: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
+  director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: ['blur', 'change'] }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: ['blur', 'change'] }],
+  isLab: [{ required: true, message: '是否为实验室不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 // 获取计量人员列表
@@ -53,13 +58,26 @@
     }
   })
 }
-const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
-// 获取技术职务列表
-const getTechnologyJobList = () => {
+const measureTypeList = ref<dictType[]>([]) // 实验室能力
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+const technologyJobList = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  // 获取技术职务列表
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
+  // 获取检校类型
+  getDictByCode('checkType').then((response) => {
+    measureTypeList.value = response.data
+  })
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
 }
+getDict()
+
 const administrationJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
@@ -91,7 +109,8 @@
           type: 'warning',
         },
       ).then((res) => {
-        updateApi({ ...ruleForm.value, title: undefined }).then((res) => {
+        const form = { ...ruleForm.value, labCapacity: ruleForm.value.labCapacity.join(',') }
+        updateApi(form).then((res) => {
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('提交成功')
@@ -117,6 +136,8 @@
   ruleForm.value.administrationJob = '' // 行政职务
   ruleForm.value.technologyJob = '' // 技术职务
   ruleForm.value.remark = '' // 备注
+  ruleForm.value.isLab = ''
+  ruleForm.value.labCapacity = []
 }
 const multipleTableRef = ref()
 const current = ref('')
@@ -141,7 +162,7 @@
       },
       {
         label: '计量专业',
-        data: 'meterMajor',
+        data: 'meterMajorName',
       },
       {
         label: '创建时间',
@@ -196,7 +217,7 @@
       },
       {
         label: '计量专业',
-        data: 'meterMajor',
+        data: 'meterMajorName',
       },
       {
         label: '创建时间',
@@ -434,10 +455,12 @@
   reset()
   title.value = row.title
   path.value = row.path
+  ruleForm.value = row
   ruleForm.value.organizeType = row.organizeType
   ruleForm.value.deptId = row.deptId
+  ruleForm.value.labCapacity = row.labCapacity ? row.labCapacity.split(',') : []
+  ruleForm.value.meterMajor = row.meterMajor
   getuser()
-  getTechnologyJobList()
   getAdministrationJob()
   getDepartmentList()
   getuserInfoList()
@@ -445,7 +468,6 @@
     getInstrumentInfo()
     getDeviceInfo()
   }
-  ruleForm.value = row
   console.log(row, 'row')
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
@@ -538,6 +560,53 @@
           </el-col>
         </el-row>
         <el-row :gutter="24">
+          <el-col v-if="title.split('-')[1] === '科室'" :span="6">
+            <el-form-item label="是否为实验室" prop="isLab">
+              <el-select v-model="ruleForm.isLab" :placeholder="title.split('-')[2] === '详情' ? '' : ''" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
+                <el-option label="是" value="1" />
+                <el-option label="否" value="0" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="title.split('-')[1] !== '部门'" :span="6">
+            <el-form-item label="计量专业" prop="meterMajor">
+              <el-select
+                v-model.trim="ruleForm.meterMajor"
+                clearable
+                :placeholder="title.split('-')[2] === '详情' ? '' : '请选择'"
+                :disabled="ruleForm.isLab === '0' || title.split('-')[2] === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="title.split('-')[1] === '科室'" :span="12">
+            <el-form-item label="实验室能力" prop="labCapacity">
+              <el-select
+                v-model.trim="ruleForm.labCapacity"
+                clearable
+                multiple
+                :placeholder="title.split('-')[2] === '详情' ? '' : '请选择'"
+                :disabled="ruleForm.isLab === '0' || title.split('-')[2] === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureTypeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
@@ -586,13 +655,5 @@
 </template>
 
 <style lang="scss" scoped>
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      content: "";
-      display: none;
-    }
-  }
-}
+// 样式代码
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index f7fd689..33e63c8 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -66,7 +66,7 @@
     columns: [
       { text: '科室编号', value: 'organizeNo', align: 'center' },
       { text: '科室名称', value: 'organizeName', align: 'center' },
-      { text: '专业', value: 'meterMajor', align: 'center' },
+      { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '技术职务', value: 'technologyJobName', align: 'center' },
       { text: '行政职务', value: 'administrationJobName', align: 'center' },
@@ -79,7 +79,7 @@
     columns: [
       { text: '工程组编号', value: 'organizeNo', align: 'center' },
       { text: '工程组名', value: 'organizeName', align: 'center' },
-      { text: '计量专业', value: 'meterMajor', align: 'center' },
+      { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
       { text: '所属科室', value: 'pDeptName', align: 'center' },
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index f7911fa..0528cc7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -7,7 +7,7 @@
   organizeType?: string // 类型
   createTime?: string // 创建时间
   director?: string // 负责人
-  meterMajor?: string // 专业
+  meterMajor: string // 专业
   pDeptId?: string // 所属科室
   createEndTime?: string
   createStartTime?: string
@@ -45,4 +45,6 @@
   technologyJobName: string
   updateTime: string
   title?: string
+  isLab: string // 是否为实验室
+  labCapacity: string | string[]
 }
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 4941fbb..90c6daf 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -21,25 +21,25 @@
 const total = ref<number>(0)
 const select = ref()
 const columns = ref([
-  {
-    text: '人员编号',
-    value: 'staffNo',
-  },
-  {
-    text: '姓名',
-    value: 'name',
-  },
-  {
-    text: '所在部门',
-    value: 'deptId',
-  },
+  { text: '人员编号', value: 'staffNo', width: '160', fixed: true },
+  { text: '姓名', value: 'name', fixed: true },
+  { text: '所在部门', value: 'deptId' },
+  { text: '学历', value: 'education', align: 'center' },
+  { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  { text: '计量专业', value: 'major', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '技术考核', value: 'technologyExam', align: 'center' },
 ])
 // 获取部门
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
 const deptIdList = ref([])
-const getDeptList = () => {
+const getDeptList = () => { // 获取部门
   getDeptTreeList().then((res) => {
     deptIdList.value = toTreeList(res.data, '0', true)
   })
@@ -50,7 +50,7 @@
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records
-      total.value = Number(res.data.total)
+      total.value = parseInt(res.data.total)
     }
   })
 }
@@ -81,8 +81,8 @@
   }
   search()
 }
-// 点击保存
-const submitForm = () => {
+// 点击确定
+const confirmSelect = () => {
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     getStaffDetail(person).then((res) => {
@@ -143,17 +143,17 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <el-table-column label="#" width="55" align="center">
-          <template #default="scope">
-            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column> -->
+          <!-- <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column> -->
         </template>
       </normal-table>
     </div>
     <template #footer>
       <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
         <el-button @click="resetForm">
           取消
         </el-button>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index d0d3ba2..84dd465 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -6,6 +6,8 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -17,22 +19,15 @@
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref([
-  {
-    text: '姓名',
-    value: 'name',
-  },
-  {
-    text: '账户',
-    value: 'account',
-  },
-  {
-    text: '所在部门',
-    value: 'deptName',
-  },
+const total = ref(0)
+const select = ref(-1)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '姓名', value: 'name' },
+  { text: '账户', value: 'account' },
+  { text: '所在部门', value: 'deptName' },
 ])
+// 所在部门
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
@@ -43,7 +38,7 @@
     deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
-// 获取数据列表
+// 获取人员数据列表
 const fetchData = () => {
   select.value = -1
   getUserList(listQuery.value).then((res) => {
@@ -100,8 +95,8 @@
 const initDialog = () => {
   // reset()
   dialogFormVisible.value = true
-  getDeptList()
-  fetchData()
+  getDeptList() // 获取部门信息
+  fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
 </script>
@@ -135,11 +130,11 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <el-table-column label="#" width="55" align="center">
-          <template #default="scope">
-            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column> -->
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
         </template>
       </normal-table>
     </div>
diff --git a/src/views/measure/train/components/selectMeasurePersonDialog.vue b/src/views/measure/train/components/selectMeasurePersonDialog.vue
new file mode 100644
index 0000000..251b1e5
--- /dev/null
+++ b/src/views/measure/train/components/selectMeasurePersonDialog.vue
@@ -0,0 +1,176 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectMeasurePersonDialog">
+import { ElMessage } from 'element-plus'
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 10,
+  offset: 1,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const singleChecked = ref('') // 单选选中id
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref<TableColumn[]>([
+  { text: '人员编号', value: 'staffNo', width: '160', align: 'center', fixed: true },
+  { text: '姓名', value: 'name', align: 'center', fixed: true },
+  { text: '学历', value: 'education', align: 'center' },
+  { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  { text: '计量专业', value: 'major', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '技术考核', value: 'technologyExam', align: 'center' },
+])
+// 获取部门
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
+const getDeptList = () => { // 获取部门
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records.map((item: any) => {
+        return {
+          ...item,
+          sex: item.sex === '1' ? '男' : '女',
+        }
+      })
+      total.value = parseInt(res.data.total)
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请先选择计量人员')
+  }
+  else {
+    emits('add', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
+      </search-item>
+      <search-item>
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/train/components/selectUser.vue b/src/views/measure/train/components/selectUser.vue
new file mode 100644
index 0000000..67eebdb
--- /dev/null
+++ b/src/views/measure/train/components/selectUser.vue
@@ -0,0 +1,237 @@
+<!-- 选择用户 -->
+<!-- 选择成员 -->
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
+import { getUserList } from '@/api/system/user'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
+})
+const emits = defineEmits(['update:visible', 'change'])
+const table = ref() // 表格ref
+
+// 表格表头
+const columns = ref<TableColumn[]>([
+  { text: '真实姓名', value: 'name', align: 'center' },
+  { text: '所在组织机构', value: 'deptName', align: 'center' },
+])
+
+// 表格数据
+const list = ref<IEmployees[]>([])
+
+const loading = ref(false)
+const total = ref(0)
+// 查询参数
+const listQuery = reactive({
+  keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
+  offset: 1,
+  limit: 10,
+  sort: 'id',
+  deptType: '',
+})
+const checkedList = ref([])
+// 多选的数据
+const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
+const closeDialog = () => {
+  emits('update:visible', false)
+}
+const visibleDialog = computed({
+  get() {
+    return props.visible
+  },
+  set() {
+    closeDialog()
+  },
+})
+
+watch(() => props.visible, (val) => {
+  // 清除上次选中
+  if (!val) {
+    table.value.clearMulti()
+  }
+})
+
+// 点击确定，保存选择的成员配置
+const saveDialog = () => {
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
+}
+
+const select = ref('')
+// 获取列表数据
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
+  getUserList(listQuery).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    loading.value = false
+  })
+}
+
+// 多选
+const multiSelect = (val: any) => {
+  multipleTable.value = val
+}
+
+// 查询数据
+const search = () => {
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
+
+onMounted(() => {
+  // 获取列表数据
+  fetchData(true)
+})
+</script>
+
+<template>
+  <div class="select-emplotees-dialog">
+    <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table-area">
+        <!-- 筛选条件 -->
+        <search-area @search="search">
+          <search-item>
+            <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
+          </search-item>
+        </search-area>
+        <!-- 表头标题 -->
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
+          <!-- 查询结果Table显示 -->
+          <normal-table
+            ref="table"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
+          >
+            <!-- 序号 -->
+            <template #preColumns>
+              <el-table-column label="#" width="55" align="center">
+                <template #default="scope">
+                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
+            </template>
+            <!-- 状态 -->
+            <template #columns>
+              <el-table-column label="状态" align="center" width="80">
+                <template #default="scope">
+                  <el-tag :type="scope.row.statusName === '启用' ? 'success' : 'danger'">
+                    {{ scope.row.statusName }}
+                  </el-tag>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+      <!-- </div> -->
+      <template #footer>
+        <el-button @click="closeDialog">
+          取 消
+        </el-button>
+        <el-button type="primary" @click="saveDialog">
+          确 定
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss">
+@import "@/css/dialog.css";
+
+.chengyuan-dialog {
+  .el-table .cell {
+    white-space: nowrap;
+  }
+
+  .el-dialog__body {
+    display: flex;
+    overflow: auto;
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+.chengyuan-dialog {
+  width: 100%;
+
+  .left-container {
+    white-space: nowrap;
+    height: 100%;
+  }
+
+  .table-area {
+    flex: 1;
+    overflow: auto;
+
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
+    .pagination {
+      margin-top: 10px;
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/train/components/userListDialog.vue b/src/views/measure/train/components/userListDialog.vue
index a1d4bae..20488ca 100644
--- a/src/views/measure/train/components/userListDialog.vue
+++ b/src/views/measure/train/components/userListDialog.vue
@@ -21,18 +21,9 @@
 const total = ref<number>(0)
 const select = ref<number>(-1)
 const columns = ref([
-  {
-    text: '姓名',
-    value: 'name',
-  },
-  {
-    text: '单位名称',
-    value: 'company',
-  },
-  {
-    text: '技术职称',
-    value: 'remark',
-  },
+  { text: '姓名', value: 'name' },
+  { text: '单位名称', value: 'company' },
+  { text: '技术职称', value: 'remark' },
 ])
 const list = ref(props.list || [])
 // 搜索

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
new file mode 100644
index 0000000..d6827e4
--- /dev/null
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts" name="DistributeDialog">
+import processConfig from './processConfig.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { getTaskDetail } from '@/api/business/task'
+// 任务分发弹窗
+
+// 自定义方法：close关闭弹窗
+const emit = defineEmits(['close'])
+const dialogVisible = ref(false) // 弹窗显示
+const sampleId = ref('') // 样品id
+const orderId = ref('') // 委托单id
+
+// 委托书-证书类别列表
+const certificationTypes = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  getDictByCode('certificationType').then((response) => {
+    certificationTypes.value = response.data
+  })
+}
+
+getDict()
+// 样品详情
+const sampleDetail = ref({
+  sampleName: '压力表',
+  mesureContent: '压力、ip68',
+  certifications: ['1', '2'],
+  remark: '这是备注',
+  measureProcessList: [],
+  measureSendBackList: [],
+})
+
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    sampleDetail.value.sampleName = res.data.sampleName
+    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.remark = res.data.remark
+    sampleDetail.value.certifications = res.data.certifications
+    sampleDetail.value.measureProcessList = res.data.measureProcessList
+    sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+  })
+}
+// 初始化弹窗
+const initDialog = (orderid: string, sampleid: string) => {
+  dialogVisible.value = true
+  sampleId.value = sampleid
+  orderId.value = orderid
+  getInfo()
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+  emit('close')
+}
+function cancel() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="任务分发" width="1000" @close="cancel">
+    <div class="simple-info">
+      <div class="simple-info-line">
+        <span class="label">样品名称:</span>
+        <el-input v-model="sampleDetail.sampleName" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">证书类别:</span>
+        <el-checkbox-group v-model="sampleDetail.certifications" disabled>
+          <el-checkbox v-for="item in certificationTypes" :key="item.value" :label="item.value">
+            {{ item.name }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="simple-info-line">
+        <span class="label">检定项目:</span>
+        <el-input v-model="sampleDetail.mesureContent" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">备注:</span>
+        <el-input v-model="sampleDetail.remark" disabled />
+      </div>
+    </div>
+    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+      批量添加
+    </el-button>
+    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <template #footer>
+      <el-button type="primary" @click="saveProcess">
+        确定
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//  样式
+.simple-info {
+  margin-top: -10px;
+  margin-bottom: 10px;
+
+  .simple-info-line {
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    .label {
+      width: 90px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/components/lab-interface.ts b/src/views/business/schedule/task/components/lab-interface.ts
index d6355c6..02b0d1d 100644
--- a/src/views/business/schedule/task/components/lab-interface.ts
+++ b/src/views/business/schedule/task/components/lab-interface.ts
@@ -6,7 +6,8 @@
   isLab: '1' // 是否是实验室
   director: string // 负责人
   meterMajor: string // 专业
-  measureItems: string// 检测能力
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
 }
 
 // 部门返回值对象类型
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 4ccab04..1efb8a9 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -1,11 +1,18 @@
 <script setup lang="ts" name="ProcessConfig">
 import { ref } from 'vue'
 import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
 import ProcessNode from './processNode.vue'
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/task'
 const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
   // 是否为详情展示页面
   detail: {
     type: Boolean,
@@ -21,81 +28,35 @@
     type: String,
     required: true,
   },
+  list: {
+    type: Array,
+    default: () => [],
+  },
 })
 const emits = defineEmits(['saveOver'])
 // 默认流程节点
-const defaultProcess = {
-  id: '', // 检测节点id
-  executiveItem: '', // 检测项目
-  executiveDept: '', // 检测部门
-  executiveDeptName: '', // 检测部门
-  executivePerson: '', // 检测人员
-  executivePersonName: '', // 检测人员
-  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-  measureStateName: '', // 检测状态
-  currentCertifications: '', // 当前证书数
-  requireCertifications: '', // 应出具证书数
-  updateTime: '', // 更新时间
-  backPerson: '', // 退回人
-  backReason: '', // 退回原因
-  backTime: '', // 退回时间
-  distributePerson: '', // 分配人
-  distributeTime: '', // 分配时间
-  startTime: '', // 检测开始时间
-  overTime: '', // 检测结束时间
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
 }
 // 检定流程列表
-const processList = ref([
+const processList = ref<IScheduleSet[]>([
   { ...defaultProcess },
 ])
 
-// 获取当前样品检测流程，参数待定
-const fetchProcess = () => {
-  // TODO: 模拟数据
-  processList.value = [
-    {
-      id: '1', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423635973935106', // 检测部门
-      executiveDeptName: '力学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '张三', // 检测人员
-      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待检测', // 检测状态
-      currentCertifications: '0', // 当前证书数
-      requireCertifications: '2', // 应出具证书数
-      updateTime: '2023-02-01 09:00:05', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-    {
-      id: '2', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423577505337346', // 检测部门
-      executiveDeptName: '热学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待分配', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-  ]
-}
-fetchProcess()
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+})
 
 // 点击添加流程
 const processAdd = () => {
@@ -121,25 +82,17 @@
 // 批量添加实验室
 const batchChooseOver = (labs: ILabList[]) => {
   for (const item of labs) {
-    const processTemp = {
-      id: '',
-      executiveItem: '', // 检测项目
-      executiveDept: item.deptId, // 检测部门
-      executiveDeptName: item.organizeName, // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
     }
     processList.value.push(processTemp)
   }
@@ -147,9 +100,24 @@
 
 // 保存流程
 const saveProcess = () => {
-  // TODO: 保存流程
-  console.log(processList.value)
-  emits('saveOver')
+  const form = {
+    measureProcessList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  console.log(form)
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
 }
 // 删除流程
 const deleteProcess = (index: number) => {
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index 6cbdf10..31dfae4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -12,24 +12,16 @@
     type: Object,
     default: () => {
       return {
-        id: '', // 检测节点id
-        executiveItem: '', // 检测项目
-        executiveDept: '', // 检测部门
-        executiveDeptName: '', // 检测部门
-        executivePerson: '', // 检测人员
-        executivePersonName: '', // 检测人员
-        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-        measureStateName: '', // 检测状态
-        currentCertifications: '', // 当前证书数
-        requireCertifications: '', // 应出具证书数
-        updateTime: '', // 更新时间
-        backPerson: '', // 退回人
-        backReason: '', // 退回原因
-        backTime: '', // 退回时间
-        distributePerson: '', // 分配人
-        distributeTime: '', // 分配时间
-        startTime: '', // 检测开始时间
-        overTime: '', // 检测结束时间
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
       }
     },
   },
@@ -56,22 +48,23 @@
 })
 // 检定环节可编辑-只有待分发状态可编辑
 const deptEdit = computed(() => {
-  return processNodeData.value.measureState == '0'
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 检定人可编辑-待分配状态可编辑
 const personEdit = computed(() => {
-  const editStates = ['0', '1']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 证书可编辑-待分发、待分配、待检测状态可编辑
 const certificationEdit = computed(() => {
-  const editStates = ['0', '1', '2']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 节点可移动
 const canMove = computed(() => {
-  const editStates = ['0']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 
 // 选择实验室
@@ -82,8 +75,8 @@
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
   console.log(lab)
-  processNodeData.value.executiveDept = lab.deptId
-  processNodeData.value.executiveDeptName = lab.organizeName
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
 }
 
 // 选择人员
@@ -93,8 +86,8 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
-  processNodeData.value.executivePerson = person.id
-  processNodeData.value.executivePersonName = person.name
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
 }
 
@@ -122,7 +115,7 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit">
           <template v-if="deptEdit" #append>
             <el-button :icon="Aim" size="small" link @click="clickChoose" />
           </template>
@@ -130,7 +123,7 @@
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit">
           <template v-if="personEdit" #append>
             <el-button :icon="Aim" size="small" link @click="choosePerson" />
           </template>
@@ -140,7 +133,7 @@
         <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
       <div class="line">
-        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
       </div>
       <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
@@ -149,7 +142,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 1d02839..493fbba 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,5 +1,3 @@
-import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
-
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -8,12 +6,29 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
   offset: number
 }
 
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
 // 任务列表-返回值
 export interface ITaskList {
   orderId: string // 委托书编号
@@ -25,41 +40,127 @@
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  isUrgent: string // 是否加急
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
   requireOverTime: string // 应检完时间
-  sampleAttr: string // 样品属性
-  sampleAttrName: string // 样品属性
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
   currentMeasureState: string // 当前检定环节
   currentMeasureStateName: string // 当前检定环节
-  currentCertifications: number // 已出具证书总数
+  alreadyCertifications: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
-  distributeStateName: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
 }
 
-// 检测流程节点
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+}
+
+// 全部检测流程节点
 export interface ISchedule {
-  executivePerson: string // 执行人
-  executivePersonName: string // 执行人名称
-  executiveDept: string // 执行部门
-  executiveDeptName: string // 执行部门名称
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
   executiveItem: string // 检定项目
-  currentCertifications?: number // 已出具证书总数
+  alreadyCertifications?: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  measureState: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
   updateTime: string // 流程更新时间
-  backTime: string // 退回时间
-  backReason: string // 退回原因
-  backPerson: string // 退回人
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
   distributePerson: string // 分配人
   distributeTime: string // 分配时间
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
 
 // 样品检测信息
-export interface ISampleMeasure extends ISampleEdit {
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
   orderId: string // 委托单id
+  orderCode: string // 委托单编号
   certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
 }
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 465b2e7..547ee3e 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,28 +1,27 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
-import type { ISampleMeasure } from './task-interface'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
 import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getTaskDetail } from '@/api/business/task'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // 样品详情id
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -39,32 +38,49 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleMeasure> = ref({
-  id: '',
-  orderId: '', // 委托单id
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
   postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
   manufacturer: '', // 生产厂家
   manufacturerCountry: '', // 厂家国别
   manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
   remark: '', // 备注
   minioFileName: '', // 说明书
   labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-  certifications: '',
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
 })
 const ruleFormRef = ref<FormInstance>()
 
@@ -143,14 +159,6 @@
   return menu.find(item => item.name === currentMenu.value)
 })
 
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
 const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
@@ -181,11 +189,9 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(dataForm.value).then((res) => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -195,42 +201,23 @@
     }
   })
 }
-
-// 获取样品详情
+//
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
 const getInfo = () => {
-  // getSapmleDetail({ id: infoId.value }).then((res) => {
-  dataForm.value = {
-    orderId: '123',
-    ABC: 'A',
-    companyAddress: '北京/北京市',
-    customerName: '京东集团',
-    customerNo: 'sygf202211290001',
-    id: '111111',
-    labelBind: '11222',
-    manufacturer: '北京某厂家',
-    manufacturerCountry: 'CN',
-    manufacturingDate: '2023-03',
-    manufacturingNo: '123121',
-    mesureCategory: '',
-    mesureContent: '项目1',
-    mesurePeriod: '1',
-    mesureType: '',
-    minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-    phone: '950618',
-    postalCode: 'test',
-    remark: '无备注',
-    sampleModel: '型号1',
-    sampleName: '样品1',
-    sampleNo: '123456',
-    measureResultCode: 'bhg',
-    deliverer: '张三',
-    delivererTel: '156254577545',
-    certifications: '1',
-  }
-  // for (const item of menu) {
-  //   item.searchFunc()
-  // }
-  // })
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList
+    taskForm.value.measureSendBackList = res.data.measureSendBackList
+  })
 }
 
 // 点击标签绑定的扫描
@@ -260,7 +247,7 @@
     fd.append('multipartFile', event.target.files[0])
     // UploadFile(fd).then((res) => {
     //   if (res.code === 200) {
-    //     dataForm.value.minioFileName = res.data[0]
+    //     sampleForm.value.minioFileName = res.data[0]
     //     // 重置当前验证
     //     ElMessage.success('文件上传成功')
     //   }
@@ -273,18 +260,30 @@
 const upload = () => {
   fileRef.value.click()
 }
-// 获取样品详情
-getInfo()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.role) {
+  roleType.value = $route.params.role as string // 使用角色
+
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+    getSampleInfo()
+  }
+}
 </script>
 
 <template>
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -294,7 +293,7 @@
       <div id="form">
         <el-form
           ref="ruleFormRef"
-          :model="dataForm"
+          :model="sampleForm"
           :label-width="120"
           label-position="right"
           :rules="rules"
@@ -303,9 +302,9 @@
             <el-col :span="6">
               <el-form-item label="样品编号:" prop="sampleNo">
                 <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -313,9 +312,9 @@
             <el-col :span="6">
               <el-form-item label="样品名称:" prop="sampleName">
                 <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -323,9 +322,9 @@
             <el-col :span="6">
               <el-form-item label="样品型号:" prop="sampleModel">
                 <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -333,9 +332,9 @@
             <el-col :span="6">
               <el-form-item label="出厂编号:" prop="manufacturingNo">
                 <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -343,9 +342,9 @@
             <el-col :span="6">
               <el-form-item label="委托方代码" prop="customerNo">
                 <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -353,9 +352,9 @@
             <el-col :span="6">
               <el-form-item label="委托方名称" prop="customerName">
                 <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -363,9 +362,9 @@
             <el-col :span="6">
               <el-form-item label="委托方电话" prop="phone">
                 <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -373,9 +372,9 @@
             <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -383,11 +382,11 @@
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
-                  v-model="dataForm.companyAddress"
+                  v-model="sampleForm.customerAddress"
                   type="textarea"
                   autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -395,9 +394,9 @@
             <el-col :span="6">
               <el-form-item label="校检类别:">
                 <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
@@ -407,19 +406,19 @@
             <el-col :span="6">
               <el-form-item label="生产厂家:">
                 <el-input
-                  v-model="dataForm.manufacturer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="厂家国别:">
                 <el-select
-                  v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
@@ -429,23 +428,23 @@
             <el-col :span="6">
               <el-form-item label="出厂年月:">
                 <el-date-picker
-                  v-model="dataForm.manufacturingDate"
+                  v-model="sampleForm.manufacturingDate"
                   type="month"
                   format="YYYY-MM"
                   value-format="YYYY-MM"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="ABC:">
                 <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
@@ -455,9 +454,9 @@
             <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -465,9 +464,9 @@
             <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
-                  v-model="dataForm.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -475,49 +474,20 @@
             <el-col :span="24">
               <el-form-item label="检定项目:" prop="mesureContent">
                 <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定周期（月）:">
                 <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="上次检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  disabled
-                  class="full-width-input"
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
@@ -526,21 +496,21 @@
             <el-col :span="24">
               <el-form-item label="备注:">
                 <el-input
-                  v-model="dataForm.remark"
+                  v-model="sampleForm.remark"
                   type="textarea"
                   :rows="2"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
-                  v-model="dataForm.mesureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
@@ -550,10 +520,10 @@
             <el-col :span="6">
               <el-form-item label="标签绑定:">
                 <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 >
                   <template #append>
                     <el-button>扫描</el-button>
@@ -565,11 +535,11 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="14">
               <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
             </el-col>
@@ -586,7 +556,7 @@
           保存
         </el-button>
       </template>
-      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
@@ -604,11 +574,11 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="dataForm.id!" :order-id="dataForm.orderId" />
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
       <!-- 检定记录 -->
-      <measure-records v-if="currentMenu === '检定记录'" :sample-id="dataForm.id!" />
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
-      <certification-records v-if="currentMenu === '检定证书'" :sample-id="dataForm.id!" />
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index f784804..461c518 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -31,7 +31,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
@@ -39,30 +39,30 @@
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
-  { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center' },
-  { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
-  { text: '分发性质', value: 'distributeState', align: 'center', width: '90px' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return row.alreadyCertifications ? `${row.alreadyCertifications}/${row.requireCertifications}` : '0/0' } },
+  { text: '分发性质', value: 'handOutProperty', align: 'center', width: '90px' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -80,15 +80,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // // 模拟数据
-  // list.value = [
-  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  // ]
-  // loadingTable.value = false
-  // console.log(listQuery.value)
   getTaskList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -111,15 +107,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
+    sampleBelong: '', // 样品属性
     sampleStatus: '2', // 分发状态
+    startTime: '', //	应检定开始时间
+    endTime: '', //	应检定结束时间
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -271,8 +269,8 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue
index 629b33c..2300f4c 100644
--- a/src/views/customer/advice/adviceEdit.vue
+++ b/src/views/customer/advice/adviceEdit.vue
@@ -51,7 +51,7 @@
 const companyInfo: SimpleCompany = reactive({
   customerName: '', // 公司名称
   customerNo: '', //	客户编号
-  customerId: '', // 客户id
+  id: '', // 客户id
   grade: '', // 履约评级
   gradeName: '', // 履约评级
   companySize: '', // 公司规模
@@ -121,12 +121,13 @@
   const item = select as SimpleCompany
   companyInfo.customerName = item.customerName
   companyInfo.customerNo = item.customerNo
-  companyInfo.customerId = item.customerId
+  companyInfo.id = item.id
   companyInfo.gradeName = item.gradeName
   companyInfo.companySizeName = item.companySizeName
   companyInfo.businessSizeName = item.businessSizeName
   companyInfo.evaluationName = item.evaluationName
   dataForm.value.customerNo = item.customerNo
+  dataForm.value.customerId = item.id
 }
 // 打印表单
 const printObj = ref({
@@ -154,8 +155,6 @@
         if (dataForm.value.id) {
           updateAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -164,8 +163,6 @@
         else {
           addAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
diff --git a/src/views/customer/advice/advice_interface.ts b/src/views/customer/advice/advice_interface.ts
index b08f85b..a8bf311 100644
--- a/src/views/customer/advice/advice_interface.ts
+++ b/src/views/customer/advice/advice_interface.ts
@@ -40,9 +40,10 @@
 
 // 公司简易
 export interface SimpleCompany {
+  id: string // 客户id
   customerName: string // 公司名称
   customerNo: string //	客户编号
-  customerId: string // 客户id
+  grade: string // 履约评级
   gradeName: string // 履约评级
   companySizeName: string // 公司规模
   businessSizeName: string // 业务规模
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index f9ee314..4893c4f 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -26,6 +26,7 @@
 const visible = ref(false) // 控制对话框显隐
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -54,17 +55,7 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
-})
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
+})// 表单
 const ruleFormRef = ref<FormInstance>()
 
 // 自定义校验规则--检定周期为正整数
@@ -111,6 +102,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -479,7 +474,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index aceea6a..abcada5 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -36,7 +36,14 @@
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
-  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: ISampleList) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ISampleList[]>([])
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index aafed2a..256ed9f 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -24,6 +24,7 @@
   measurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
   remark: string // 备注
+  validDeadline?: string // 证书过期时间
 }
 
 export interface ISampleEdit {
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 3b03275..d04456b 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -163,7 +163,7 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
+          <el-select v-model="listQuery.businessSize" placeholder="业务规模">
             <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
@@ -183,7 +183,16 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirm">
           确定
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 59f2feb..4deeed8 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -20,18 +20,9 @@
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 
 const dataForm: Ref<ISampleDetail> = ref({
   id: '',
@@ -74,6 +65,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -358,7 +353,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 05fe276..7251eda 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -4,12 +4,16 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOvertimeList, IOvertimeListQuery } from './overtime_list_interface'
+import { ITEM_RENDER_EVT } from 'element-plus/es/components/virtual-list/src/defaults'
+import type { IOvertimeList, IOvertimeListQuery, dictType } from './overtime_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportSapmleList, getSampleList } from '@/api/customer/sampleList'
+import { getDictByCode } from '@/api/system/dict'
+
 const { proxy } = getCurrentInstance() as any
+const certificationStatusMap = ref<dictType[]>([]) as any // 证书状况
 const $router = useRouter()
 
 // 查询条件
@@ -25,12 +29,7 @@
   offset: 1,
   limit: 20,
 })
-// 证书状况字典
-const certificationStatusMap = {
-  0: '未超期',
-  1: '即将超期',
-  2: '已超期',
-}
+
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
@@ -42,7 +41,13 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
-  { text: '证书状况', value: 'certificationStatus', align: 'center' },
+  {
+    text: '证书状况',
+    value: 'certificationStatus',
+    align: 'center',
+    width: '90px',
+    styleFilter: (row: IOvertimeList) => { return row.certificationStatus === '即将超期' ? 'color: red' : '' },
+  },
 ])
 // 表格数据
 const list = ref<IOvertimeList[]>([])
@@ -53,6 +58,16 @@
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
+// 获取字典值
+async function getDict() {
+  // 证书状况
+  const res = await getDictByCode('certificationStatus')
+  // 证书状况字典 {1：即将过期}
+  res.data.forEach((item: any) => {
+    certificationStatusMap.value[`${item.value}`] = item.name
+  })
+}
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -63,7 +78,12 @@
   listQuery.value.startTime = timeRange.value[0] as string || ''
   listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: IOvertimeList) => {
+      return {
+        ...item,
+        certificationStatus: certificationStatusMap.value[item.certificationStatus],
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -161,7 +181,10 @@
   }
 }
 
-fetchData(true)
+onMounted(async () => {
+  await getDict()
+  fetchData(true)
+})
 </script>
 
 <template>
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 519f0af..cceb09b 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -135,7 +135,7 @@
         @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 4eb62ec..9d75cff 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -8,6 +8,7 @@
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { getpDeptApi, listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -19,9 +20,12 @@
   director: '', // 负责人
   administrationJob: '', // 行政职务
   technologyJob: '', // 技术职务
+  meterMajor: '', // 计量专业
   remark: '', // 备注
-  pDeptId: '',
-  pDeptName: '',
+  pDeptId: '', // 父级
+  pDeptName: '', // 父级
+  isLab: '1', // 是否为实验室
+  labCapacity: [], // 实验室能力
 }) // 表单
 // 展示父级组织
 const pDept = ref({
@@ -33,10 +37,11 @@
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
-  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+  organizeName: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
+  director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: ['blur', 'change'] }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: ['blur', 'change'] }],
+  isLab: [{ required: true, message: '是否为实验室不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 // 获取计量人员列表
@@ -53,13 +58,26 @@
     }
   })
 }
-const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
-// 获取技术职务列表
-const getTechnologyJobList = () => {
+const measureTypeList = ref<dictType[]>([]) // 实验室能力
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+const technologyJobList = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  // 获取技术职务列表
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
+  // 获取检校类型
+  getDictByCode('checkType').then((response) => {
+    measureTypeList.value = response.data
+  })
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
 }
+getDict()
+
 const administrationJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
@@ -91,7 +109,8 @@
           type: 'warning',
         },
       ).then((res) => {
-        updateApi({ ...ruleForm.value, title: undefined }).then((res) => {
+        const form = { ...ruleForm.value, labCapacity: ruleForm.value.labCapacity.join(',') }
+        updateApi(form).then((res) => {
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('提交成功')
@@ -117,6 +136,8 @@
   ruleForm.value.administrationJob = '' // 行政职务
   ruleForm.value.technologyJob = '' // 技术职务
   ruleForm.value.remark = '' // 备注
+  ruleForm.value.isLab = ''
+  ruleForm.value.labCapacity = []
 }
 const multipleTableRef = ref()
 const current = ref('')
@@ -141,7 +162,7 @@
       },
       {
         label: '计量专业',
-        data: 'meterMajor',
+        data: 'meterMajorName',
       },
       {
         label: '创建时间',
@@ -196,7 +217,7 @@
       },
       {
         label: '计量专业',
-        data: 'meterMajor',
+        data: 'meterMajorName',
       },
       {
         label: '创建时间',
@@ -434,10 +455,12 @@
   reset()
   title.value = row.title
   path.value = row.path
+  ruleForm.value = row
   ruleForm.value.organizeType = row.organizeType
   ruleForm.value.deptId = row.deptId
+  ruleForm.value.labCapacity = row.labCapacity ? row.labCapacity.split(',') : []
+  ruleForm.value.meterMajor = row.meterMajor
   getuser()
-  getTechnologyJobList()
   getAdministrationJob()
   getDepartmentList()
   getuserInfoList()
@@ -445,7 +468,6 @@
     getInstrumentInfo()
     getDeviceInfo()
   }
-  ruleForm.value = row
   console.log(row, 'row')
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
@@ -538,6 +560,53 @@
           </el-col>
         </el-row>
         <el-row :gutter="24">
+          <el-col v-if="title.split('-')[1] === '科室'" :span="6">
+            <el-form-item label="是否为实验室" prop="isLab">
+              <el-select v-model="ruleForm.isLab" :placeholder="title.split('-')[2] === '详情' ? '' : ''" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
+                <el-option label="是" value="1" />
+                <el-option label="否" value="0" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="title.split('-')[1] !== '部门'" :span="6">
+            <el-form-item label="计量专业" prop="meterMajor">
+              <el-select
+                v-model.trim="ruleForm.meterMajor"
+                clearable
+                :placeholder="title.split('-')[2] === '详情' ? '' : '请选择'"
+                :disabled="ruleForm.isLab === '0' || title.split('-')[2] === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="title.split('-')[1] === '科室'" :span="12">
+            <el-form-item label="实验室能力" prop="labCapacity">
+              <el-select
+                v-model.trim="ruleForm.labCapacity"
+                clearable
+                multiple
+                :placeholder="title.split('-')[2] === '详情' ? '' : '请选择'"
+                :disabled="ruleForm.isLab === '0' || title.split('-')[2] === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureTypeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
@@ -586,13 +655,5 @@
 </template>
 
 <style lang="scss" scoped>
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      content: "";
-      display: none;
-    }
-  }
-}
+// 样式代码
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index f7fd689..33e63c8 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -66,7 +66,7 @@
     columns: [
       { text: '科室编号', value: 'organizeNo', align: 'center' },
       { text: '科室名称', value: 'organizeName', align: 'center' },
-      { text: '专业', value: 'meterMajor', align: 'center' },
+      { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '技术职务', value: 'technologyJobName', align: 'center' },
       { text: '行政职务', value: 'administrationJobName', align: 'center' },
@@ -79,7 +79,7 @@
     columns: [
       { text: '工程组编号', value: 'organizeNo', align: 'center' },
       { text: '工程组名', value: 'organizeName', align: 'center' },
-      { text: '计量专业', value: 'meterMajor', align: 'center' },
+      { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
       { text: '所属科室', value: 'pDeptName', align: 'center' },
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index f7911fa..0528cc7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -7,7 +7,7 @@
   organizeType?: string // 类型
   createTime?: string // 创建时间
   director?: string // 负责人
-  meterMajor?: string // 专业
+  meterMajor: string // 专业
   pDeptId?: string // 所属科室
   createEndTime?: string
   createStartTime?: string
@@ -45,4 +45,6 @@
   technologyJobName: string
   updateTime: string
   title?: string
+  isLab: string // 是否为实验室
+  labCapacity: string | string[]
 }
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 4941fbb..90c6daf 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -21,25 +21,25 @@
 const total = ref<number>(0)
 const select = ref()
 const columns = ref([
-  {
-    text: '人员编号',
-    value: 'staffNo',
-  },
-  {
-    text: '姓名',
-    value: 'name',
-  },
-  {
-    text: '所在部门',
-    value: 'deptId',
-  },
+  { text: '人员编号', value: 'staffNo', width: '160', fixed: true },
+  { text: '姓名', value: 'name', fixed: true },
+  { text: '所在部门', value: 'deptId' },
+  { text: '学历', value: 'education', align: 'center' },
+  { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  { text: '计量专业', value: 'major', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '技术考核', value: 'technologyExam', align: 'center' },
 ])
 // 获取部门
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
 const deptIdList = ref([])
-const getDeptList = () => {
+const getDeptList = () => { // 获取部门
   getDeptTreeList().then((res) => {
     deptIdList.value = toTreeList(res.data, '0', true)
   })
@@ -50,7 +50,7 @@
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records
-      total.value = Number(res.data.total)
+      total.value = parseInt(res.data.total)
     }
   })
 }
@@ -81,8 +81,8 @@
   }
   search()
 }
-// 点击保存
-const submitForm = () => {
+// 点击确定
+const confirmSelect = () => {
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     getStaffDetail(person).then((res) => {
@@ -143,17 +143,17 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <el-table-column label="#" width="55" align="center">
-          <template #default="scope">
-            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column> -->
+          <!-- <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column> -->
         </template>
       </normal-table>
     </div>
     <template #footer>
       <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
         <el-button @click="resetForm">
           取消
         </el-button>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index d0d3ba2..84dd465 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -6,6 +6,8 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -17,22 +19,15 @@
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref([
-  {
-    text: '姓名',
-    value: 'name',
-  },
-  {
-    text: '账户',
-    value: 'account',
-  },
-  {
-    text: '所在部门',
-    value: 'deptName',
-  },
+const total = ref(0)
+const select = ref(-1)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '姓名', value: 'name' },
+  { text: '账户', value: 'account' },
+  { text: '所在部门', value: 'deptName' },
 ])
+// 所在部门
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
@@ -43,7 +38,7 @@
     deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
-// 获取数据列表
+// 获取人员数据列表
 const fetchData = () => {
   select.value = -1
   getUserList(listQuery.value).then((res) => {
@@ -100,8 +95,8 @@
 const initDialog = () => {
   // reset()
   dialogFormVisible.value = true
-  getDeptList()
-  fetchData()
+  getDeptList() // 获取部门信息
+  fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
 </script>
@@ -135,11 +130,11 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <el-table-column label="#" width="55" align="center">
-          <template #default="scope">
-            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column> -->
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
         </template>
       </normal-table>
     </div>
diff --git a/src/views/measure/train/components/selectMeasurePersonDialog.vue b/src/views/measure/train/components/selectMeasurePersonDialog.vue
new file mode 100644
index 0000000..251b1e5
--- /dev/null
+++ b/src/views/measure/train/components/selectMeasurePersonDialog.vue
@@ -0,0 +1,176 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectMeasurePersonDialog">
+import { ElMessage } from 'element-plus'
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 10,
+  offset: 1,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const singleChecked = ref('') // 单选选中id
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref<TableColumn[]>([
+  { text: '人员编号', value: 'staffNo', width: '160', align: 'center', fixed: true },
+  { text: '姓名', value: 'name', align: 'center', fixed: true },
+  { text: '学历', value: 'education', align: 'center' },
+  { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  { text: '计量专业', value: 'major', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '技术考核', value: 'technologyExam', align: 'center' },
+])
+// 获取部门
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
+const getDeptList = () => { // 获取部门
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records.map((item: any) => {
+        return {
+          ...item,
+          sex: item.sex === '1' ? '男' : '女',
+        }
+      })
+      total.value = parseInt(res.data.total)
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请先选择计量人员')
+  }
+  else {
+    emits('add', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
+      </search-item>
+      <search-item>
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/train/components/selectUser.vue b/src/views/measure/train/components/selectUser.vue
new file mode 100644
index 0000000..67eebdb
--- /dev/null
+++ b/src/views/measure/train/components/selectUser.vue
@@ -0,0 +1,237 @@
+<!-- 选择用户 -->
+<!-- 选择成员 -->
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
+import { getUserList } from '@/api/system/user'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
+})
+const emits = defineEmits(['update:visible', 'change'])
+const table = ref() // 表格ref
+
+// 表格表头
+const columns = ref<TableColumn[]>([
+  { text: '真实姓名', value: 'name', align: 'center' },
+  { text: '所在组织机构', value: 'deptName', align: 'center' },
+])
+
+// 表格数据
+const list = ref<IEmployees[]>([])
+
+const loading = ref(false)
+const total = ref(0)
+// 查询参数
+const listQuery = reactive({
+  keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
+  offset: 1,
+  limit: 10,
+  sort: 'id',
+  deptType: '',
+})
+const checkedList = ref([])
+// 多选的数据
+const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
+const closeDialog = () => {
+  emits('update:visible', false)
+}
+const visibleDialog = computed({
+  get() {
+    return props.visible
+  },
+  set() {
+    closeDialog()
+  },
+})
+
+watch(() => props.visible, (val) => {
+  // 清除上次选中
+  if (!val) {
+    table.value.clearMulti()
+  }
+})
+
+// 点击确定，保存选择的成员配置
+const saveDialog = () => {
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
+}
+
+const select = ref('')
+// 获取列表数据
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
+  getUserList(listQuery).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    loading.value = false
+  })
+}
+
+// 多选
+const multiSelect = (val: any) => {
+  multipleTable.value = val
+}
+
+// 查询数据
+const search = () => {
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
+
+onMounted(() => {
+  // 获取列表数据
+  fetchData(true)
+})
+</script>
+
+<template>
+  <div class="select-emplotees-dialog">
+    <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table-area">
+        <!-- 筛选条件 -->
+        <search-area @search="search">
+          <search-item>
+            <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
+          </search-item>
+        </search-area>
+        <!-- 表头标题 -->
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
+          <!-- 查询结果Table显示 -->
+          <normal-table
+            ref="table"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
+          >
+            <!-- 序号 -->
+            <template #preColumns>
+              <el-table-column label="#" width="55" align="center">
+                <template #default="scope">
+                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
+            </template>
+            <!-- 状态 -->
+            <template #columns>
+              <el-table-column label="状态" align="center" width="80">
+                <template #default="scope">
+                  <el-tag :type="scope.row.statusName === '启用' ? 'success' : 'danger'">
+                    {{ scope.row.statusName }}
+                  </el-tag>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+      <!-- </div> -->
+      <template #footer>
+        <el-button @click="closeDialog">
+          取 消
+        </el-button>
+        <el-button type="primary" @click="saveDialog">
+          确 定
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss">
+@import "@/css/dialog.css";
+
+.chengyuan-dialog {
+  .el-table .cell {
+    white-space: nowrap;
+  }
+
+  .el-dialog__body {
+    display: flex;
+    overflow: auto;
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+.chengyuan-dialog {
+  width: 100%;
+
+  .left-container {
+    white-space: nowrap;
+    height: 100%;
+  }
+
+  .table-area {
+    flex: 1;
+    overflow: auto;
+
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
+    .pagination {
+      margin-top: 10px;
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/train/components/userListDialog.vue b/src/views/measure/train/components/userListDialog.vue
index a1d4bae..20488ca 100644
--- a/src/views/measure/train/components/userListDialog.vue
+++ b/src/views/measure/train/components/userListDialog.vue
@@ -21,18 +21,9 @@
 const total = ref<number>(0)
 const select = ref<number>(-1)
 const columns = ref([
-  {
-    text: '姓名',
-    value: 'name',
-  },
-  {
-    text: '单位名称',
-    value: 'company',
-  },
-  {
-    text: '技术职称',
-    value: 'remark',
-  },
+  { text: '姓名', value: 'name' },
+  { text: '单位名称', value: 'company' },
+  { text: '技术职称', value: 'remark' },
 ])
 const list = ref(props.list || [])
 // 搜索
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index bbac2f4..fad7684 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -55,63 +55,18 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '计划编号',
-    value: 'planNo',
-    align: 'center',
-  },
-  {
-    text: '培训名称',
-    value: 'planName',
-    align: 'center',
-  },
-  {
-    text: '培训对象',
-    value: 'trainPerson',
-    align: 'center',
-  },
-  {
-    text: '培训人数',
-    value: 'trainNumber',
-    align: 'center',
-  },
-  {
-    text: '培训学时',
-    value: 'trainHour',
-    align: 'center',
-  },
-  {
-    text: '培训时间',
-    value: 'trainTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '主管部门',
-    value: 'deptName',
-    align: 'center',
-  },
-  {
-    text: '实施单位',
-    value: 'effectiveCompany',
-    align: 'center',
-  },
-  {
-    text: '培训内容',
-    value: 'trainContent',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'remark',
-    align: 'center',
-  },
+  { text: '计划编号', value: 'planNo', width: '160', align: 'center' },
+  { text: '培训名称', value: 'planName', align: 'center' },
+  { text: '培训对象', value: 'trainPerson', align: 'center' },
+  { text: '培训人数', value: 'trainNumber', align: 'center' },
+  { text: '培训学时', value: 'trainHour', align: 'center' },
+  { text: '培训时间', value: 'trainTime', width: '180', align: 'center' },
+  { text: '主管部门', value: 'deptName', align: 'center' },
+  { text: '实施单位', value: 'effectiveCompany', align: 'center' },
+  { text: '负责人', value: 'director', align: 'center' },
+  { text: '培训内容', value: 'trainContent', align: 'center' },
+  { text: '创建时间', value: 'createTime', width: '180', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -331,8 +286,15 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="190">
+          <el-table-column label="操作" align="center" width="170" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/train/plan/edit')"

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
new file mode 100644
index 0000000..d6827e4
--- /dev/null
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts" name="DistributeDialog">
+import processConfig from './processConfig.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { getTaskDetail } from '@/api/business/task'
+// 任务分发弹窗
+
+// 自定义方法：close关闭弹窗
+const emit = defineEmits(['close'])
+const dialogVisible = ref(false) // 弹窗显示
+const sampleId = ref('') // 样品id
+const orderId = ref('') // 委托单id
+
+// 委托书-证书类别列表
+const certificationTypes = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  getDictByCode('certificationType').then((response) => {
+    certificationTypes.value = response.data
+  })
+}
+
+getDict()
+// 样品详情
+const sampleDetail = ref({
+  sampleName: '压力表',
+  mesureContent: '压力、ip68',
+  certifications: ['1', '2'],
+  remark: '这是备注',
+  measureProcessList: [],
+  measureSendBackList: [],
+})
+
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    sampleDetail.value.sampleName = res.data.sampleName
+    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.remark = res.data.remark
+    sampleDetail.value.certifications = res.data.certifications
+    sampleDetail.value.measureProcessList = res.data.measureProcessList
+    sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+  })
+}
+// 初始化弹窗
+const initDialog = (orderid: string, sampleid: string) => {
+  dialogVisible.value = true
+  sampleId.value = sampleid
+  orderId.value = orderid
+  getInfo()
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+  emit('close')
+}
+function cancel() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="任务分发" width="1000" @close="cancel">
+    <div class="simple-info">
+      <div class="simple-info-line">
+        <span class="label">样品名称:</span>
+        <el-input v-model="sampleDetail.sampleName" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">证书类别:</span>
+        <el-checkbox-group v-model="sampleDetail.certifications" disabled>
+          <el-checkbox v-for="item in certificationTypes" :key="item.value" :label="item.value">
+            {{ item.name }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="simple-info-line">
+        <span class="label">检定项目:</span>
+        <el-input v-model="sampleDetail.mesureContent" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">备注:</span>
+        <el-input v-model="sampleDetail.remark" disabled />
+      </div>
+    </div>
+    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+      批量添加
+    </el-button>
+    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <template #footer>
+      <el-button type="primary" @click="saveProcess">
+        确定
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//  样式
+.simple-info {
+  margin-top: -10px;
+  margin-bottom: 10px;
+
+  .simple-info-line {
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    .label {
+      width: 90px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/components/lab-interface.ts b/src/views/business/schedule/task/components/lab-interface.ts
index d6355c6..02b0d1d 100644
--- a/src/views/business/schedule/task/components/lab-interface.ts
+++ b/src/views/business/schedule/task/components/lab-interface.ts
@@ -6,7 +6,8 @@
   isLab: '1' // 是否是实验室
   director: string // 负责人
   meterMajor: string // 专业
-  measureItems: string// 检测能力
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
 }
 
 // 部门返回值对象类型
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 4ccab04..1efb8a9 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -1,11 +1,18 @@
 <script setup lang="ts" name="ProcessConfig">
 import { ref } from 'vue'
 import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
 import ProcessNode from './processNode.vue'
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/task'
 const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
   // 是否为详情展示页面
   detail: {
     type: Boolean,
@@ -21,81 +28,35 @@
     type: String,
     required: true,
   },
+  list: {
+    type: Array,
+    default: () => [],
+  },
 })
 const emits = defineEmits(['saveOver'])
 // 默认流程节点
-const defaultProcess = {
-  id: '', // 检测节点id
-  executiveItem: '', // 检测项目
-  executiveDept: '', // 检测部门
-  executiveDeptName: '', // 检测部门
-  executivePerson: '', // 检测人员
-  executivePersonName: '', // 检测人员
-  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-  measureStateName: '', // 检测状态
-  currentCertifications: '', // 当前证书数
-  requireCertifications: '', // 应出具证书数
-  updateTime: '', // 更新时间
-  backPerson: '', // 退回人
-  backReason: '', // 退回原因
-  backTime: '', // 退回时间
-  distributePerson: '', // 分配人
-  distributeTime: '', // 分配时间
-  startTime: '', // 检测开始时间
-  overTime: '', // 检测结束时间
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
 }
 // 检定流程列表
-const processList = ref([
+const processList = ref<IScheduleSet[]>([
   { ...defaultProcess },
 ])
 
-// 获取当前样品检测流程，参数待定
-const fetchProcess = () => {
-  // TODO: 模拟数据
-  processList.value = [
-    {
-      id: '1', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423635973935106', // 检测部门
-      executiveDeptName: '力学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '张三', // 检测人员
-      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待检测', // 检测状态
-      currentCertifications: '0', // 当前证书数
-      requireCertifications: '2', // 应出具证书数
-      updateTime: '2023-02-01 09:00:05', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-    {
-      id: '2', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423577505337346', // 检测部门
-      executiveDeptName: '热学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待分配', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-  ]
-}
-fetchProcess()
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+})
 
 // 点击添加流程
 const processAdd = () => {
@@ -121,25 +82,17 @@
 // 批量添加实验室
 const batchChooseOver = (labs: ILabList[]) => {
   for (const item of labs) {
-    const processTemp = {
-      id: '',
-      executiveItem: '', // 检测项目
-      executiveDept: item.deptId, // 检测部门
-      executiveDeptName: item.organizeName, // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
     }
     processList.value.push(processTemp)
   }
@@ -147,9 +100,24 @@
 
 // 保存流程
 const saveProcess = () => {
-  // TODO: 保存流程
-  console.log(processList.value)
-  emits('saveOver')
+  const form = {
+    measureProcessList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  console.log(form)
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
 }
 // 删除流程
 const deleteProcess = (index: number) => {
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index 6cbdf10..31dfae4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -12,24 +12,16 @@
     type: Object,
     default: () => {
       return {
-        id: '', // 检测节点id
-        executiveItem: '', // 检测项目
-        executiveDept: '', // 检测部门
-        executiveDeptName: '', // 检测部门
-        executivePerson: '', // 检测人员
-        executivePersonName: '', // 检测人员
-        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-        measureStateName: '', // 检测状态
-        currentCertifications: '', // 当前证书数
-        requireCertifications: '', // 应出具证书数
-        updateTime: '', // 更新时间
-        backPerson: '', // 退回人
-        backReason: '', // 退回原因
-        backTime: '', // 退回时间
-        distributePerson: '', // 分配人
-        distributeTime: '', // 分配时间
-        startTime: '', // 检测开始时间
-        overTime: '', // 检测结束时间
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
       }
     },
   },
@@ -56,22 +48,23 @@
 })
 // 检定环节可编辑-只有待分发状态可编辑
 const deptEdit = computed(() => {
-  return processNodeData.value.measureState == '0'
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 检定人可编辑-待分配状态可编辑
 const personEdit = computed(() => {
-  const editStates = ['0', '1']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 证书可编辑-待分发、待分配、待检测状态可编辑
 const certificationEdit = computed(() => {
-  const editStates = ['0', '1', '2']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 节点可移动
 const canMove = computed(() => {
-  const editStates = ['0']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 
 // 选择实验室
@@ -82,8 +75,8 @@
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
   console.log(lab)
-  processNodeData.value.executiveDept = lab.deptId
-  processNodeData.value.executiveDeptName = lab.organizeName
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
 }
 
 // 选择人员
@@ -93,8 +86,8 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
-  processNodeData.value.executivePerson = person.id
-  processNodeData.value.executivePersonName = person.name
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
 }
 
@@ -122,7 +115,7 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit">
           <template v-if="deptEdit" #append>
             <el-button :icon="Aim" size="small" link @click="clickChoose" />
           </template>
@@ -130,7 +123,7 @@
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit">
           <template v-if="personEdit" #append>
             <el-button :icon="Aim" size="small" link @click="choosePerson" />
           </template>
@@ -140,7 +133,7 @@
         <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
       <div class="line">
-        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
       </div>
       <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
@@ -149,7 +142,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 1d02839..493fbba 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,5 +1,3 @@
-import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
-
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -8,12 +6,29 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
   offset: number
 }
 
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
 // 任务列表-返回值
 export interface ITaskList {
   orderId: string // 委托书编号
@@ -25,41 +40,127 @@
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  isUrgent: string // 是否加急
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
   requireOverTime: string // 应检完时间
-  sampleAttr: string // 样品属性
-  sampleAttrName: string // 样品属性
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
   currentMeasureState: string // 当前检定环节
   currentMeasureStateName: string // 当前检定环节
-  currentCertifications: number // 已出具证书总数
+  alreadyCertifications: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
-  distributeStateName: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
 }
 
-// 检测流程节点
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+}
+
+// 全部检测流程节点
 export interface ISchedule {
-  executivePerson: string // 执行人
-  executivePersonName: string // 执行人名称
-  executiveDept: string // 执行部门
-  executiveDeptName: string // 执行部门名称
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
   executiveItem: string // 检定项目
-  currentCertifications?: number // 已出具证书总数
+  alreadyCertifications?: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  measureState: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
   updateTime: string // 流程更新时间
-  backTime: string // 退回时间
-  backReason: string // 退回原因
-  backPerson: string // 退回人
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
   distributePerson: string // 分配人
   distributeTime: string // 分配时间
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
 
 // 样品检测信息
-export interface ISampleMeasure extends ISampleEdit {
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
   orderId: string // 委托单id
+  orderCode: string // 委托单编号
   certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
 }
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 465b2e7..547ee3e 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,28 +1,27 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
-import type { ISampleMeasure } from './task-interface'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
 import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getTaskDetail } from '@/api/business/task'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // 样品详情id
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -39,32 +38,49 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleMeasure> = ref({
-  id: '',
-  orderId: '', // 委托单id
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
   postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
   manufacturer: '', // 生产厂家
   manufacturerCountry: '', // 厂家国别
   manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
   remark: '', // 备注
   minioFileName: '', // 说明书
   labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-  certifications: '',
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
 })
 const ruleFormRef = ref<FormInstance>()
 
@@ -143,14 +159,6 @@
   return menu.find(item => item.name === currentMenu.value)
 })
 
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
 const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
@@ -181,11 +189,9 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(dataForm.value).then((res) => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -195,42 +201,23 @@
     }
   })
 }
-
-// 获取样品详情
+//
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
 const getInfo = () => {
-  // getSapmleDetail({ id: infoId.value }).then((res) => {
-  dataForm.value = {
-    orderId: '123',
-    ABC: 'A',
-    companyAddress: '北京/北京市',
-    customerName: '京东集团',
-    customerNo: 'sygf202211290001',
-    id: '111111',
-    labelBind: '11222',
-    manufacturer: '北京某厂家',
-    manufacturerCountry: 'CN',
-    manufacturingDate: '2023-03',
-    manufacturingNo: '123121',
-    mesureCategory: '',
-    mesureContent: '项目1',
-    mesurePeriod: '1',
-    mesureType: '',
-    minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-    phone: '950618',
-    postalCode: 'test',
-    remark: '无备注',
-    sampleModel: '型号1',
-    sampleName: '样品1',
-    sampleNo: '123456',
-    measureResultCode: 'bhg',
-    deliverer: '张三',
-    delivererTel: '156254577545',
-    certifications: '1',
-  }
-  // for (const item of menu) {
-  //   item.searchFunc()
-  // }
-  // })
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList
+    taskForm.value.measureSendBackList = res.data.measureSendBackList
+  })
 }
 
 // 点击标签绑定的扫描
@@ -260,7 +247,7 @@
     fd.append('multipartFile', event.target.files[0])
     // UploadFile(fd).then((res) => {
     //   if (res.code === 200) {
-    //     dataForm.value.minioFileName = res.data[0]
+    //     sampleForm.value.minioFileName = res.data[0]
     //     // 重置当前验证
     //     ElMessage.success('文件上传成功')
     //   }
@@ -273,18 +260,30 @@
 const upload = () => {
   fileRef.value.click()
 }
-// 获取样品详情
-getInfo()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.role) {
+  roleType.value = $route.params.role as string // 使用角色
+
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+    getSampleInfo()
+  }
+}
 </script>
 
 <template>
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -294,7 +293,7 @@
       <div id="form">
         <el-form
           ref="ruleFormRef"
-          :model="dataForm"
+          :model="sampleForm"
           :label-width="120"
           label-position="right"
           :rules="rules"
@@ -303,9 +302,9 @@
             <el-col :span="6">
               <el-form-item label="样品编号:" prop="sampleNo">
                 <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -313,9 +312,9 @@
             <el-col :span="6">
               <el-form-item label="样品名称:" prop="sampleName">
                 <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -323,9 +322,9 @@
             <el-col :span="6">
               <el-form-item label="样品型号:" prop="sampleModel">
                 <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -333,9 +332,9 @@
             <el-col :span="6">
               <el-form-item label="出厂编号:" prop="manufacturingNo">
                 <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -343,9 +342,9 @@
             <el-col :span="6">
               <el-form-item label="委托方代码" prop="customerNo">
                 <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -353,9 +352,9 @@
             <el-col :span="6">
               <el-form-item label="委托方名称" prop="customerName">
                 <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -363,9 +362,9 @@
             <el-col :span="6">
               <el-form-item label="委托方电话" prop="phone">
                 <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -373,9 +372,9 @@
             <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -383,11 +382,11 @@
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
-                  v-model="dataForm.companyAddress"
+                  v-model="sampleForm.customerAddress"
                   type="textarea"
                   autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -395,9 +394,9 @@
             <el-col :span="6">
               <el-form-item label="校检类别:">
                 <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
@@ -407,19 +406,19 @@
             <el-col :span="6">
               <el-form-item label="生产厂家:">
                 <el-input
-                  v-model="dataForm.manufacturer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="厂家国别:">
                 <el-select
-                  v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
@@ -429,23 +428,23 @@
             <el-col :span="6">
               <el-form-item label="出厂年月:">
                 <el-date-picker
-                  v-model="dataForm.manufacturingDate"
+                  v-model="sampleForm.manufacturingDate"
                   type="month"
                   format="YYYY-MM"
                   value-format="YYYY-MM"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="ABC:">
                 <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
@@ -455,9 +454,9 @@
             <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -465,9 +464,9 @@
             <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
-                  v-model="dataForm.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -475,49 +474,20 @@
             <el-col :span="24">
               <el-form-item label="检定项目:" prop="mesureContent">
                 <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定周期（月）:">
                 <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="上次检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  disabled
-                  class="full-width-input"
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
@@ -526,21 +496,21 @@
             <el-col :span="24">
               <el-form-item label="备注:">
                 <el-input
-                  v-model="dataForm.remark"
+                  v-model="sampleForm.remark"
                   type="textarea"
                   :rows="2"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
-                  v-model="dataForm.mesureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
@@ -550,10 +520,10 @@
             <el-col :span="6">
               <el-form-item label="标签绑定:">
                 <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 >
                   <template #append>
                     <el-button>扫描</el-button>
@@ -565,11 +535,11 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="14">
               <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
             </el-col>
@@ -586,7 +556,7 @@
           保存
         </el-button>
       </template>
-      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
@@ -604,11 +574,11 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="dataForm.id!" :order-id="dataForm.orderId" />
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
       <!-- 检定记录 -->
-      <measure-records v-if="currentMenu === '检定记录'" :sample-id="dataForm.id!" />
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
-      <certification-records v-if="currentMenu === '检定证书'" :sample-id="dataForm.id!" />
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index f784804..461c518 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -31,7 +31,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
@@ -39,30 +39,30 @@
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
-  { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center' },
-  { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
-  { text: '分发性质', value: 'distributeState', align: 'center', width: '90px' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return row.alreadyCertifications ? `${row.alreadyCertifications}/${row.requireCertifications}` : '0/0' } },
+  { text: '分发性质', value: 'handOutProperty', align: 'center', width: '90px' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -80,15 +80,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // // 模拟数据
-  // list.value = [
-  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  // ]
-  // loadingTable.value = false
-  // console.log(listQuery.value)
   getTaskList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -111,15 +107,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
+    sampleBelong: '', // 样品属性
     sampleStatus: '2', // 分发状态
+    startTime: '', //	应检定开始时间
+    endTime: '', //	应检定结束时间
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -271,8 +269,8 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue
index 629b33c..2300f4c 100644
--- a/src/views/customer/advice/adviceEdit.vue
+++ b/src/views/customer/advice/adviceEdit.vue
@@ -51,7 +51,7 @@
 const companyInfo: SimpleCompany = reactive({
   customerName: '', // 公司名称
   customerNo: '', //	客户编号
-  customerId: '', // 客户id
+  id: '', // 客户id
   grade: '', // 履约评级
   gradeName: '', // 履约评级
   companySize: '', // 公司规模
@@ -121,12 +121,13 @@
   const item = select as SimpleCompany
   companyInfo.customerName = item.customerName
   companyInfo.customerNo = item.customerNo
-  companyInfo.customerId = item.customerId
+  companyInfo.id = item.id
   companyInfo.gradeName = item.gradeName
   companyInfo.companySizeName = item.companySizeName
   companyInfo.businessSizeName = item.businessSizeName
   companyInfo.evaluationName = item.evaluationName
   dataForm.value.customerNo = item.customerNo
+  dataForm.value.customerId = item.id
 }
 // 打印表单
 const printObj = ref({
@@ -154,8 +155,6 @@
         if (dataForm.value.id) {
           updateAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -164,8 +163,6 @@
         else {
           addAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
diff --git a/src/views/customer/advice/advice_interface.ts b/src/views/customer/advice/advice_interface.ts
index b08f85b..a8bf311 100644
--- a/src/views/customer/advice/advice_interface.ts
+++ b/src/views/customer/advice/advice_interface.ts
@@ -40,9 +40,10 @@
 
 // 公司简易
 export interface SimpleCompany {
+  id: string // 客户id
   customerName: string // 公司名称
   customerNo: string //	客户编号
-  customerId: string // 客户id
+  grade: string // 履约评级
   gradeName: string // 履约评级
   companySizeName: string // 公司规模
   businessSizeName: string // 业务规模
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index f9ee314..4893c4f 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -26,6 +26,7 @@
 const visible = ref(false) // 控制对话框显隐
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -54,17 +55,7 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
-})
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
+})// 表单
 const ruleFormRef = ref<FormInstance>()
 
 // 自定义校验规则--检定周期为正整数
@@ -111,6 +102,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -479,7 +474,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index aceea6a..abcada5 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -36,7 +36,14 @@
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
-  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: ISampleList) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ISampleList[]>([])
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index aafed2a..256ed9f 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -24,6 +24,7 @@
   measurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
   remark: string // 备注
+  validDeadline?: string // 证书过期时间
 }
 
 export interface ISampleEdit {
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 3b03275..d04456b 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -163,7 +163,7 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
+          <el-select v-model="listQuery.businessSize" placeholder="业务规模">
             <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
@@ -183,7 +183,16 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirm">
           确定
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 59f2feb..4deeed8 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -20,18 +20,9 @@
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 
 const dataForm: Ref<ISampleDetail> = ref({
   id: '',
@@ -74,6 +65,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -358,7 +353,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 05fe276..7251eda 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -4,12 +4,16 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOvertimeList, IOvertimeListQuery } from './overtime_list_interface'
+import { ITEM_RENDER_EVT } from 'element-plus/es/components/virtual-list/src/defaults'
+import type { IOvertimeList, IOvertimeListQuery, dictType } from './overtime_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportSapmleList, getSampleList } from '@/api/customer/sampleList'
+import { getDictByCode } from '@/api/system/dict'
+
 const { proxy } = getCurrentInstance() as any
+const certificationStatusMap = ref<dictType[]>([]) as any // 证书状况
 const $router = useRouter()
 
 // 查询条件
@@ -25,12 +29,7 @@
   offset: 1,
   limit: 20,
 })
-// 证书状况字典
-const certificationStatusMap = {
-  0: '未超期',
-  1: '即将超期',
-  2: '已超期',
-}
+
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
@@ -42,7 +41,13 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
-  { text: '证书状况', value: 'certificationStatus', align: 'center' },
+  {
+    text: '证书状况',
+    value: 'certificationStatus',
+    align: 'center',
+    width: '90px',
+    styleFilter: (row: IOvertimeList) => { return row.certificationStatus === '即将超期' ? 'color: red' : '' },
+  },
 ])
 // 表格数据
 const list = ref<IOvertimeList[]>([])
@@ -53,6 +58,16 @@
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
+// 获取字典值
+async function getDict() {
+  // 证书状况
+  const res = await getDictByCode('certificationStatus')
+  // 证书状况字典 {1：即将过期}
+  res.data.forEach((item: any) => {
+    certificationStatusMap.value[`${item.value}`] = item.name
+  })
+}
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -63,7 +78,12 @@
   listQuery.value.startTime = timeRange.value[0] as string || ''
   listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: IOvertimeList) => {
+      return {
+        ...item,
+        certificationStatus: certificationStatusMap.value[item.certificationStatus],
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -161,7 +181,10 @@
   }
 }
 
-fetchData(true)
+onMounted(async () => {
+  await getDict()
+  fetchData(true)
+})
 </script>
 
 <template>
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 519f0af..cceb09b 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -135,7 +135,7 @@
         @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 4eb62ec..9d75cff 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -8,6 +8,7 @@
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { getpDeptApi, listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -19,9 +20,12 @@
   director: '', // 负责人
   administrationJob: '', // 行政职务
   technologyJob: '', // 技术职务
+  meterMajor: '', // 计量专业
   remark: '', // 备注
-  pDeptId: '',
-  pDeptName: '',
+  pDeptId: '', // 父级
+  pDeptName: '', // 父级
+  isLab: '1', // 是否为实验室
+  labCapacity: [], // 实验室能力
 }) // 表单
 // 展示父级组织
 const pDept = ref({
@@ -33,10 +37,11 @@
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
-  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+  organizeName: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
+  director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: ['blur', 'change'] }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: ['blur', 'change'] }],
+  isLab: [{ required: true, message: '是否为实验室不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 // 获取计量人员列表
@@ -53,13 +58,26 @@
     }
   })
 }
-const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
-// 获取技术职务列表
-const getTechnologyJobList = () => {
+const measureTypeList = ref<dictType[]>([]) // 实验室能力
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+const technologyJobList = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  // 获取技术职务列表
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
+  // 获取检校类型
+  getDictByCode('checkType').then((response) => {
+    measureTypeList.value = response.data
+  })
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
 }
+getDict()
+
 const administrationJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
@@ -91,7 +109,8 @@
           type: 'warning',
         },
       ).then((res) => {
-        updateApi({ ...ruleForm.value, title: undefined }).then((res) => {
+        const form = { ...ruleForm.value, labCapacity: ruleForm.value.labCapacity.join(',') }
+        updateApi(form).then((res) => {
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('提交成功')
@@ -117,6 +136,8 @@
   ruleForm.value.administrationJob = '' // 行政职务
   ruleForm.value.technologyJob = '' // 技术职务
   ruleForm.value.remark = '' // 备注
+  ruleForm.value.isLab = ''
+  ruleForm.value.labCapacity = []
 }
 const multipleTableRef = ref()
 const current = ref('')
@@ -141,7 +162,7 @@
       },
       {
         label: '计量专业',
-        data: 'meterMajor',
+        data: 'meterMajorName',
       },
       {
         label: '创建时间',
@@ -196,7 +217,7 @@
       },
       {
         label: '计量专业',
-        data: 'meterMajor',
+        data: 'meterMajorName',
       },
       {
         label: '创建时间',
@@ -434,10 +455,12 @@
   reset()
   title.value = row.title
   path.value = row.path
+  ruleForm.value = row
   ruleForm.value.organizeType = row.organizeType
   ruleForm.value.deptId = row.deptId
+  ruleForm.value.labCapacity = row.labCapacity ? row.labCapacity.split(',') : []
+  ruleForm.value.meterMajor = row.meterMajor
   getuser()
-  getTechnologyJobList()
   getAdministrationJob()
   getDepartmentList()
   getuserInfoList()
@@ -445,7 +468,6 @@
     getInstrumentInfo()
     getDeviceInfo()
   }
-  ruleForm.value = row
   console.log(row, 'row')
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
@@ -538,6 +560,53 @@
           </el-col>
         </el-row>
         <el-row :gutter="24">
+          <el-col v-if="title.split('-')[1] === '科室'" :span="6">
+            <el-form-item label="是否为实验室" prop="isLab">
+              <el-select v-model="ruleForm.isLab" :placeholder="title.split('-')[2] === '详情' ? '' : ''" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
+                <el-option label="是" value="1" />
+                <el-option label="否" value="0" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="title.split('-')[1] !== '部门'" :span="6">
+            <el-form-item label="计量专业" prop="meterMajor">
+              <el-select
+                v-model.trim="ruleForm.meterMajor"
+                clearable
+                :placeholder="title.split('-')[2] === '详情' ? '' : '请选择'"
+                :disabled="ruleForm.isLab === '0' || title.split('-')[2] === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="title.split('-')[1] === '科室'" :span="12">
+            <el-form-item label="实验室能力" prop="labCapacity">
+              <el-select
+                v-model.trim="ruleForm.labCapacity"
+                clearable
+                multiple
+                :placeholder="title.split('-')[2] === '详情' ? '' : '请选择'"
+                :disabled="ruleForm.isLab === '0' || title.split('-')[2] === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureTypeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
@@ -586,13 +655,5 @@
 </template>
 
 <style lang="scss" scoped>
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      content: "";
-      display: none;
-    }
-  }
-}
+// 样式代码
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index f7fd689..33e63c8 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -66,7 +66,7 @@
     columns: [
       { text: '科室编号', value: 'organizeNo', align: 'center' },
       { text: '科室名称', value: 'organizeName', align: 'center' },
-      { text: '专业', value: 'meterMajor', align: 'center' },
+      { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '技术职务', value: 'technologyJobName', align: 'center' },
       { text: '行政职务', value: 'administrationJobName', align: 'center' },
@@ -79,7 +79,7 @@
     columns: [
       { text: '工程组编号', value: 'organizeNo', align: 'center' },
       { text: '工程组名', value: 'organizeName', align: 'center' },
-      { text: '计量专业', value: 'meterMajor', align: 'center' },
+      { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
       { text: '所属科室', value: 'pDeptName', align: 'center' },
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index f7911fa..0528cc7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -7,7 +7,7 @@
   organizeType?: string // 类型
   createTime?: string // 创建时间
   director?: string // 负责人
-  meterMajor?: string // 专业
+  meterMajor: string // 专业
   pDeptId?: string // 所属科室
   createEndTime?: string
   createStartTime?: string
@@ -45,4 +45,6 @@
   technologyJobName: string
   updateTime: string
   title?: string
+  isLab: string // 是否为实验室
+  labCapacity: string | string[]
 }
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 4941fbb..90c6daf 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -21,25 +21,25 @@
 const total = ref<number>(0)
 const select = ref()
 const columns = ref([
-  {
-    text: '人员编号',
-    value: 'staffNo',
-  },
-  {
-    text: '姓名',
-    value: 'name',
-  },
-  {
-    text: '所在部门',
-    value: 'deptId',
-  },
+  { text: '人员编号', value: 'staffNo', width: '160', fixed: true },
+  { text: '姓名', value: 'name', fixed: true },
+  { text: '所在部门', value: 'deptId' },
+  { text: '学历', value: 'education', align: 'center' },
+  { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  { text: '计量专业', value: 'major', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '技术考核', value: 'technologyExam', align: 'center' },
 ])
 // 获取部门
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
 const deptIdList = ref([])
-const getDeptList = () => {
+const getDeptList = () => { // 获取部门
   getDeptTreeList().then((res) => {
     deptIdList.value = toTreeList(res.data, '0', true)
   })
@@ -50,7 +50,7 @@
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records
-      total.value = Number(res.data.total)
+      total.value = parseInt(res.data.total)
     }
   })
 }
@@ -81,8 +81,8 @@
   }
   search()
 }
-// 点击保存
-const submitForm = () => {
+// 点击确定
+const confirmSelect = () => {
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     getStaffDetail(person).then((res) => {
@@ -143,17 +143,17 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <el-table-column label="#" width="55" align="center">
-          <template #default="scope">
-            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column> -->
+          <!-- <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column> -->
         </template>
       </normal-table>
     </div>
     <template #footer>
       <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
         <el-button @click="resetForm">
           取消
         </el-button>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index d0d3ba2..84dd465 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -6,6 +6,8 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -17,22 +19,15 @@
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref([
-  {
-    text: '姓名',
-    value: 'name',
-  },
-  {
-    text: '账户',
-    value: 'account',
-  },
-  {
-    text: '所在部门',
-    value: 'deptName',
-  },
+const total = ref(0)
+const select = ref(-1)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '姓名', value: 'name' },
+  { text: '账户', value: 'account' },
+  { text: '所在部门', value: 'deptName' },
 ])
+// 所在部门
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
@@ -43,7 +38,7 @@
     deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
-// 获取数据列表
+// 获取人员数据列表
 const fetchData = () => {
   select.value = -1
   getUserList(listQuery.value).then((res) => {
@@ -100,8 +95,8 @@
 const initDialog = () => {
   // reset()
   dialogFormVisible.value = true
-  getDeptList()
-  fetchData()
+  getDeptList() // 获取部门信息
+  fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
 </script>
@@ -135,11 +130,11 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <el-table-column label="#" width="55" align="center">
-          <template #default="scope">
-            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column> -->
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
         </template>
       </normal-table>
     </div>
diff --git a/src/views/measure/train/components/selectMeasurePersonDialog.vue b/src/views/measure/train/components/selectMeasurePersonDialog.vue
new file mode 100644
index 0000000..251b1e5
--- /dev/null
+++ b/src/views/measure/train/components/selectMeasurePersonDialog.vue
@@ -0,0 +1,176 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectMeasurePersonDialog">
+import { ElMessage } from 'element-plus'
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 10,
+  offset: 1,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const singleChecked = ref('') // 单选选中id
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref<TableColumn[]>([
+  { text: '人员编号', value: 'staffNo', width: '160', align: 'center', fixed: true },
+  { text: '姓名', value: 'name', align: 'center', fixed: true },
+  { text: '学历', value: 'education', align: 'center' },
+  { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  { text: '计量专业', value: 'major', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '技术考核', value: 'technologyExam', align: 'center' },
+])
+// 获取部门
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
+const getDeptList = () => { // 获取部门
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records.map((item: any) => {
+        return {
+          ...item,
+          sex: item.sex === '1' ? '男' : '女',
+        }
+      })
+      total.value = parseInt(res.data.total)
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请先选择计量人员')
+  }
+  else {
+    emits('add', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
+      </search-item>
+      <search-item>
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/train/components/selectUser.vue b/src/views/measure/train/components/selectUser.vue
new file mode 100644
index 0000000..67eebdb
--- /dev/null
+++ b/src/views/measure/train/components/selectUser.vue
@@ -0,0 +1,237 @@
+<!-- 选择用户 -->
+<!-- 选择成员 -->
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
+import { getUserList } from '@/api/system/user'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
+})
+const emits = defineEmits(['update:visible', 'change'])
+const table = ref() // 表格ref
+
+// 表格表头
+const columns = ref<TableColumn[]>([
+  { text: '真实姓名', value: 'name', align: 'center' },
+  { text: '所在组织机构', value: 'deptName', align: 'center' },
+])
+
+// 表格数据
+const list = ref<IEmployees[]>([])
+
+const loading = ref(false)
+const total = ref(0)
+// 查询参数
+const listQuery = reactive({
+  keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
+  offset: 1,
+  limit: 10,
+  sort: 'id',
+  deptType: '',
+})
+const checkedList = ref([])
+// 多选的数据
+const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
+const closeDialog = () => {
+  emits('update:visible', false)
+}
+const visibleDialog = computed({
+  get() {
+    return props.visible
+  },
+  set() {
+    closeDialog()
+  },
+})
+
+watch(() => props.visible, (val) => {
+  // 清除上次选中
+  if (!val) {
+    table.value.clearMulti()
+  }
+})
+
+// 点击确定，保存选择的成员配置
+const saveDialog = () => {
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
+}
+
+const select = ref('')
+// 获取列表数据
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
+  getUserList(listQuery).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    loading.value = false
+  })
+}
+
+// 多选
+const multiSelect = (val: any) => {
+  multipleTable.value = val
+}
+
+// 查询数据
+const search = () => {
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
+
+onMounted(() => {
+  // 获取列表数据
+  fetchData(true)
+})
+</script>
+
+<template>
+  <div class="select-emplotees-dialog">
+    <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table-area">
+        <!-- 筛选条件 -->
+        <search-area @search="search">
+          <search-item>
+            <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
+          </search-item>
+        </search-area>
+        <!-- 表头标题 -->
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
+          <!-- 查询结果Table显示 -->
+          <normal-table
+            ref="table"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
+          >
+            <!-- 序号 -->
+            <template #preColumns>
+              <el-table-column label="#" width="55" align="center">
+                <template #default="scope">
+                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
+            </template>
+            <!-- 状态 -->
+            <template #columns>
+              <el-table-column label="状态" align="center" width="80">
+                <template #default="scope">
+                  <el-tag :type="scope.row.statusName === '启用' ? 'success' : 'danger'">
+                    {{ scope.row.statusName }}
+                  </el-tag>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+      <!-- </div> -->
+      <template #footer>
+        <el-button @click="closeDialog">
+          取 消
+        </el-button>
+        <el-button type="primary" @click="saveDialog">
+          确 定
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss">
+@import "@/css/dialog.css";
+
+.chengyuan-dialog {
+  .el-table .cell {
+    white-space: nowrap;
+  }
+
+  .el-dialog__body {
+    display: flex;
+    overflow: auto;
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+.chengyuan-dialog {
+  width: 100%;
+
+  .left-container {
+    white-space: nowrap;
+    height: 100%;
+  }
+
+  .table-area {
+    flex: 1;
+    overflow: auto;
+
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
+    .pagination {
+      margin-top: 10px;
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/train/components/userListDialog.vue b/src/views/measure/train/components/userListDialog.vue
index a1d4bae..20488ca 100644
--- a/src/views/measure/train/components/userListDialog.vue
+++ b/src/views/measure/train/components/userListDialog.vue
@@ -21,18 +21,9 @@
 const total = ref<number>(0)
 const select = ref<number>(-1)
 const columns = ref([
-  {
-    text: '姓名',
-    value: 'name',
-  },
-  {
-    text: '单位名称',
-    value: 'company',
-  },
-  {
-    text: '技术职称',
-    value: 'remark',
-  },
+  { text: '姓名', value: 'name' },
+  { text: '单位名称', value: 'company' },
+  { text: '技术职称', value: 'remark' },
 ])
 const list = ref(props.list || [])
 // 搜索
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index bbac2f4..fad7684 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -55,63 +55,18 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '计划编号',
-    value: 'planNo',
-    align: 'center',
-  },
-  {
-    text: '培训名称',
-    value: 'planName',
-    align: 'center',
-  },
-  {
-    text: '培训对象',
-    value: 'trainPerson',
-    align: 'center',
-  },
-  {
-    text: '培训人数',
-    value: 'trainNumber',
-    align: 'center',
-  },
-  {
-    text: '培训学时',
-    value: 'trainHour',
-    align: 'center',
-  },
-  {
-    text: '培训时间',
-    value: 'trainTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '主管部门',
-    value: 'deptName',
-    align: 'center',
-  },
-  {
-    text: '实施单位',
-    value: 'effectiveCompany',
-    align: 'center',
-  },
-  {
-    text: '培训内容',
-    value: 'trainContent',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'remark',
-    align: 'center',
-  },
+  { text: '计划编号', value: 'planNo', width: '160', align: 'center' },
+  { text: '培训名称', value: 'planName', align: 'center' },
+  { text: '培训对象', value: 'trainPerson', align: 'center' },
+  { text: '培训人数', value: 'trainNumber', align: 'center' },
+  { text: '培训学时', value: 'trainHour', align: 'center' },
+  { text: '培训时间', value: 'trainTime', width: '180', align: 'center' },
+  { text: '主管部门', value: 'deptName', align: 'center' },
+  { text: '实施单位', value: 'effectiveCompany', align: 'center' },
+  { text: '负责人', value: 'director', align: 'center' },
+  { text: '培训内容', value: 'trainContent', align: 'center' },
+  { text: '创建时间', value: 'createTime', width: '180', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -331,8 +286,15 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="190">
+          <el-table-column label="操作" align="center" width="170" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2f4b599..2862696 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -1,26 +1,28 @@
+<!-- 培训计划详情 -->
 <script lang="ts" setup name="PlanAdd">
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import userListDialog from '../person/components/userListDialog.vue'
+import selectMeasurePersonDialog from './components/selectMeasurePersonDialog.vue'
 import type { IaddPersonListType, IformInlineType } from './plan_interface'
+import selectEmployeesDialog from '@/components/dialog/selectEmployeesDialog.vue'
 import DeptSelect from '@/components/DeptSelect/index.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import {
-  getDeptTree,
   getListDetail,
   getListSave,
   getListSubmit,
   getListUpdate,
 } from '@/api/system/plan'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
+const userVisible = ref(false) // 控制选择用户弹框显隐
+const checkedList = ref([]) // 选择的成员
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '详情',
 } // 字典
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -29,12 +31,13 @@
     infoId.value = $route.params.id as string
   }
 }
+// 表单
 const formInline = ref<IformInlineType>({
   createTime: '', // 创建时间
   deptId: '', // 部门id
   deptName: '', // 部门名称
   director: '', // 负责人
-  effectiveCompany: '',
+  effectiveCompany: '', // 实施单位
   id: '', // 主键
   planName: '', // 培训名称
   planNo: '', // 培训编号
@@ -47,27 +50,18 @@
   trainStaffList: [], // 人员信息
   trainTime: '', // 培训时间
 })
-const addId = ref('') // 保存后的id
-const ruleFormRef = ref<FormInstance>()
+const addId = ref('') // 保存后的id-用于提交
+const ruleFormRef = ref<FormInstance>() // 表单ref
+// 人员信息表头
 const columns = [
   { text: '学员名称', value: 'name' },
-  { text: '单位名称', value: 'deptName' },
+  { text: '单位名称', value: 'company' },
   { text: '技术职称', value: 'technologyJob' },
-  { text: '签到时间', value: 'createtime' },
+  { text: '签到时间', value: 'createtime', width: '180' },
 ]
 const dialogVisible = ref(false)
-const addPersonList = ref<IaddPersonListType>({
-  company: '',
-  examResult: '',
-  id: '',
-  name: '',
-  remark: '',
-  signTime: '',
-  staffId: '',
-  technologyJob: '',
-})
 const SelectionList = ref<IaddPersonListType[]>([])
-// 校验规则
+// 表单验证规则
 const rules = ref({
   planNo: [{ required: true, message: '计划编号不能为空', trigger: ['blur', 'change'] }],
   planName: [{ required: true, message: '培训名称不能为空', trigger: ['blur', 'change'] }],
@@ -82,23 +76,40 @@
   effectiveCompany: [{ required: true, message: '实施单位不能为空', trigger: ['blur', 'change'] }],
   director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
   trainContent: [{ required: true, message: '培训内容不能为空', trigger: ['blur', 'change'] }],
-}) // 表单验证规则
+})
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
   $router.back()
 }
-const userListRef = ref()
-// 选择人员
+const userListRef = ref() // 选择人员dialog ref
+// 点击表单中的选择人员
 const selectPerson = () => {
-  userListRef.value.initDialog()
+  // userListRef.value.initDialog()
+  userVisible.value = true
 }
 // 增加行
 const addRow = () => {
-  formInline.value.trainStaffList.push(
-    JSON.parse(JSON.stringify(addPersonList.value)),
-  )
+  const index = formInline.value.trainStaffList.findIndex(item => !item.name)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  if (formInline.value) {
+    formInline.value.trainStaffList.push(
+      {
+        company: '', // 单位名称
+        examResult: '', // 考核结果
+        id: '',
+        name: '', // 学员名称
+        remark: '', // 备注
+        signTime: '', // 签到时间
+        staffId: '', // 任务id
+        technologyJob: '', // 技术职称
+      },
+    )
+  }
 }
 // 记录点击的第几行
 const listIndex = ref(0)
@@ -106,20 +117,14 @@
 const userTrainRef = ref()
 // 选择计量人员
 const handleClick = (index: number) => {
-  listIndex.value = index
+  listIndex.value = index // 选择的第几行
   userTrainRef.value.initDialog()
 }
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
 }
-// // 点击弹窗的完成追加到表格数组中
-// const addPushList = () => {
-//   formInline.value.trainStaffList.push(
-//     JSON.parse(JSON.stringify(addPersonList.value)),
-//   )
-//   handleClose()
-// }
+
 // 删除行
 const deleteList = () => {
   formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
@@ -132,9 +137,10 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 选择完负责人的函数
-const confirmPerson = (object: IaddPersonListType) => {
-  formInline.value.director = object.name
+// 选择完负责人
+const confirmPerson = (val: IaddPersonListType) => {
+  formInline.value.director = val.name
+  userVisible.value = false
 }
 if (infoId.value && infoId.value !== '') {
   getListDetail({ id: infoId.value }).then((res) => {
@@ -142,19 +148,16 @@
   })
 }
 // 选完计量人员
-const confirmTrainPerson = (object: IaddPersonListType) => {
-  formInline.value.trainStaffList[listIndex.value] = object
-  formInline.value.trainStaffList[listIndex.value].staffId = object.id
+const confirmSelectPerson = (val: any) => {
+  formInline.value.trainStaffList[listIndex.value].name = val[0].name // 学员名称
+  formInline.value.trainStaffList[listIndex.value].company = val[0].deptId // 单位名称
+  formInline.value.trainStaffList[listIndex.value].technologyJob = val[0].technologyJob // 技术职称
+  formInline.value.trainStaffList[listIndex.value].staffId = val[0].id // 计量人员表id
 }
 // 点击提交
-const getAddList = async (
-  formEl: FormInstance | undefined,
-  buttonType: string,
-) => {
-  if (!formEl) {
-    return
-  }
-  await formEl.validate((valid, fields) => {
+const submit = async (formEl: FormInstance | undefined, buttonType: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid) => {
     if (valid) {
       ElMessageBox.confirm(`确认${buttonType}吗？`, '提示', {
         confirmButtonText: '确认',
@@ -211,6 +214,7 @@
     }
   })
 }
+// 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
   popTitle: '证书报告模板', // 打印配置页上方的标题
@@ -228,9 +232,7 @@
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
-          @click="
-            getAddList(ruleFormRef, '提交')
-          "
+          @click="submit(ruleFormRef, '提交')"
         >
           提交
         </el-button>
@@ -305,8 +307,8 @@
                 type="datetime"
                 style="width: 100%;"
                 placeholder="培训时间"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -369,12 +371,16 @@
               />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="培训内容:" prop="trainContent">
               <el-input
                 v-model="formInline.trainContent"
                 :placeholder="pageType === 'detail' ? '无' : '请输入培训内容'"
                 :disabled="pageType === 'detail'"
+                type="textarea"
+                autosize
               />
             </el-form-item>
           </el-col>
@@ -416,15 +422,8 @@
           :label="item.text"
           align="center"
         >
-          <template
-            v-if="item.text === '学员名称' && pageType !== 'detail'"
-            #default="scope"
-          >
-            <el-input
-              v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
-              class="input"
-            >
+          <template v-if="item.text === '学员名称' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input">
               <template #append>
                 <el-button
                   v-if="pageType !== 'detail'"
@@ -440,8 +439,14 @@
       </el-table>
     </detail-block>
   </app-container>
-  <!-- 选择用户列表组件 -->
-  <user-list-dialog ref="userListRef" @add="confirmPerson" />
+
   <!-- 选择计量人员组件列表 -->
-  <user-list-dialog ref="userTrainRef" @add="confirmTrainPerson" />
+  <select-measure-person-dialog ref="userTrainRef" @add="confirmSelectPerson" />
+  <!-- 用户弹框 -->
+  <select-employees-dialog
+    v-model:visible="userVisible"
+    v-model:data="checkedList"
+    :multi="false"
+    @change="confirmPerson"
+  />
 </template>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
new file mode 100644
index 0000000..d6827e4
--- /dev/null
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts" name="DistributeDialog">
+import processConfig from './processConfig.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { getTaskDetail } from '@/api/business/task'
+// 任务分发弹窗
+
+// 自定义方法：close关闭弹窗
+const emit = defineEmits(['close'])
+const dialogVisible = ref(false) // 弹窗显示
+const sampleId = ref('') // 样品id
+const orderId = ref('') // 委托单id
+
+// 委托书-证书类别列表
+const certificationTypes = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  getDictByCode('certificationType').then((response) => {
+    certificationTypes.value = response.data
+  })
+}
+
+getDict()
+// 样品详情
+const sampleDetail = ref({
+  sampleName: '压力表',
+  mesureContent: '压力、ip68',
+  certifications: ['1', '2'],
+  remark: '这是备注',
+  measureProcessList: [],
+  measureSendBackList: [],
+})
+
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    sampleDetail.value.sampleName = res.data.sampleName
+    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.remark = res.data.remark
+    sampleDetail.value.certifications = res.data.certifications
+    sampleDetail.value.measureProcessList = res.data.measureProcessList
+    sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+  })
+}
+// 初始化弹窗
+const initDialog = (orderid: string, sampleid: string) => {
+  dialogVisible.value = true
+  sampleId.value = sampleid
+  orderId.value = orderid
+  getInfo()
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+  emit('close')
+}
+function cancel() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="任务分发" width="1000" @close="cancel">
+    <div class="simple-info">
+      <div class="simple-info-line">
+        <span class="label">样品名称:</span>
+        <el-input v-model="sampleDetail.sampleName" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">证书类别:</span>
+        <el-checkbox-group v-model="sampleDetail.certifications" disabled>
+          <el-checkbox v-for="item in certificationTypes" :key="item.value" :label="item.value">
+            {{ item.name }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="simple-info-line">
+        <span class="label">检定项目:</span>
+        <el-input v-model="sampleDetail.mesureContent" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">备注:</span>
+        <el-input v-model="sampleDetail.remark" disabled />
+      </div>
+    </div>
+    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+      批量添加
+    </el-button>
+    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <template #footer>
+      <el-button type="primary" @click="saveProcess">
+        确定
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//  样式
+.simple-info {
+  margin-top: -10px;
+  margin-bottom: 10px;
+
+  .simple-info-line {
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    .label {
+      width: 90px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/components/lab-interface.ts b/src/views/business/schedule/task/components/lab-interface.ts
index d6355c6..02b0d1d 100644
--- a/src/views/business/schedule/task/components/lab-interface.ts
+++ b/src/views/business/schedule/task/components/lab-interface.ts
@@ -6,7 +6,8 @@
   isLab: '1' // 是否是实验室
   director: string // 负责人
   meterMajor: string // 专业
-  measureItems: string// 检测能力
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
 }
 
 // 部门返回值对象类型
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 4ccab04..1efb8a9 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -1,11 +1,18 @@
 <script setup lang="ts" name="ProcessConfig">
 import { ref } from 'vue'
 import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
 import ProcessNode from './processNode.vue'
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/task'
 const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
   // 是否为详情展示页面
   detail: {
     type: Boolean,
@@ -21,81 +28,35 @@
     type: String,
     required: true,
   },
+  list: {
+    type: Array,
+    default: () => [],
+  },
 })
 const emits = defineEmits(['saveOver'])
 // 默认流程节点
-const defaultProcess = {
-  id: '', // 检测节点id
-  executiveItem: '', // 检测项目
-  executiveDept: '', // 检测部门
-  executiveDeptName: '', // 检测部门
-  executivePerson: '', // 检测人员
-  executivePersonName: '', // 检测人员
-  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-  measureStateName: '', // 检测状态
-  currentCertifications: '', // 当前证书数
-  requireCertifications: '', // 应出具证书数
-  updateTime: '', // 更新时间
-  backPerson: '', // 退回人
-  backReason: '', // 退回原因
-  backTime: '', // 退回时间
-  distributePerson: '', // 分配人
-  distributeTime: '', // 分配时间
-  startTime: '', // 检测开始时间
-  overTime: '', // 检测结束时间
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
 }
 // 检定流程列表
-const processList = ref([
+const processList = ref<IScheduleSet[]>([
   { ...defaultProcess },
 ])
 
-// 获取当前样品检测流程，参数待定
-const fetchProcess = () => {
-  // TODO: 模拟数据
-  processList.value = [
-    {
-      id: '1', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423635973935106', // 检测部门
-      executiveDeptName: '力学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '张三', // 检测人员
-      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待检测', // 检测状态
-      currentCertifications: '0', // 当前证书数
-      requireCertifications: '2', // 应出具证书数
-      updateTime: '2023-02-01 09:00:05', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-    {
-      id: '2', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423577505337346', // 检测部门
-      executiveDeptName: '热学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待分配', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-  ]
-}
-fetchProcess()
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+})
 
 // 点击添加流程
 const processAdd = () => {
@@ -121,25 +82,17 @@
 // 批量添加实验室
 const batchChooseOver = (labs: ILabList[]) => {
   for (const item of labs) {
-    const processTemp = {
-      id: '',
-      executiveItem: '', // 检测项目
-      executiveDept: item.deptId, // 检测部门
-      executiveDeptName: item.organizeName, // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
     }
     processList.value.push(processTemp)
   }
@@ -147,9 +100,24 @@
 
 // 保存流程
 const saveProcess = () => {
-  // TODO: 保存流程
-  console.log(processList.value)
-  emits('saveOver')
+  const form = {
+    measureProcessList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  console.log(form)
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
 }
 // 删除流程
 const deleteProcess = (index: number) => {
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index 6cbdf10..31dfae4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -12,24 +12,16 @@
     type: Object,
     default: () => {
       return {
-        id: '', // 检测节点id
-        executiveItem: '', // 检测项目
-        executiveDept: '', // 检测部门
-        executiveDeptName: '', // 检测部门
-        executivePerson: '', // 检测人员
-        executivePersonName: '', // 检测人员
-        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-        measureStateName: '', // 检测状态
-        currentCertifications: '', // 当前证书数
-        requireCertifications: '', // 应出具证书数
-        updateTime: '', // 更新时间
-        backPerson: '', // 退回人
-        backReason: '', // 退回原因
-        backTime: '', // 退回时间
-        distributePerson: '', // 分配人
-        distributeTime: '', // 分配时间
-        startTime: '', // 检测开始时间
-        overTime: '', // 检测结束时间
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
       }
     },
   },
@@ -56,22 +48,23 @@
 })
 // 检定环节可编辑-只有待分发状态可编辑
 const deptEdit = computed(() => {
-  return processNodeData.value.measureState == '0'
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 检定人可编辑-待分配状态可编辑
 const personEdit = computed(() => {
-  const editStates = ['0', '1']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 证书可编辑-待分发、待分配、待检测状态可编辑
 const certificationEdit = computed(() => {
-  const editStates = ['0', '1', '2']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 节点可移动
 const canMove = computed(() => {
-  const editStates = ['0']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 
 // 选择实验室
@@ -82,8 +75,8 @@
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
   console.log(lab)
-  processNodeData.value.executiveDept = lab.deptId
-  processNodeData.value.executiveDeptName = lab.organizeName
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
 }
 
 // 选择人员
@@ -93,8 +86,8 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
-  processNodeData.value.executivePerson = person.id
-  processNodeData.value.executivePersonName = person.name
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
 }
 
@@ -122,7 +115,7 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit">
           <template v-if="deptEdit" #append>
             <el-button :icon="Aim" size="small" link @click="clickChoose" />
           </template>
@@ -130,7 +123,7 @@
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit">
           <template v-if="personEdit" #append>
             <el-button :icon="Aim" size="small" link @click="choosePerson" />
           </template>
@@ -140,7 +133,7 @@
         <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
       <div class="line">
-        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
       </div>
       <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
@@ -149,7 +142,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 1d02839..493fbba 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,5 +1,3 @@
-import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
-
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -8,12 +6,29 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
   offset: number
 }
 
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
 // 任务列表-返回值
 export interface ITaskList {
   orderId: string // 委托书编号
@@ -25,41 +40,127 @@
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  isUrgent: string // 是否加急
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
   requireOverTime: string // 应检完时间
-  sampleAttr: string // 样品属性
-  sampleAttrName: string // 样品属性
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
   currentMeasureState: string // 当前检定环节
   currentMeasureStateName: string // 当前检定环节
-  currentCertifications: number // 已出具证书总数
+  alreadyCertifications: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
-  distributeStateName: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
 }
 
-// 检测流程节点
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+}
+
+// 全部检测流程节点
 export interface ISchedule {
-  executivePerson: string // 执行人
-  executivePersonName: string // 执行人名称
-  executiveDept: string // 执行部门
-  executiveDeptName: string // 执行部门名称
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
   executiveItem: string // 检定项目
-  currentCertifications?: number // 已出具证书总数
+  alreadyCertifications?: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  measureState: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
   updateTime: string // 流程更新时间
-  backTime: string // 退回时间
-  backReason: string // 退回原因
-  backPerson: string // 退回人
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
   distributePerson: string // 分配人
   distributeTime: string // 分配时间
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
 
 // 样品检测信息
-export interface ISampleMeasure extends ISampleEdit {
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
   orderId: string // 委托单id
+  orderCode: string // 委托单编号
   certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
 }
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 465b2e7..547ee3e 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,28 +1,27 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
-import type { ISampleMeasure } from './task-interface'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
 import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getTaskDetail } from '@/api/business/task'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // 样品详情id
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -39,32 +38,49 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleMeasure> = ref({
-  id: '',
-  orderId: '', // 委托单id
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
   postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
   manufacturer: '', // 生产厂家
   manufacturerCountry: '', // 厂家国别
   manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
   remark: '', // 备注
   minioFileName: '', // 说明书
   labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-  certifications: '',
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
 })
 const ruleFormRef = ref<FormInstance>()
 
@@ -143,14 +159,6 @@
   return menu.find(item => item.name === currentMenu.value)
 })
 
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
 const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
@@ -181,11 +189,9 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(dataForm.value).then((res) => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -195,42 +201,23 @@
     }
   })
 }
-
-// 获取样品详情
+//
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
 const getInfo = () => {
-  // getSapmleDetail({ id: infoId.value }).then((res) => {
-  dataForm.value = {
-    orderId: '123',
-    ABC: 'A',
-    companyAddress: '北京/北京市',
-    customerName: '京东集团',
-    customerNo: 'sygf202211290001',
-    id: '111111',
-    labelBind: '11222',
-    manufacturer: '北京某厂家',
-    manufacturerCountry: 'CN',
-    manufacturingDate: '2023-03',
-    manufacturingNo: '123121',
-    mesureCategory: '',
-    mesureContent: '项目1',
-    mesurePeriod: '1',
-    mesureType: '',
-    minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-    phone: '950618',
-    postalCode: 'test',
-    remark: '无备注',
-    sampleModel: '型号1',
-    sampleName: '样品1',
-    sampleNo: '123456',
-    measureResultCode: 'bhg',
-    deliverer: '张三',
-    delivererTel: '156254577545',
-    certifications: '1',
-  }
-  // for (const item of menu) {
-  //   item.searchFunc()
-  // }
-  // })
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList
+    taskForm.value.measureSendBackList = res.data.measureSendBackList
+  })
 }
 
 // 点击标签绑定的扫描
@@ -260,7 +247,7 @@
     fd.append('multipartFile', event.target.files[0])
     // UploadFile(fd).then((res) => {
     //   if (res.code === 200) {
-    //     dataForm.value.minioFileName = res.data[0]
+    //     sampleForm.value.minioFileName = res.data[0]
     //     // 重置当前验证
     //     ElMessage.success('文件上传成功')
     //   }
@@ -273,18 +260,30 @@
 const upload = () => {
   fileRef.value.click()
 }
-// 获取样品详情
-getInfo()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.role) {
+  roleType.value = $route.params.role as string // 使用角色
+
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+    getSampleInfo()
+  }
+}
 </script>
 
 <template>
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -294,7 +293,7 @@
       <div id="form">
         <el-form
           ref="ruleFormRef"
-          :model="dataForm"
+          :model="sampleForm"
           :label-width="120"
           label-position="right"
           :rules="rules"
@@ -303,9 +302,9 @@
             <el-col :span="6">
               <el-form-item label="样品编号:" prop="sampleNo">
                 <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -313,9 +312,9 @@
             <el-col :span="6">
               <el-form-item label="样品名称:" prop="sampleName">
                 <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -323,9 +322,9 @@
             <el-col :span="6">
               <el-form-item label="样品型号:" prop="sampleModel">
                 <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -333,9 +332,9 @@
             <el-col :span="6">
               <el-form-item label="出厂编号:" prop="manufacturingNo">
                 <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -343,9 +342,9 @@
             <el-col :span="6">
               <el-form-item label="委托方代码" prop="customerNo">
                 <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -353,9 +352,9 @@
             <el-col :span="6">
               <el-form-item label="委托方名称" prop="customerName">
                 <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -363,9 +362,9 @@
             <el-col :span="6">
               <el-form-item label="委托方电话" prop="phone">
                 <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -373,9 +372,9 @@
             <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -383,11 +382,11 @@
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
-                  v-model="dataForm.companyAddress"
+                  v-model="sampleForm.customerAddress"
                   type="textarea"
                   autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -395,9 +394,9 @@
             <el-col :span="6">
               <el-form-item label="校检类别:">
                 <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
@@ -407,19 +406,19 @@
             <el-col :span="6">
               <el-form-item label="生产厂家:">
                 <el-input
-                  v-model="dataForm.manufacturer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="厂家国别:">
                 <el-select
-                  v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
@@ -429,23 +428,23 @@
             <el-col :span="6">
               <el-form-item label="出厂年月:">
                 <el-date-picker
-                  v-model="dataForm.manufacturingDate"
+                  v-model="sampleForm.manufacturingDate"
                   type="month"
                   format="YYYY-MM"
                   value-format="YYYY-MM"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="ABC:">
                 <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
@@ -455,9 +454,9 @@
             <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -465,9 +464,9 @@
             <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
-                  v-model="dataForm.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -475,49 +474,20 @@
             <el-col :span="24">
               <el-form-item label="检定项目:" prop="mesureContent">
                 <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定周期（月）:">
                 <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="上次检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  disabled
-                  class="full-width-input"
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
@@ -526,21 +496,21 @@
             <el-col :span="24">
               <el-form-item label="备注:">
                 <el-input
-                  v-model="dataForm.remark"
+                  v-model="sampleForm.remark"
                   type="textarea"
                   :rows="2"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
-                  v-model="dataForm.mesureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
@@ -550,10 +520,10 @@
             <el-col :span="6">
               <el-form-item label="标签绑定:">
                 <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 >
                   <template #append>
                     <el-button>扫描</el-button>
@@ -565,11 +535,11 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="14">
               <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
             </el-col>
@@ -586,7 +556,7 @@
           保存
         </el-button>
       </template>
-      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
@@ -604,11 +574,11 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="dataForm.id!" :order-id="dataForm.orderId" />
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
       <!-- 检定记录 -->
-      <measure-records v-if="currentMenu === '检定记录'" :sample-id="dataForm.id!" />
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
-      <certification-records v-if="currentMenu === '检定证书'" :sample-id="dataForm.id!" />
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index f784804..461c518 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -31,7 +31,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
@@ -39,30 +39,30 @@
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
-  { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center' },
-  { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
-  { text: '分发性质', value: 'distributeState', align: 'center', width: '90px' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return row.alreadyCertifications ? `${row.alreadyCertifications}/${row.requireCertifications}` : '0/0' } },
+  { text: '分发性质', value: 'handOutProperty', align: 'center', width: '90px' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -80,15 +80,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // // 模拟数据
-  // list.value = [
-  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  // ]
-  // loadingTable.value = false
-  // console.log(listQuery.value)
   getTaskList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -111,15 +107,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
+    sampleBelong: '', // 样品属性
     sampleStatus: '2', // 分发状态
+    startTime: '', //	应检定开始时间
+    endTime: '', //	应检定结束时间
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -271,8 +269,8 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue
index 629b33c..2300f4c 100644
--- a/src/views/customer/advice/adviceEdit.vue
+++ b/src/views/customer/advice/adviceEdit.vue
@@ -51,7 +51,7 @@
 const companyInfo: SimpleCompany = reactive({
   customerName: '', // 公司名称
   customerNo: '', //	客户编号
-  customerId: '', // 客户id
+  id: '', // 客户id
   grade: '', // 履约评级
   gradeName: '', // 履约评级
   companySize: '', // 公司规模
@@ -121,12 +121,13 @@
   const item = select as SimpleCompany
   companyInfo.customerName = item.customerName
   companyInfo.customerNo = item.customerNo
-  companyInfo.customerId = item.customerId
+  companyInfo.id = item.id
   companyInfo.gradeName = item.gradeName
   companyInfo.companySizeName = item.companySizeName
   companyInfo.businessSizeName = item.businessSizeName
   companyInfo.evaluationName = item.evaluationName
   dataForm.value.customerNo = item.customerNo
+  dataForm.value.customerId = item.id
 }
 // 打印表单
 const printObj = ref({
@@ -154,8 +155,6 @@
         if (dataForm.value.id) {
           updateAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -164,8 +163,6 @@
         else {
           addAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
diff --git a/src/views/customer/advice/advice_interface.ts b/src/views/customer/advice/advice_interface.ts
index b08f85b..a8bf311 100644
--- a/src/views/customer/advice/advice_interface.ts
+++ b/src/views/customer/advice/advice_interface.ts
@@ -40,9 +40,10 @@
 
 // 公司简易
 export interface SimpleCompany {
+  id: string // 客户id
   customerName: string // 公司名称
   customerNo: string //	客户编号
-  customerId: string // 客户id
+  grade: string // 履约评级
   gradeName: string // 履约评级
   companySizeName: string // 公司规模
   businessSizeName: string // 业务规模
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index f9ee314..4893c4f 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -26,6 +26,7 @@
 const visible = ref(false) // 控制对话框显隐
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -54,17 +55,7 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
-})
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
+})// 表单
 const ruleFormRef = ref<FormInstance>()
 
 // 自定义校验规则--检定周期为正整数
@@ -111,6 +102,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -479,7 +474,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index aceea6a..abcada5 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -36,7 +36,14 @@
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
-  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: ISampleList) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ISampleList[]>([])
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index aafed2a..256ed9f 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -24,6 +24,7 @@
   measurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
   remark: string // 备注
+  validDeadline?: string // 证书过期时间
 }
 
 export interface ISampleEdit {
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 3b03275..d04456b 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -163,7 +163,7 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
+          <el-select v-model="listQuery.businessSize" placeholder="业务规模">
             <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
@@ -183,7 +183,16 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirm">
           确定
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 59f2feb..4deeed8 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -20,18 +20,9 @@
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 
 const dataForm: Ref<ISampleDetail> = ref({
   id: '',
@@ -74,6 +65,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -358,7 +353,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 05fe276..7251eda 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -4,12 +4,16 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOvertimeList, IOvertimeListQuery } from './overtime_list_interface'
+import { ITEM_RENDER_EVT } from 'element-plus/es/components/virtual-list/src/defaults'
+import type { IOvertimeList, IOvertimeListQuery, dictType } from './overtime_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportSapmleList, getSampleList } from '@/api/customer/sampleList'
+import { getDictByCode } from '@/api/system/dict'
+
 const { proxy } = getCurrentInstance() as any
+const certificationStatusMap = ref<dictType[]>([]) as any // 证书状况
 const $router = useRouter()
 
 // 查询条件
@@ -25,12 +29,7 @@
   offset: 1,
   limit: 20,
 })
-// 证书状况字典
-const certificationStatusMap = {
-  0: '未超期',
-  1: '即将超期',
-  2: '已超期',
-}
+
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
@@ -42,7 +41,13 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
-  { text: '证书状况', value: 'certificationStatus', align: 'center' },
+  {
+    text: '证书状况',
+    value: 'certificationStatus',
+    align: 'center',
+    width: '90px',
+    styleFilter: (row: IOvertimeList) => { return row.certificationStatus === '即将超期' ? 'color: red' : '' },
+  },
 ])
 // 表格数据
 const list = ref<IOvertimeList[]>([])
@@ -53,6 +58,16 @@
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
+// 获取字典值
+async function getDict() {
+  // 证书状况
+  const res = await getDictByCode('certificationStatus')
+  // 证书状况字典 {1：即将过期}
+  res.data.forEach((item: any) => {
+    certificationStatusMap.value[`${item.value}`] = item.name
+  })
+}
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -63,7 +78,12 @@
   listQuery.value.startTime = timeRange.value[0] as string || ''
   listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: IOvertimeList) => {
+      return {
+        ...item,
+        certificationStatus: certificationStatusMap.value[item.certificationStatus],
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -161,7 +181,10 @@
   }
 }
 
-fetchData(true)
+onMounted(async () => {
+  await getDict()
+  fetchData(true)
+})
 </script>
 
 <template>
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 519f0af..cceb09b 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -135,7 +135,7 @@
         @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 4eb62ec..9d75cff 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -8,6 +8,7 @@
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { getpDeptApi, listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -19,9 +20,12 @@
   director: '', // 负责人
   administrationJob: '', // 行政职务
   technologyJob: '', // 技术职务
+  meterMajor: '', // 计量专业
   remark: '', // 备注
-  pDeptId: '',
-  pDeptName: '',
+  pDeptId: '', // 父级
+  pDeptName: '', // 父级
+  isLab: '1', // 是否为实验室
+  labCapacity: [], // 实验室能力
 }) // 表单
 // 展示父级组织
 const pDept = ref({
@@ -33,10 +37,11 @@
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
-  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+  organizeName: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
+  director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: ['blur', 'change'] }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: ['blur', 'change'] }],
+  isLab: [{ required: true, message: '是否为实验室不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 // 获取计量人员列表
@@ -53,13 +58,26 @@
     }
   })
 }
-const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
-// 获取技术职务列表
-const getTechnologyJobList = () => {
+const measureTypeList = ref<dictType[]>([]) // 实验室能力
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+const technologyJobList = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  // 获取技术职务列表
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
+  // 获取检校类型
+  getDictByCode('checkType').then((response) => {
+    measureTypeList.value = response.data
+  })
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
 }
+getDict()
+
 const administrationJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
@@ -91,7 +109,8 @@
           type: 'warning',
         },
       ).then((res) => {
-        updateApi({ ...ruleForm.value, title: undefined }).then((res) => {
+        const form = { ...ruleForm.value, labCapacity: ruleForm.value.labCapacity.join(',') }
+        updateApi(form).then((res) => {
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('提交成功')
@@ -117,6 +136,8 @@
   ruleForm.value.administrationJob = '' // 行政职务
   ruleForm.value.technologyJob = '' // 技术职务
   ruleForm.value.remark = '' // 备注
+  ruleForm.value.isLab = ''
+  ruleForm.value.labCapacity = []
 }
 const multipleTableRef = ref()
 const current = ref('')
@@ -141,7 +162,7 @@
       },
       {
         label: '计量专业',
-        data: 'meterMajor',
+        data: 'meterMajorName',
       },
       {
         label: '创建时间',
@@ -196,7 +217,7 @@
       },
       {
         label: '计量专业',
-        data: 'meterMajor',
+        data: 'meterMajorName',
       },
       {
         label: '创建时间',
@@ -434,10 +455,12 @@
   reset()
   title.value = row.title
   path.value = row.path
+  ruleForm.value = row
   ruleForm.value.organizeType = row.organizeType
   ruleForm.value.deptId = row.deptId
+  ruleForm.value.labCapacity = row.labCapacity ? row.labCapacity.split(',') : []
+  ruleForm.value.meterMajor = row.meterMajor
   getuser()
-  getTechnologyJobList()
   getAdministrationJob()
   getDepartmentList()
   getuserInfoList()
@@ -445,7 +468,6 @@
     getInstrumentInfo()
     getDeviceInfo()
   }
-  ruleForm.value = row
   console.log(row, 'row')
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
@@ -538,6 +560,53 @@
           </el-col>
         </el-row>
         <el-row :gutter="24">
+          <el-col v-if="title.split('-')[1] === '科室'" :span="6">
+            <el-form-item label="是否为实验室" prop="isLab">
+              <el-select v-model="ruleForm.isLab" :placeholder="title.split('-')[2] === '详情' ? '' : ''" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
+                <el-option label="是" value="1" />
+                <el-option label="否" value="0" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="title.split('-')[1] !== '部门'" :span="6">
+            <el-form-item label="计量专业" prop="meterMajor">
+              <el-select
+                v-model.trim="ruleForm.meterMajor"
+                clearable
+                :placeholder="title.split('-')[2] === '详情' ? '' : '请选择'"
+                :disabled="ruleForm.isLab === '0' || title.split('-')[2] === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="title.split('-')[1] === '科室'" :span="12">
+            <el-form-item label="实验室能力" prop="labCapacity">
+              <el-select
+                v-model.trim="ruleForm.labCapacity"
+                clearable
+                multiple
+                :placeholder="title.split('-')[2] === '详情' ? '' : '请选择'"
+                :disabled="ruleForm.isLab === '0' || title.split('-')[2] === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureTypeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
@@ -586,13 +655,5 @@
 </template>
 
 <style lang="scss" scoped>
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      content: "";
-      display: none;
-    }
-  }
-}
+// 样式代码
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index f7fd689..33e63c8 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -66,7 +66,7 @@
     columns: [
       { text: '科室编号', value: 'organizeNo', align: 'center' },
       { text: '科室名称', value: 'organizeName', align: 'center' },
-      { text: '专业', value: 'meterMajor', align: 'center' },
+      { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '技术职务', value: 'technologyJobName', align: 'center' },
       { text: '行政职务', value: 'administrationJobName', align: 'center' },
@@ -79,7 +79,7 @@
     columns: [
       { text: '工程组编号', value: 'organizeNo', align: 'center' },
       { text: '工程组名', value: 'organizeName', align: 'center' },
-      { text: '计量专业', value: 'meterMajor', align: 'center' },
+      { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
       { text: '所属科室', value: 'pDeptName', align: 'center' },
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index f7911fa..0528cc7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -7,7 +7,7 @@
   organizeType?: string // 类型
   createTime?: string // 创建时间
   director?: string // 负责人
-  meterMajor?: string // 专业
+  meterMajor: string // 专业
   pDeptId?: string // 所属科室
   createEndTime?: string
   createStartTime?: string
@@ -45,4 +45,6 @@
   technologyJobName: string
   updateTime: string
   title?: string
+  isLab: string // 是否为实验室
+  labCapacity: string | string[]
 }
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 4941fbb..90c6daf 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -21,25 +21,25 @@
 const total = ref<number>(0)
 const select = ref()
 const columns = ref([
-  {
-    text: '人员编号',
-    value: 'staffNo',
-  },
-  {
-    text: '姓名',
-    value: 'name',
-  },
-  {
-    text: '所在部门',
-    value: 'deptId',
-  },
+  { text: '人员编号', value: 'staffNo', width: '160', fixed: true },
+  { text: '姓名', value: 'name', fixed: true },
+  { text: '所在部门', value: 'deptId' },
+  { text: '学历', value: 'education', align: 'center' },
+  { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  { text: '计量专业', value: 'major', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '技术考核', value: 'technologyExam', align: 'center' },
 ])
 // 获取部门
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
 const deptIdList = ref([])
-const getDeptList = () => {
+const getDeptList = () => { // 获取部门
   getDeptTreeList().then((res) => {
     deptIdList.value = toTreeList(res.data, '0', true)
   })
@@ -50,7 +50,7 @@
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records
-      total.value = Number(res.data.total)
+      total.value = parseInt(res.data.total)
     }
   })
 }
@@ -81,8 +81,8 @@
   }
   search()
 }
-// 点击保存
-const submitForm = () => {
+// 点击确定
+const confirmSelect = () => {
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     getStaffDetail(person).then((res) => {
@@ -143,17 +143,17 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <el-table-column label="#" width="55" align="center">
-          <template #default="scope">
-            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column> -->
+          <!-- <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column> -->
         </template>
       </normal-table>
     </div>
     <template #footer>
       <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
         <el-button @click="resetForm">
           取消
         </el-button>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index d0d3ba2..84dd465 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -6,6 +6,8 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -17,22 +19,15 @@
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref([
-  {
-    text: '姓名',
-    value: 'name',
-  },
-  {
-    text: '账户',
-    value: 'account',
-  },
-  {
-    text: '所在部门',
-    value: 'deptName',
-  },
+const total = ref(0)
+const select = ref(-1)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '姓名', value: 'name' },
+  { text: '账户', value: 'account' },
+  { text: '所在部门', value: 'deptName' },
 ])
+// 所在部门
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
@@ -43,7 +38,7 @@
     deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
-// 获取数据列表
+// 获取人员数据列表
 const fetchData = () => {
   select.value = -1
   getUserList(listQuery.value).then((res) => {
@@ -100,8 +95,8 @@
 const initDialog = () => {
   // reset()
   dialogFormVisible.value = true
-  getDeptList()
-  fetchData()
+  getDeptList() // 获取部门信息
+  fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
 </script>
@@ -135,11 +130,11 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <el-table-column label="#" width="55" align="center">
-          <template #default="scope">
-            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column> -->
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
         </template>
       </normal-table>
     </div>
diff --git a/src/views/measure/train/components/selectMeasurePersonDialog.vue b/src/views/measure/train/components/selectMeasurePersonDialog.vue
new file mode 100644
index 0000000..251b1e5
--- /dev/null
+++ b/src/views/measure/train/components/selectMeasurePersonDialog.vue
@@ -0,0 +1,176 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectMeasurePersonDialog">
+import { ElMessage } from 'element-plus'
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 10,
+  offset: 1,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const singleChecked = ref('') // 单选选中id
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref<TableColumn[]>([
+  { text: '人员编号', value: 'staffNo', width: '160', align: 'center', fixed: true },
+  { text: '姓名', value: 'name', align: 'center', fixed: true },
+  { text: '学历', value: 'education', align: 'center' },
+  { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  { text: '计量专业', value: 'major', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '技术考核', value: 'technologyExam', align: 'center' },
+])
+// 获取部门
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
+const getDeptList = () => { // 获取部门
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records.map((item: any) => {
+        return {
+          ...item,
+          sex: item.sex === '1' ? '男' : '女',
+        }
+      })
+      total.value = parseInt(res.data.total)
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请先选择计量人员')
+  }
+  else {
+    emits('add', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
+      </search-item>
+      <search-item>
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/train/components/selectUser.vue b/src/views/measure/train/components/selectUser.vue
new file mode 100644
index 0000000..67eebdb
--- /dev/null
+++ b/src/views/measure/train/components/selectUser.vue
@@ -0,0 +1,237 @@
+<!-- 选择用户 -->
+<!-- 选择成员 -->
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
+import { getUserList } from '@/api/system/user'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
+})
+const emits = defineEmits(['update:visible', 'change'])
+const table = ref() // 表格ref
+
+// 表格表头
+const columns = ref<TableColumn[]>([
+  { text: '真实姓名', value: 'name', align: 'center' },
+  { text: '所在组织机构', value: 'deptName', align: 'center' },
+])
+
+// 表格数据
+const list = ref<IEmployees[]>([])
+
+const loading = ref(false)
+const total = ref(0)
+// 查询参数
+const listQuery = reactive({
+  keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
+  offset: 1,
+  limit: 10,
+  sort: 'id',
+  deptType: '',
+})
+const checkedList = ref([])
+// 多选的数据
+const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
+const closeDialog = () => {
+  emits('update:visible', false)
+}
+const visibleDialog = computed({
+  get() {
+    return props.visible
+  },
+  set() {
+    closeDialog()
+  },
+})
+
+watch(() => props.visible, (val) => {
+  // 清除上次选中
+  if (!val) {
+    table.value.clearMulti()
+  }
+})
+
+// 点击确定，保存选择的成员配置
+const saveDialog = () => {
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
+}
+
+const select = ref('')
+// 获取列表数据
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
+  getUserList(listQuery).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    loading.value = false
+  })
+}
+
+// 多选
+const multiSelect = (val: any) => {
+  multipleTable.value = val
+}
+
+// 查询数据
+const search = () => {
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
+
+onMounted(() => {
+  // 获取列表数据
+  fetchData(true)
+})
+</script>
+
+<template>
+  <div class="select-emplotees-dialog">
+    <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table-area">
+        <!-- 筛选条件 -->
+        <search-area @search="search">
+          <search-item>
+            <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
+          </search-item>
+        </search-area>
+        <!-- 表头标题 -->
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
+          <!-- 查询结果Table显示 -->
+          <normal-table
+            ref="table"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
+          >
+            <!-- 序号 -->
+            <template #preColumns>
+              <el-table-column label="#" width="55" align="center">
+                <template #default="scope">
+                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
+            </template>
+            <!-- 状态 -->
+            <template #columns>
+              <el-table-column label="状态" align="center" width="80">
+                <template #default="scope">
+                  <el-tag :type="scope.row.statusName === '启用' ? 'success' : 'danger'">
+                    {{ scope.row.statusName }}
+                  </el-tag>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+      <!-- </div> -->
+      <template #footer>
+        <el-button @click="closeDialog">
+          取 消
+        </el-button>
+        <el-button type="primary" @click="saveDialog">
+          确 定
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss">
+@import "@/css/dialog.css";
+
+.chengyuan-dialog {
+  .el-table .cell {
+    white-space: nowrap;
+  }
+
+  .el-dialog__body {
+    display: flex;
+    overflow: auto;
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+.chengyuan-dialog {
+  width: 100%;
+
+  .left-container {
+    white-space: nowrap;
+    height: 100%;
+  }
+
+  .table-area {
+    flex: 1;
+    overflow: auto;
+
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
+    .pagination {
+      margin-top: 10px;
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/train/components/userListDialog.vue b/src/views/measure/train/components/userListDialog.vue
index a1d4bae..20488ca 100644
--- a/src/views/measure/train/components/userListDialog.vue
+++ b/src/views/measure/train/components/userListDialog.vue
@@ -21,18 +21,9 @@
 const total = ref<number>(0)
 const select = ref<number>(-1)
 const columns = ref([
-  {
-    text: '姓名',
-    value: 'name',
-  },
-  {
-    text: '单位名称',
-    value: 'company',
-  },
-  {
-    text: '技术职称',
-    value: 'remark',
-  },
+  { text: '姓名', value: 'name' },
+  { text: '单位名称', value: 'company' },
+  { text: '技术职称', value: 'remark' },
 ])
 const list = ref(props.list || [])
 // 搜索
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index bbac2f4..fad7684 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -55,63 +55,18 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '计划编号',
-    value: 'planNo',
-    align: 'center',
-  },
-  {
-    text: '培训名称',
-    value: 'planName',
-    align: 'center',
-  },
-  {
-    text: '培训对象',
-    value: 'trainPerson',
-    align: 'center',
-  },
-  {
-    text: '培训人数',
-    value: 'trainNumber',
-    align: 'center',
-  },
-  {
-    text: '培训学时',
-    value: 'trainHour',
-    align: 'center',
-  },
-  {
-    text: '培训时间',
-    value: 'trainTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '主管部门',
-    value: 'deptName',
-    align: 'center',
-  },
-  {
-    text: '实施单位',
-    value: 'effectiveCompany',
-    align: 'center',
-  },
-  {
-    text: '培训内容',
-    value: 'trainContent',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'remark',
-    align: 'center',
-  },
+  { text: '计划编号', value: 'planNo', width: '160', align: 'center' },
+  { text: '培训名称', value: 'planName', align: 'center' },
+  { text: '培训对象', value: 'trainPerson', align: 'center' },
+  { text: '培训人数', value: 'trainNumber', align: 'center' },
+  { text: '培训学时', value: 'trainHour', align: 'center' },
+  { text: '培训时间', value: 'trainTime', width: '180', align: 'center' },
+  { text: '主管部门', value: 'deptName', align: 'center' },
+  { text: '实施单位', value: 'effectiveCompany', align: 'center' },
+  { text: '负责人', value: 'director', align: 'center' },
+  { text: '培训内容', value: 'trainContent', align: 'center' },
+  { text: '创建时间', value: 'createTime', width: '180', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -331,8 +286,15 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="190">
+          <el-table-column label="操作" align="center" width="170" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2f4b599..2862696 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -1,26 +1,28 @@
+<!-- 培训计划详情 -->
 <script lang="ts" setup name="PlanAdd">
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import userListDialog from '../person/components/userListDialog.vue'
+import selectMeasurePersonDialog from './components/selectMeasurePersonDialog.vue'
 import type { IaddPersonListType, IformInlineType } from './plan_interface'
+import selectEmployeesDialog from '@/components/dialog/selectEmployeesDialog.vue'
 import DeptSelect from '@/components/DeptSelect/index.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import {
-  getDeptTree,
   getListDetail,
   getListSave,
   getListSubmit,
   getListUpdate,
 } from '@/api/system/plan'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
+const userVisible = ref(false) // 控制选择用户弹框显隐
+const checkedList = ref([]) // 选择的成员
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '详情',
 } // 字典
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -29,12 +31,13 @@
     infoId.value = $route.params.id as string
   }
 }
+// 表单
 const formInline = ref<IformInlineType>({
   createTime: '', // 创建时间
   deptId: '', // 部门id
   deptName: '', // 部门名称
   director: '', // 负责人
-  effectiveCompany: '',
+  effectiveCompany: '', // 实施单位
   id: '', // 主键
   planName: '', // 培训名称
   planNo: '', // 培训编号
@@ -47,27 +50,18 @@
   trainStaffList: [], // 人员信息
   trainTime: '', // 培训时间
 })
-const addId = ref('') // 保存后的id
-const ruleFormRef = ref<FormInstance>()
+const addId = ref('') // 保存后的id-用于提交
+const ruleFormRef = ref<FormInstance>() // 表单ref
+// 人员信息表头
 const columns = [
   { text: '学员名称', value: 'name' },
-  { text: '单位名称', value: 'deptName' },
+  { text: '单位名称', value: 'company' },
   { text: '技术职称', value: 'technologyJob' },
-  { text: '签到时间', value: 'createtime' },
+  { text: '签到时间', value: 'createtime', width: '180' },
 ]
 const dialogVisible = ref(false)
-const addPersonList = ref<IaddPersonListType>({
-  company: '',
-  examResult: '',
-  id: '',
-  name: '',
-  remark: '',
-  signTime: '',
-  staffId: '',
-  technologyJob: '',
-})
 const SelectionList = ref<IaddPersonListType[]>([])
-// 校验规则
+// 表单验证规则
 const rules = ref({
   planNo: [{ required: true, message: '计划编号不能为空', trigger: ['blur', 'change'] }],
   planName: [{ required: true, message: '培训名称不能为空', trigger: ['blur', 'change'] }],
@@ -82,23 +76,40 @@
   effectiveCompany: [{ required: true, message: '实施单位不能为空', trigger: ['blur', 'change'] }],
   director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
   trainContent: [{ required: true, message: '培训内容不能为空', trigger: ['blur', 'change'] }],
-}) // 表单验证规则
+})
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
   $router.back()
 }
-const userListRef = ref()
-// 选择人员
+const userListRef = ref() // 选择人员dialog ref
+// 点击表单中的选择人员
 const selectPerson = () => {
-  userListRef.value.initDialog()
+  // userListRef.value.initDialog()
+  userVisible.value = true
 }
 // 增加行
 const addRow = () => {
-  formInline.value.trainStaffList.push(
-    JSON.parse(JSON.stringify(addPersonList.value)),
-  )
+  const index = formInline.value.trainStaffList.findIndex(item => !item.name)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  if (formInline.value) {
+    formInline.value.trainStaffList.push(
+      {
+        company: '', // 单位名称
+        examResult: '', // 考核结果
+        id: '',
+        name: '', // 学员名称
+        remark: '', // 备注
+        signTime: '', // 签到时间
+        staffId: '', // 任务id
+        technologyJob: '', // 技术职称
+      },
+    )
+  }
 }
 // 记录点击的第几行
 const listIndex = ref(0)
@@ -106,20 +117,14 @@
 const userTrainRef = ref()
 // 选择计量人员
 const handleClick = (index: number) => {
-  listIndex.value = index
+  listIndex.value = index // 选择的第几行
   userTrainRef.value.initDialog()
 }
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
 }
-// // 点击弹窗的完成追加到表格数组中
-// const addPushList = () => {
-//   formInline.value.trainStaffList.push(
-//     JSON.parse(JSON.stringify(addPersonList.value)),
-//   )
-//   handleClose()
-// }
+
 // 删除行
 const deleteList = () => {
   formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
@@ -132,9 +137,10 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 选择完负责人的函数
-const confirmPerson = (object: IaddPersonListType) => {
-  formInline.value.director = object.name
+// 选择完负责人
+const confirmPerson = (val: IaddPersonListType) => {
+  formInline.value.director = val.name
+  userVisible.value = false
 }
 if (infoId.value && infoId.value !== '') {
   getListDetail({ id: infoId.value }).then((res) => {
@@ -142,19 +148,16 @@
   })
 }
 // 选完计量人员
-const confirmTrainPerson = (object: IaddPersonListType) => {
-  formInline.value.trainStaffList[listIndex.value] = object
-  formInline.value.trainStaffList[listIndex.value].staffId = object.id
+const confirmSelectPerson = (val: any) => {
+  formInline.value.trainStaffList[listIndex.value].name = val[0].name // 学员名称
+  formInline.value.trainStaffList[listIndex.value].company = val[0].deptId // 单位名称
+  formInline.value.trainStaffList[listIndex.value].technologyJob = val[0].technologyJob // 技术职称
+  formInline.value.trainStaffList[listIndex.value].staffId = val[0].id // 计量人员表id
 }
 // 点击提交
-const getAddList = async (
-  formEl: FormInstance | undefined,
-  buttonType: string,
-) => {
-  if (!formEl) {
-    return
-  }
-  await formEl.validate((valid, fields) => {
+const submit = async (formEl: FormInstance | undefined, buttonType: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid) => {
     if (valid) {
       ElMessageBox.confirm(`确认${buttonType}吗？`, '提示', {
         confirmButtonText: '确认',
@@ -211,6 +214,7 @@
     }
   })
 }
+// 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
   popTitle: '证书报告模板', // 打印配置页上方的标题
@@ -228,9 +232,7 @@
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
-          @click="
-            getAddList(ruleFormRef, '提交')
-          "
+          @click="submit(ruleFormRef, '提交')"
         >
           提交
         </el-button>
@@ -305,8 +307,8 @@
                 type="datetime"
                 style="width: 100%;"
                 placeholder="培训时间"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -369,12 +371,16 @@
               />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="培训内容:" prop="trainContent">
               <el-input
                 v-model="formInline.trainContent"
                 :placeholder="pageType === 'detail' ? '无' : '请输入培训内容'"
                 :disabled="pageType === 'detail'"
+                type="textarea"
+                autosize
               />
             </el-form-item>
           </el-col>
@@ -416,15 +422,8 @@
           :label="item.text"
           align="center"
         >
-          <template
-            v-if="item.text === '学员名称' && pageType !== 'detail'"
-            #default="scope"
-          >
-            <el-input
-              v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
-              class="input"
-            >
+          <template v-if="item.text === '学员名称' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input">
               <template #append>
                 <el-button
                   v-if="pageType !== 'detail'"
@@ -440,8 +439,14 @@
       </el-table>
     </detail-block>
   </app-container>
-  <!-- 选择用户列表组件 -->
-  <user-list-dialog ref="userListRef" @add="confirmPerson" />
+
   <!-- 选择计量人员组件列表 -->
-  <user-list-dialog ref="userTrainRef" @add="confirmTrainPerson" />
+  <select-measure-person-dialog ref="userTrainRef" @add="confirmSelectPerson" />
+  <!-- 用户弹框 -->
+  <select-employees-dialog
+    v-model:visible="userVisible"
+    v-model:data="checkedList"
+    :multi="false"
+    @change="confirmPerson"
+  />
 </template>
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 1e81f2c..829dcf4 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -112,14 +112,14 @@
 }
 // 新增人员信息对象类型
 export interface IaddPersonListType {
-  company: string
-  examResult: string
+  company: string // 单位名称
+  examResult: string // 考核结果
   id: string
   name: string // 名称
-  remark: string
-  signTime: string
-  staffId: string
-  technologyJob: string
+  remark: string // 备注
+  signTime: string // 签到时间
+  staffId: string // 人员id
+  technologyJob: string // 技术职称
   updateTime?: string // 更新时间
   createTime?: string // 创建时间
 }

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 0b33406..574d62e 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -2,7 +2,7 @@
  * 设备交接单
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuery, ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
 const prefix = '/business/interchange'
 
 // 列表查询
@@ -32,3 +32,40 @@
     data,
   })
 }
+
+// 新增
+export function addInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑
+export function updateInterchangeReceipt(data: any) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getInterchangeReceiptDetail(data: any) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 关联委托书的且是已收入的样品的列表
+export function getSampleList(data: ISampleListQuery) {
+  return request({
+    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..9c21a82 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../index'
-import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -14,27 +14,54 @@
   })
 }
 
+// 任务分发详情
+export function getTaskDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/handOut/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/task/listExport`,
+    url: '/business/labExecutive/handOut/listExport',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 初始化检定流程
+export function init(data: { measureContent: string; orderId: string; sampleId: string }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/handOut/initList',
     method: 'post',
     data,
   })
 }
 
-// 退回
-export function rollbackTask(data) {
+// 收发员任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/execute',
+    method: 'post',
+    data,
+  })
+}
+
+// 实验室编辑实验室检测列表
+export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
+  return request({
+    url: '/business/labExecutive/handOut/updateList',
+    method: 'post',
+    data,
+  })
+}
+
+// 退回(待检测/检测中->退回)
+export function sendBackProcess(data: ISendBack) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -43,7 +70,7 @@
 }
 
 // 实验室收入样品
-export function takeInSample(data) {
+export function takeInSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -51,8 +78,8 @@
   })
 }
 
-// 批量收入样品
-export function batchTakeInSample(data) {
+// 检完样品-手动/批量
+export function overSample(data: { orderId: string; sampleId: string }[]) {
   return request({
     url: `${prefix}/schedule/task/setSchedule`,
     method: 'post',
@@ -60,21 +87,20 @@
   })
 }
 
-// 检完样品
-export function overSample(data) {
+// 我的检测-列表
+export function getMyMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
-// 批量检完样品
-export function batchOverSample(data) {
+// 部门检测-列表
+export function getDeptMeasureList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
-
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 3d34a2b..faecb03 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -51,3 +51,12 @@
     data,
   })
 }
+
+// 获取父级组织
+export function getOrganizeList(data: object) {
+  return request({
+    url: '/meter/organize/list',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index cb0fbc2..8745c27 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -93,6 +93,7 @@
 }
 const columnsChecked: Ref<columnsCheckInfo[]> = ref([])
 const table = ref<InstanceType<typeof ElTable>>()
+const singleChecked = ref('') // 单选选中id
 // 初始化列显示状态
 function initColumnsState() {
   columnsChecked.value = []
@@ -145,6 +146,11 @@
 const handleSelectionChange = (val: any) => {
   emit('multiSelect', val)
 }
+// 单选选中
+const radioChange = () => {
+  const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
+  emit('multiSelect', [checkValue])
+}
 // 清除多选选中
 const clearMulti = () => {
   console.log('清理选中')
@@ -170,7 +176,7 @@
 </script>
 
 <template>
-  <div :class="isMulti ? 'normal-table' : 'single-table'">
+  <div class="normal-table">
     <el-table
       id="print"
       ref="table"
@@ -185,8 +191,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
       <slot name="preColumns" />
+      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+        <template #default="scope">
+          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+        </template>
+      </el-table-column>
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
@@ -213,6 +224,10 @@
 .normal-table {
   width: 100%;
   // 隐藏全选按钮
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
 }
 
 .single-table {
@@ -223,3 +238,11 @@
   }
 }
 </style>
+
+<style lang="scss">
+.normal-table {
+  .el-radio__label {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index be9415b..127d571 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -51,6 +51,8 @@
   name: '', // 姓名
   deptId: '', // 部门
   administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
   limit: 10,
   offset: 1,
 })
@@ -104,6 +106,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
+  listQuery.deptId = props.deptId
   loading.value = true
   getStaffList(listQuery).then((res) => {
     list.value = res.data.records
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 43e42a0..e1c4d7d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,18 +72,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
@@ -106,18 +94,6 @@
         },
       },
       {
-        path: 'interchange/:type/:id?',
-        name: 'InterchangeDetail',
-        component: () => import('@/views/business/schedule/interchange/interchangeEdit.vue'),
-        meta: {
-          title: '设备收发详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/schedule/interchangeList',
-        },
-      },
-      {
         path: 'taskList',
         name: 'TaskList',
         component: () => import('@/views/business/schedule/task/taskList.vue'),
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index f80d0c5..fc787ff 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -3,7 +3,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
-import { rollbackTask } from '@/api/business/task'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { sendBackProcess } from '@/api/business/task'
 
 // 对外暴露的方法： 退回成功
 const emit = defineEmits(['onSuccess'])
@@ -11,11 +12,22 @@
 const dialogVisible = ref(false)
 // 默认表单
 const defaultFormData = {
-  id: '', //
-  comments: '', // 备注
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
 }
 // 表单数据对象
-const formData = reactive({ ...defaultFormData })
+const formData: ISendBack = reactive({
+  id: '', // 实验室检测id
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', //	检定环节，实验室id
+  operateReason: '', // 退回原因
+  orderId: '', // 委托书id
+  sampleId: '', //	样品id
+})
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -25,16 +37,20 @@
 const dataFormRef = ref<FormInstance>()
 // 校验规则
 const rules: FormRules = reactive({
-  comments: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
+  operateReason: [{ required: true, message: '退回原因必填', trigger: ['blur', 'change'] }],
 })
 /**
  * 初始化审批弹窗
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(id: string) {
-  formData.id = id
-  formData.comments = ''
+function initDialog(row: IlabMeasureList) {
+  formData.id = row.id
+  formData.measurePersonId = row.measurePersonId
+  formData.measureSegmentId = row.measureSegmentId
+  formData.orderId = row.orderId
+  formData.sampleId = row.sampleId
+  formData.operateReason = ''
   dialogVisible.value = true
 }
 // 提交表单
@@ -48,11 +64,13 @@
           { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
         ).then(() => {
           btnLoading.value = true
-          rollbackTask(formData).then((res) => {
-            ElMessage.success('操作成功')
-            btnLoading.value = false
-            dialogVisible.value = false
-            emit('onSuccess')
+          sendBackProcess(formData).then((res: { code: number }) => {
+            if (res.code == 200) {
+              ElMessage.success('退回成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            }
           }).catch((_) => {
             btnLoading.value = false
           })
@@ -86,9 +104,9 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" prop="comments">
+          <el-form-item label="请输入退回原因" prop="operateReason">
             <el-input
-              v-model="formData.comments"
+              v-model="formData.operateReason"
               :rows="4"
               show-word-limit
               type="textarea"
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 4d1b5c0..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,46 +6,44 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import DistributeDialog from './../components/distributeDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待检测', value: '1' },
+  { name: '待检测', value: '2' },
   { name: '检测中', value: '3' },
   { name: '检测完', value: '4' },
 ]
-const currentMenu = ref('1') // 当前选中状态
+const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '1', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -59,9 +57,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -81,18 +79,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getDeptMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -112,17 +106,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -228,7 +222,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -300,14 +294,14 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -321,10 +315,10 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 任务分发
               </el-button>
-              <el-button v-if="listQuery.sendState !== '4'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
             </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 800419d..fbe064c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -4,12 +4,12 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { exportTaskList, getTaskList } from '@/api/business/task'
+import { getMyMeasureList } from '@/api/business/task'
 import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -22,28 +22,26 @@
 const currentMenu = ref('2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-const listQuery: Ref<ITaskQuery> = ref({
+const listQuery: Ref<ILabQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '2', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  measureStatus: '2', // 检测状态
   offset: 1,
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
@@ -57,9 +55,9 @@
   { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center', width: '80px' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
@@ -79,18 +77,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待检测', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getMyMeasureList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
+    total.value = res.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -110,10 +104,10 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '2', // 分发状态
-    outState: '', // 超期状态
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    measureStatus: listQuery.value.measureStatus, // 检测状态
     offset: 1,
     limit: 20,
   }
@@ -249,7 +243,7 @@
 
 // 选择按钮变更
 watch(currentMenu, (val: string) => {
-  listQuery.value.sendState = val
+  listQuery.value.measureStatus = val
   fetchData(false)
 })
 
@@ -321,15 +315,15 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.sendState === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
-        <icon-button v-if="listQuery.sendState === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
+        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
@@ -343,13 +337,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="takeIn(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="takeIn(row)">
                 收入
               </el-button>
-              <el-button v-if="listQuery.sendState === '2'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
-              <el-button v-if="listQuery.sendState === '3'" size="small" type="primary" link @click="rollback(row)">
+              <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="rollback(row)">
                 检测完成
               </el-button>
             </template>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 2ebcf8b..f1a3dd8 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -285,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '5' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 026fd77..7b1923a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,3 +1,4 @@
+<!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -6,7 +7,7 @@
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
 import selectOrder from './selectOrder.vue'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
-import selectSample from '@/views/business/schedule/order/selectSample.vue'
+import selectSample from '@/views/business/schedule/interchangeReceipt/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -15,10 +16,16 @@
 import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
 import { listPageApi } from '@/api/system/tool'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -32,11 +39,13 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
   certificationCompanyEmail: '', // 邮编
   reciever: user.name, // 接收人
   recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
   certificationCompanyAddress: '', // 证书单位地址
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
@@ -56,7 +65,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -107,6 +116,7 @@
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
+  signUserId: '', // 用户id
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -167,11 +177,13 @@
     }
   })
 }
+
 // 获取签名数据
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
       minioFileNameAutograph.value = res.data.rows[0].minioFileName
+      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
     }
   })
 }
@@ -207,31 +219,15 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-  }
-}
-
-// ------------------------委托方-----------------------------
-// 点击选择委托方编号
-const handleClickCustomer = () => {
-  customerVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeCustomerVisible = (val: boolean) => {
-  customerVisible.value = val
-}
-// 选好委托方
-const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
-    dataForm.value.fax = getValue.fax // 委托方传真
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
 }
 
@@ -278,6 +274,14 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -290,17 +294,21 @@
           type: 'warning',
         },
       ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
         if (pageType.value === 'edit') { // 编辑
-          // updateOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
         if (pageType.value === 'add') { // 新建
-          // addOrder(params).then(() => {
-          //   ElMessage.success('已保存')
-          //   $router.go(-1)
-          // })
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
         }
       })
     }
@@ -317,22 +325,73 @@
   // 逻辑
 }
 
-// 接收人表单失去焦点--调用签名管理数据
-const receiverBlur = () => {
-  getAutographList()
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
 }
 
-// 表格双击行
-const rowDblclick = (row: ISampleList) => {
-  row.isEdit = true
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
 }
 
 onMounted(async () => {
-  if (pageType.value === 'add') {
-    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
-  }
-  await getDict()
-  getSignatureList()
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+  })
 })
 </script>
 
@@ -430,13 +489,20 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
-                  <el-input
+                  <el-select
                     v-model="dataForm.reciever"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
-                    @blur="receiverBlur"
-                  />
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -459,13 +525,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="handleClickCustomer">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -478,7 +538,19 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="6">
                 <el-form-item label="传真:" prop="fax">
                   <el-input
                     v-model="dataForm.fax"
@@ -497,23 +569,25 @@
                     disabled
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
                   <el-input
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
@@ -532,8 +606,8 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -601,7 +675,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row :gutter="24" class="marg">
+            <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -614,7 +688,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -651,7 +725,6 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
-          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -663,17 +736,7 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="scope.row.specialRequire"
-                placeholder="请输入检定要求"
-                class="input"
-              />
-              <span v-else>{{ scope.row.specialRequire }}</span>
-            </template>
-          </el-table-column>
+          />
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
@@ -719,7 +782,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
     <!-- 标签绑定 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 2d1c1ff..a657382 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,12 +27,14 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
   certificationCompanyEmail: string // 邮编
+  certificationCompanyAddress: string // 证书单位地址
   reciever: string // 接收人
   recieverPhone: string // 接收人电话
-  certificationCompanyAddress: string // 证书单位地址
+  recieverSignFile: string // 接收人签名文件
   customerNo: string // 委托方代码
   customerId: string // 委托方id
   customerName: string // 委托方名称
@@ -70,3 +72,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 查询关联委托方的并且是已收入状态的样品
+export interface ISampleListQuery {
+  customerId: string // 委托方id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 63c364f..0f00a0c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -222,7 +222,15 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirmOrder">
           确定
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
new file mode 100644
index 0000000..efe8cf0
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -0,0 +1,172 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from './receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="true"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 8a06d0e..afc8a7d 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -53,9 +53,9 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
-  { text: '备注', value: 'remark', align: 'center' },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center' },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -153,16 +153,36 @@
   sampleVisible.value = true
 }
 
+// 双击样品表格
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+// 单击样品表格某一行
+const rowClick = (row: ISampleList) => {
+  // row.isEdit = false
+}
+// 点击表头--手填全的行和样品库中选的行退出编辑模式
+const headerClick = () => {
+  list.value.forEach((item) => {
+    if ((item.isEdit && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))) {
+      item.isEdit = true
+    }
+    else {
+      item.isEdit = false
+    }
+  })
+}
+
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
-    list.value = [] // 切换委托方时把样品清单置空
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo // 委托方代码
-    dataForm.value.customerId = getValue.id // 委托方id
-    dataForm.value.customerName = getValue.customerName // 委托方名称
-    dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+    // 切换委托方时把不是手填的样品删了
+    list.value.filter(item => !item.sampleNo)
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.phone = val[0].phone // 委托方电话
+    dataForm.value.customerAddress = val[0].fullAddress // 委托方地址
   }
 }
 
@@ -195,11 +215,22 @@
   checkoutList.value = e
 }
 
+// 检查表格第几行信息未完善
+const checkList = () => {
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 增加行
 const addRow = () => {
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条样品信息')
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`请完善第${result}行样品信息`)
     return
   }
   list.value.push({
@@ -209,7 +240,7 @@
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
     appendixDescn: '', // 附件说明
-    mesureContent: '', // 检定项目
+    measureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
     isExistSample: '0', // 是否存在样品库中 1存在、0不存在
@@ -275,11 +306,12 @@
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
   // 检查表格是否存在增加行信息没有完善的情况
-  const index = list.value.findIndex(item => !item.sampleNo)
-  if (index !== -1 && (!list.value[index].sampleName || !list.value[index].sampleModel || !list.value[index].manufacturingNo || !list.value[index].powerVoltage || !list.value[index].mesureContent)) {
-    ElMessage.warning(`表格第${index + 1}行信息未完善`)
+  const result = checkList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
     return
   }
+  headerClick() // 所有行退出编辑模式
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -564,6 +596,9 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
+          @row-click="rowClick"
+          @header-click="headerClick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -580,15 +615,27 @@
               <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
             </template>
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && item.value !== 'powerVoltage' && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
                 :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
                 :disabled="item.disabled"
                 class="input"
               />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+              <!-- 手动增加行可编辑：附件说明、检定项目、备注 -->
+              <el-input
+                v-if="(item.value === 'appendixDescn' || item.value === 'measureContent' || item.value === 'remark') && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder=" `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <!-- 除电源电压和样品编号另外的行 -->
+              <span v-if="item.value !== 'powerVoltage' && item.value !== 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <!-- 样品编号不可编辑 -->
+              <span v-if="item.value === 'sampleNo' && !scope.row.isEdit">{{ scope.row[item.value] || '系统自动生成' }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit && !scope.row.sampleNo" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
                 <el-option
                   v-for="i in powerVoltageMap"
                   :key="i.value"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 7622ab0..9c1907c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,7 +39,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 7a8ec16..5c14317 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -17,6 +17,7 @@
   orderCode: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   sampleCount: number | string // 样品数量
@@ -57,7 +58,7 @@
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
   appendixDescn: string // 附件说明
-  mesureContent: string // 检定项目
+  measureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
   delId?: string // 删除id
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 61ad34d..2783ee2 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -3,12 +3,23 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['confirmCheckout'])
 // 是否多选
 const multi = ref(false)
 const dialogVisible = ref(false)
 
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
 // 查询条件
 const listQuery = ref<ILabSearchQuery>({
   organizeNo: '', // 实验室编号
@@ -17,15 +28,17 @@
   organizeType: '3', // 组织类型
   director: '', // 负责人
   isLab: '1', // 是否是实验室
-  measureItems: '',
+  createStartTime: '',
+  createEndTime: '',
 })
 
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
-  { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
   { text: '负责人', value: 'director', align: 'center', width: '120' },
-  { text: '检测能力', value: 'measureItems', align: 'center' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
 ])
 // 表格数据
 const list = ref<ILabList[]>([])
@@ -39,41 +52,11 @@
 const singleChecked = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ILabList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-
-  // 模拟数据
-  const response = [
-    { id: '1', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '力学检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '2', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '特种检测实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '3', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '电磁兼容实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '4', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环评实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '5', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '几何量实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '检测中心', organizeType: '3', remark: '' },
-    { id: '6', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '7', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '8', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '9', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '10', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '11', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-    { id: '12', deptId: '1', director: '张三', phone: '1532421', meterMajor: '光学', organizeNo: '121', organizeName: '环境试验实验室', measureItems: '工频耐压、启动电压、净负荷拉力', pDeptId: '', pDeptName: '校准中心', organizeType: '3', remark: '' },
-  ]
-  list.value = response.map((item: ILabList) => {
-    return item
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
   })
-  total.value = 50
   loadingTable.value = false
 }
 // 多选发生改变时
@@ -93,7 +76,8 @@
     organizeType: '3', // 组织类型
     director: '', // 负责人
     isLab: '1', // 是否是实验室
-    measureItems: '',
+    createStartTime: '',
+    createEndTime: '',
   }
 }
 
@@ -156,11 +140,18 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.measureItems"
-            placeholder="检定项目"
+          <el-select
+            v-model.trim="listQuery.meterMajor"
             clearable
-          />
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <div style="padding: 5px 10px;">
@@ -173,6 +164,7 @@
           :is-showmulti-select="multi"
           :is-multi="multi"
           :pagination="false"
+          size="small"
           @multi-select="handleSelectionChange"
         >
           <template v-if="!multi" #preColumns>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
new file mode 100644
index 0000000..d6827e4
--- /dev/null
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts" name="DistributeDialog">
+import processConfig from './processConfig.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { getTaskDetail } from '@/api/business/task'
+// 任务分发弹窗
+
+// 自定义方法：close关闭弹窗
+const emit = defineEmits(['close'])
+const dialogVisible = ref(false) // 弹窗显示
+const sampleId = ref('') // 样品id
+const orderId = ref('') // 委托单id
+
+// 委托书-证书类别列表
+const certificationTypes = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  getDictByCode('certificationType').then((response) => {
+    certificationTypes.value = response.data
+  })
+}
+
+getDict()
+// 样品详情
+const sampleDetail = ref({
+  sampleName: '压力表',
+  mesureContent: '压力、ip68',
+  certifications: ['1', '2'],
+  remark: '这是备注',
+  measureProcessList: [],
+  measureSendBackList: [],
+})
+
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    sampleDetail.value.sampleName = res.data.sampleName
+    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.remark = res.data.remark
+    sampleDetail.value.certifications = res.data.certifications
+    sampleDetail.value.measureProcessList = res.data.measureProcessList
+    sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+  })
+}
+// 初始化弹窗
+const initDialog = (orderid: string, sampleid: string) => {
+  dialogVisible.value = true
+  sampleId.value = sampleid
+  orderId.value = orderid
+  getInfo()
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+  emit('close')
+}
+function cancel() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="任务分发" width="1000" @close="cancel">
+    <div class="simple-info">
+      <div class="simple-info-line">
+        <span class="label">样品名称:</span>
+        <el-input v-model="sampleDetail.sampleName" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">证书类别:</span>
+        <el-checkbox-group v-model="sampleDetail.certifications" disabled>
+          <el-checkbox v-for="item in certificationTypes" :key="item.value" :label="item.value">
+            {{ item.name }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="simple-info-line">
+        <span class="label">检定项目:</span>
+        <el-input v-model="sampleDetail.mesureContent" disabled />
+      </div>
+      <div class="simple-info-line">
+        <span class="label">备注:</span>
+        <el-input v-model="sampleDetail.remark" disabled />
+      </div>
+    </div>
+    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+      批量添加
+    </el-button>
+    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <template #footer>
+      <el-button type="primary" @click="saveProcess">
+        确定
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+//  样式
+.simple-info {
+  margin-top: -10px;
+  margin-bottom: 10px;
+
+  .simple-info-line {
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    .label {
+      width: 90px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/components/lab-interface.ts b/src/views/business/schedule/task/components/lab-interface.ts
index d6355c6..02b0d1d 100644
--- a/src/views/business/schedule/task/components/lab-interface.ts
+++ b/src/views/business/schedule/task/components/lab-interface.ts
@@ -6,7 +6,8 @@
   isLab: '1' // 是否是实验室
   director: string // 负责人
   meterMajor: string // 专业
-  measureItems: string// 检测能力
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
 }
 
 // 部门返回值对象类型
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 4ccab04..1efb8a9 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -1,11 +1,18 @@
 <script setup lang="ts" name="ProcessConfig">
 import { ref } from 'vue'
 import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
 import ProcessNode from './processNode.vue'
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/task'
 const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
   // 是否为详情展示页面
   detail: {
     type: Boolean,
@@ -21,81 +28,35 @@
     type: String,
     required: true,
   },
+  list: {
+    type: Array,
+    default: () => [],
+  },
 })
 const emits = defineEmits(['saveOver'])
 // 默认流程节点
-const defaultProcess = {
-  id: '', // 检测节点id
-  executiveItem: '', // 检测项目
-  executiveDept: '', // 检测部门
-  executiveDeptName: '', // 检测部门
-  executivePerson: '', // 检测人员
-  executivePersonName: '', // 检测人员
-  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-  measureStateName: '', // 检测状态
-  currentCertifications: '', // 当前证书数
-  requireCertifications: '', // 应出具证书数
-  updateTime: '', // 更新时间
-  backPerson: '', // 退回人
-  backReason: '', // 退回原因
-  backTime: '', // 退回时间
-  distributePerson: '', // 分配人
-  distributeTime: '', // 分配时间
-  startTime: '', // 检测开始时间
-  overTime: '', // 检测结束时间
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
 }
 // 检定流程列表
-const processList = ref([
+const processList = ref<IScheduleSet[]>([
   { ...defaultProcess },
 ])
 
-// 获取当前样品检测流程，参数待定
-const fetchProcess = () => {
-  // TODO: 模拟数据
-  processList.value = [
-    {
-      id: '1', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423635973935106', // 检测部门
-      executiveDeptName: '力学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '张三', // 检测人员
-      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待检测', // 检测状态
-      currentCertifications: '0', // 当前证书数
-      requireCertifications: '2', // 应出具证书数
-      updateTime: '2023-02-01 09:00:05', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-    {
-      id: '2', // 检测节点id
-      executiveItem: '', // 检测项目
-      executiveDept: '1601423577505337346', // 检测部门
-      executiveDeptName: '热学实验室', // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '待分配', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
-    },
-  ]
-}
-fetchProcess()
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+})
 
 // 点击添加流程
 const processAdd = () => {
@@ -121,25 +82,17 @@
 // 批量添加实验室
 const batchChooseOver = (labs: ILabList[]) => {
   for (const item of labs) {
-    const processTemp = {
-      id: '',
-      executiveItem: '', // 检测项目
-      executiveDept: item.deptId, // 检测部门
-      executiveDeptName: item.organizeName, // 检测部门
-      executivePerson: '', // 检测人员
-      executivePersonName: '', // 检测人员
-      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-      measureStateName: '', // 检测状态
-      currentCertifications: '', // 当前证书数
-      requireCertifications: '', // 应出具证书数
-      updateTime: '', // 更新时间
-      backPerson: '', // 退回人
-      backReason: '', // 退回原因
-      backTime: '', // 退回时间
-      distributePerson: '', // 分配人
-      distributeTime: '', // 分配时间
-      startTime: '', // 检测开始时间
-      overTime: '', // 检测结束时间
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
     }
     processList.value.push(processTemp)
   }
@@ -147,9 +100,24 @@
 
 // 保存流程
 const saveProcess = () => {
-  // TODO: 保存流程
-  console.log(processList.value)
-  emits('saveOver')
+  const form = {
+    measureProcessList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  console.log(form)
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
 }
 // 删除流程
 const deleteProcess = (index: number) => {
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index 6cbdf10..31dfae4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -12,24 +12,16 @@
     type: Object,
     default: () => {
       return {
-        id: '', // 检测节点id
-        executiveItem: '', // 检测项目
-        executiveDept: '', // 检测部门
-        executiveDeptName: '', // 检测部门
-        executivePerson: '', // 检测人员
-        executivePersonName: '', // 检测人员
-        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
-        measureStateName: '', // 检测状态
-        currentCertifications: '', // 当前证书数
-        requireCertifications: '', // 应出具证书数
-        updateTime: '', // 更新时间
-        backPerson: '', // 退回人
-        backReason: '', // 退回原因
-        backTime: '', // 退回时间
-        distributePerson: '', // 分配人
-        distributeTime: '', // 分配时间
-        startTime: '', // 检测开始时间
-        overTime: '', // 检测结束时间
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
       }
     },
   },
@@ -56,22 +48,23 @@
 })
 // 检定环节可编辑-只有待分发状态可编辑
 const deptEdit = computed(() => {
-  return processNodeData.value.measureState == '0'
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 检定人可编辑-待分配状态可编辑
 const personEdit = computed(() => {
-  const editStates = ['0', '1']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 证书可编辑-待分发、待分配、待检测状态可编辑
 const certificationEdit = computed(() => {
-  const editStates = ['0', '1', '2']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 // 节点可移动
 const canMove = computed(() => {
-  const editStates = ['0']
-  return editStates.includes(processNodeData.value.measureState)
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
 })
 
 // 选择实验室
@@ -82,8 +75,8 @@
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
   console.log(lab)
-  processNodeData.value.executiveDept = lab.deptId
-  processNodeData.value.executiveDeptName = lab.organizeName
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
 }
 
 // 选择人员
@@ -93,8 +86,8 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
-  processNodeData.value.executivePerson = person.id
-  processNodeData.value.executivePersonName = person.name
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
 }
 
@@ -122,7 +115,7 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit">
           <template v-if="deptEdit" #append>
             <el-button :icon="Aim" size="small" link @click="clickChoose" />
           </template>
@@ -130,7 +123,7 @@
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit">
           <template v-if="personEdit" #append>
             <el-button :icon="Aim" size="small" link @click="choosePerson" />
           </template>
@@ -140,7 +133,7 @@
         <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
       <div class="line">
-        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
       </div>
       <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
@@ -149,7 +142,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
+    <select-staff-dialog v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 1d02839..493fbba 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,5 +1,3 @@
-import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
-
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -8,12 +6,29 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
   offset: number
 }
 
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
 // 任务列表-返回值
 export interface ITaskList {
   orderId: string // 委托书编号
@@ -25,41 +40,127 @@
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
-  isUrgent: string // 是否加急
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
   requireOverTime: string // 应检完时间
-  sampleAttr: string // 样品属性
-  sampleAttrName: string // 样品属性
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
   currentMeasureState: string // 当前检定环节
   currentMeasureStateName: string // 当前检定环节
-  currentCertifications: number // 已出具证书总数
+  alreadyCertifications: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
-  distributeStateName: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
 }
 
-// 检测流程节点
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+}
+
+// 全部检测流程节点
 export interface ISchedule {
-  executivePerson: string // 执行人
-  executivePersonName: string // 执行人名称
-  executiveDept: string // 执行部门
-  executiveDeptName: string // 执行部门名称
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
   executiveItem: string // 检定项目
-  currentCertifications?: number // 已出具证书总数
+  alreadyCertifications?: number // 已出具证书总数
   requireCertifications: number // 应出具证书总数
-  measureState: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
   updateTime: string // 流程更新时间
-  backTime: string // 退回时间
-  backReason: string // 退回原因
-  backPerson: string // 退回人
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
   distributePerson: string // 分配人
   distributeTime: string // 分配时间
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
 
 // 样品检测信息
-export interface ISampleMeasure extends ISampleEdit {
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
   orderId: string // 委托单id
+  orderCode: string // 委托单编号
   certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
 }
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 465b2e7..547ee3e 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -1,28 +1,27 @@
 <!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
 import ProcessConfig from './components/processConfig.vue'
-import type { ISampleMeasure } from './task-interface'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
 import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getTaskDetail } from '@/api/business/task'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 interface dictType {
   id: string
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // 样品详情id
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -39,32 +38,49 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleMeasure> = ref({
-  id: '',
-  orderId: '', // 委托单id
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
   manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
   postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
   manufacturer: '', // 生产厂家
   manufacturerCountry: '', // 厂家国别
   manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  deliverer: '', // 送检人
-  delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
   remark: '', // 备注
   minioFileName: '', // 说明书
   labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-  certifications: '',
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
 })
 const ruleFormRef = ref<FormInstance>()
 
@@ -143,14 +159,6 @@
   return menu.find(item => item.name === currentMenu.value)
 })
 
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
 const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
@@ -181,11 +189,9 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(dataForm.value).then((res) => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -195,42 +201,23 @@
     }
   })
 }
-
-// 获取样品详情
+//
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
 const getInfo = () => {
-  // getSapmleDetail({ id: infoId.value }).then((res) => {
-  dataForm.value = {
-    orderId: '123',
-    ABC: 'A',
-    companyAddress: '北京/北京市',
-    customerName: '京东集团',
-    customerNo: 'sygf202211290001',
-    id: '111111',
-    labelBind: '11222',
-    manufacturer: '北京某厂家',
-    manufacturerCountry: 'CN',
-    manufacturingDate: '2023-03',
-    manufacturingNo: '123121',
-    mesureCategory: '',
-    mesureContent: '项目1',
-    mesurePeriod: '1',
-    mesureType: '',
-    minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-    phone: '950618',
-    postalCode: 'test',
-    remark: '无备注',
-    sampleModel: '型号1',
-    sampleName: '样品1',
-    sampleNo: '123456',
-    measureResultCode: 'bhg',
-    deliverer: '张三',
-    delivererTel: '156254577545',
-    certifications: '1',
-  }
-  // for (const item of menu) {
-  //   item.searchFunc()
-  // }
-  // })
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList
+    taskForm.value.measureSendBackList = res.data.measureSendBackList
+  })
 }
 
 // 点击标签绑定的扫描
@@ -260,7 +247,7 @@
     fd.append('multipartFile', event.target.files[0])
     // UploadFile(fd).then((res) => {
     //   if (res.code === 200) {
-    //     dataForm.value.minioFileName = res.data[0]
+    //     sampleForm.value.minioFileName = res.data[0]
     //     // 重置当前验证
     //     ElMessage.success('文件上传成功')
     //   }
@@ -273,18 +260,30 @@
 const upload = () => {
   fileRef.value.click()
 }
-// 获取样品详情
-getInfo()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.role) {
+  roleType.value = $route.params.role as string // 使用角色
+
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+    getSampleInfo()
+  }
+}
 </script>
 
 <template>
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -294,7 +293,7 @@
       <div id="form">
         <el-form
           ref="ruleFormRef"
-          :model="dataForm"
+          :model="sampleForm"
           :label-width="120"
           label-position="right"
           :rules="rules"
@@ -303,9 +302,9 @@
             <el-col :span="6">
               <el-form-item label="样品编号:" prop="sampleNo">
                 <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -313,9 +312,9 @@
             <el-col :span="6">
               <el-form-item label="样品名称:" prop="sampleName">
                 <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -323,9 +322,9 @@
             <el-col :span="6">
               <el-form-item label="样品型号:" prop="sampleModel">
                 <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -333,9 +332,9 @@
             <el-col :span="6">
               <el-form-item label="出厂编号:" prop="manufacturingNo">
                 <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -343,9 +342,9 @@
             <el-col :span="6">
               <el-form-item label="委托方代码" prop="customerNo">
                 <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -353,9 +352,9 @@
             <el-col :span="6">
               <el-form-item label="委托方名称" prop="customerName">
                 <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -363,9 +362,9 @@
             <el-col :span="6">
               <el-form-item label="委托方电话" prop="phone">
                 <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -373,9 +372,9 @@
             <el-col :span="6">
               <el-form-item label="委托方邮编" prop="postalCode">
                 <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -383,11 +382,11 @@
             <el-col :span="18">
               <el-form-item label="委托方地址:" prop="companyAddress">
                 <el-input
-                  v-model="dataForm.companyAddress"
+                  v-model="sampleForm.customerAddress"
                   type="textarea"
                   autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -395,9 +394,9 @@
             <el-col :span="6">
               <el-form-item label="校检类别:">
                 <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
@@ -407,19 +406,19 @@
             <el-col :span="6">
               <el-form-item label="生产厂家:">
                 <el-input
-                  v-model="dataForm.manufacturer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="厂家国别:">
                 <el-select
-                  v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
@@ -429,23 +428,23 @@
             <el-col :span="6">
               <el-form-item label="出厂年月:">
                 <el-date-picker
-                  v-model="dataForm.manufacturingDate"
+                  v-model="sampleForm.manufacturingDate"
                   type="month"
                   format="YYYY-MM"
                   value-format="YYYY-MM"
                   class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="ABC:">
                 <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
@@ -455,9 +454,9 @@
             <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -465,9 +464,9 @@
             <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
-                  v-model="dataForm.delivererTel"
-                  :placeholder="pageType === 'detail' ? '' : ''"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                   disabled
                 />
               </el-form-item>
@@ -475,49 +474,20 @@
             <el-col :span="24">
               <el-form-item label="检定项目:" prop="mesureContent">
                 <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定周期（月）:">
                 <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="上次检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item v-if="pageType === 'detail'" label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  disabled
-                  class="full-width-input"
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
                 />
               </el-form-item>
             </el-col>
@@ -526,21 +496,21 @@
             <el-col :span="24">
               <el-form-item label="备注:">
                 <el-input
-                  v-model="dataForm.remark"
+                  v-model="sampleForm.remark"
                   type="textarea"
                   :rows="2"
-                  :placeholder="pageType === 'detail' ? '' : ''"
+                  :placeholder="roleType === 'detail' ? '' : ''"
                   disabled
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
-                  v-model="dataForm.mesureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
@@ -550,10 +520,10 @@
             <el-col :span="6">
               <el-form-item label="标签绑定:">
                 <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
                 >
                   <template #append>
                     <el-button>扫描</el-button>
@@ -565,11 +535,11 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="14">
               <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
             </el-col>
@@ -586,7 +556,7 @@
           保存
         </el-button>
       </template>
-      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
@@ -604,11 +574,11 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="dataForm.id!" :order-id="dataForm.orderId" />
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
       <!-- 检定记录 -->
-      <measure-records v-if="currentMenu === '检定记录'" :sample-id="dataForm.id!" />
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
-      <certification-records v-if="currentMenu === '检定证书'" :sample-id="dataForm.id!" />
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index f784804..461c518 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -31,7 +31,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
+  sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
   sampleStatus: '2', // 样品状态:默认待分发
@@ -39,30 +39,30 @@
   limit: 20,
 })
 // --------------获取所需字典值----------------
-const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
   getDictByCode('sampleBelong').then((response) => {
-    sampleAttrList.value = response.data
+    sampleBelongList.value = response.data
   })
 }
 getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: ITaskList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: ITaskList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '110px' },
-  { text: '样品属性', value: 'sampleAttrName', align: 'center' },
-  { text: '当前检定环节', value: 'currentMeasureStateName', align: 'center' },
-  { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
-  { text: '分发性质', value: 'distributeState', align: 'center', width: '90px' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
+  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return row.alreadyCertifications ? `${row.alreadyCertifications}/${row.requireCertifications}` : '0/0' } },
+  { text: '分发性质', value: 'handOutProperty', align: 'center', width: '90px' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -80,15 +80,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // // 模拟数据
-  // list.value = [
-  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  // ]
-  // loadingTable.value = false
-  // console.log(listQuery.value)
   getTaskList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: ITaskList) => {
+      item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
+      return item
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -111,15 +107,17 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
+    sampleBelong: '', // 样品属性
     sampleStatus: '2', // 分发状态
+    startTime: '', //	应检定开始时间
+    endTime: '', //	应检定结束时间
     offset: 1,
     limit: 20,
   }
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
@@ -271,8 +269,8 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
-          <el-option v-for="item in sampleAttrList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
+          <el-option v-for="item in sampleBelongList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue
index 629b33c..2300f4c 100644
--- a/src/views/customer/advice/adviceEdit.vue
+++ b/src/views/customer/advice/adviceEdit.vue
@@ -51,7 +51,7 @@
 const companyInfo: SimpleCompany = reactive({
   customerName: '', // 公司名称
   customerNo: '', //	客户编号
-  customerId: '', // 客户id
+  id: '', // 客户id
   grade: '', // 履约评级
   gradeName: '', // 履约评级
   companySize: '', // 公司规模
@@ -121,12 +121,13 @@
   const item = select as SimpleCompany
   companyInfo.customerName = item.customerName
   companyInfo.customerNo = item.customerNo
-  companyInfo.customerId = item.customerId
+  companyInfo.id = item.id
   companyInfo.gradeName = item.gradeName
   companyInfo.companySizeName = item.companySizeName
   companyInfo.businessSizeName = item.businessSizeName
   companyInfo.evaluationName = item.evaluationName
   dataForm.value.customerNo = item.customerNo
+  dataForm.value.customerId = item.id
 }
 // 打印表单
 const printObj = ref({
@@ -154,8 +155,6 @@
         if (dataForm.value.id) {
           updateAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
@@ -164,8 +163,6 @@
         else {
           addAdvice(dataForm.value).then((res) => {
             if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
               ElMessage.success('已保存')
               $router.go(-1)
             }
diff --git a/src/views/customer/advice/advice_interface.ts b/src/views/customer/advice/advice_interface.ts
index b08f85b..a8bf311 100644
--- a/src/views/customer/advice/advice_interface.ts
+++ b/src/views/customer/advice/advice_interface.ts
@@ -40,9 +40,10 @@
 
 // 公司简易
 export interface SimpleCompany {
+  id: string // 客户id
   customerName: string // 公司名称
   customerNo: string //	客户编号
-  customerId: string // 客户id
+  grade: string // 履约评级
   gradeName: string // 履约评级
   companySizeName: string // 公司规模
   businessSizeName: string // 业务规模
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index f9ee314..4893c4f 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -26,6 +26,7 @@
 const visible = ref(false) // 控制对话框显隐
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -54,17 +55,7 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
-})
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
+})// 表单
 const ruleFormRef = ref<FormInstance>()
 
 // 自定义校验规则--检定周期为正整数
@@ -111,6 +102,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -479,7 +474,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index aceea6a..abcada5 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -36,7 +36,14 @@
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
-  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: ISampleList) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ISampleList[]>([])
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index aafed2a..256ed9f 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -24,6 +24,7 @@
   measurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
   remark: string // 备注
+  validDeadline?: string // 证书过期时间
 }
 
 export interface ISampleEdit {
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index 3b03275..d04456b 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -163,7 +163,7 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
+          <el-select v-model="listQuery.businessSize" placeholder="业务规模">
             <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
@@ -183,7 +183,16 @@
         :is-multi="false"
         @change="changePage"
         @multiSelect="handleSelectionChange"
-      />
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
       <template #footer>
         <el-button type="primary" @click="clickConfirm">
           确定
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 59f2feb..4deeed8 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -20,18 +20,9 @@
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
-const powerVoltageMap = [
-  {
-    name: '110V',
-    value: '110V',
-  },
-  {
-    name: '220V',
-    value: '220V',
-  },
-]// 电源电压
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
 
 const dataForm: Ref<ISampleDetail> = ref({
   id: '',
@@ -74,6 +65,10 @@
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
   })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
 }
 getDict()
 
@@ -358,7 +353,7 @@
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
-                  <el-option v-for="item of powerVoltageMap" :key="item.value" :label="item.name" :value="item.value" />
+                  <el-option v-for="item of powerVoltageList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 05fe276..7251eda 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -4,12 +4,16 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOvertimeList, IOvertimeListQuery } from './overtime_list_interface'
+import { ITEM_RENDER_EVT } from 'element-plus/es/components/virtual-list/src/defaults'
+import type { IOvertimeList, IOvertimeListQuery, dictType } from './overtime_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportSapmleList, getSampleList } from '@/api/customer/sampleList'
+import { getDictByCode } from '@/api/system/dict'
+
 const { proxy } = getCurrentInstance() as any
+const certificationStatusMap = ref<dictType[]>([]) as any // 证书状况
 const $router = useRouter()
 
 // 查询条件
@@ -25,12 +29,7 @@
   offset: 1,
   limit: 20,
 })
-// 证书状况字典
-const certificationStatusMap = {
-  0: '未超期',
-  1: '即将超期',
-  2: '已超期',
-}
+
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
@@ -42,7 +41,13 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
-  { text: '证书状况', value: 'certificationStatus', align: 'center' },
+  {
+    text: '证书状况',
+    value: 'certificationStatus',
+    align: 'center',
+    width: '90px',
+    styleFilter: (row: IOvertimeList) => { return row.certificationStatus === '即将超期' ? 'color: red' : '' },
+  },
 ])
 // 表格数据
 const list = ref<IOvertimeList[]>([])
@@ -53,6 +58,16 @@
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
+// 获取字典值
+async function getDict() {
+  // 证书状况
+  const res = await getDictByCode('certificationStatus')
+  // 证书状况字典 {1：即将过期}
+  res.data.forEach((item: any) => {
+    certificationStatusMap.value[`${item.value}`] = item.name
+  })
+}
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -63,7 +78,12 @@
   listQuery.value.startTime = timeRange.value[0] as string || ''
   listQuery.value.endTime = timeRange.value[1] as string || ''
   getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: IOvertimeList) => {
+      return {
+        ...item,
+        certificationStatus: certificationStatusMap.value[item.certificationStatus],
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -161,7 +181,10 @@
   }
 }
 
-fetchData(true)
+onMounted(async () => {
+  await getDict()
+  fetchData(true)
+})
 </script>
 
 <template>
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 519f0af..cceb09b 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -135,7 +135,7 @@
         @multiSelect="handleSelectionChange"
       >
         <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 4eb62ec..9d75cff 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -8,6 +8,7 @@
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { getpDeptApi, listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -19,9 +20,12 @@
   director: '', // 负责人
   administrationJob: '', // 行政职务
   technologyJob: '', // 技术职务
+  meterMajor: '', // 计量专业
   remark: '', // 备注
-  pDeptId: '',
-  pDeptName: '',
+  pDeptId: '', // 父级
+  pDeptName: '', // 父级
+  isLab: '1', // 是否为实验室
+  labCapacity: [], // 实验室能力
 }) // 表单
 // 展示父级组织
 const pDept = ref({
@@ -33,10 +37,11 @@
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
-  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+  organizeName: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
+  director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: ['blur', 'change'] }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: ['blur', 'change'] }],
+  isLab: [{ required: true, message: '是否为实验室不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 // 获取计量人员列表
@@ -53,13 +58,26 @@
     }
   })
 }
-const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
-// 获取技术职务列表
-const getTechnologyJobList = () => {
+const measureTypeList = ref<dictType[]>([]) // 实验室能力
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+const technologyJobList = ref<dictType[]>([])
+// 获取字典值
+function getDict() {
+  // 获取技术职务列表
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
+  // 获取检校类型
+  getDictByCode('checkType').then((response) => {
+    measureTypeList.value = response.data
+  })
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
 }
+getDict()
+
 const administrationJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
@@ -91,7 +109,8 @@
           type: 'warning',
         },
       ).then((res) => {
-        updateApi({ ...ruleForm.value, title: undefined }).then((res) => {
+        const form = { ...ruleForm.value, labCapacity: ruleForm.value.labCapacity.join(',') }
+        updateApi(form).then((res) => {
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('提交成功')
@@ -117,6 +136,8 @@
   ruleForm.value.administrationJob = '' // 行政职务
   ruleForm.value.technologyJob = '' // 技术职务
   ruleForm.value.remark = '' // 备注
+  ruleForm.value.isLab = ''
+  ruleForm.value.labCapacity = []
 }
 const multipleTableRef = ref()
 const current = ref('')
@@ -141,7 +162,7 @@
       },
       {
         label: '计量专业',
-        data: 'meterMajor',
+        data: 'meterMajorName',
       },
       {
         label: '创建时间',
@@ -196,7 +217,7 @@
       },
       {
         label: '计量专业',
-        data: 'meterMajor',
+        data: 'meterMajorName',
       },
       {
         label: '创建时间',
@@ -434,10 +455,12 @@
   reset()
   title.value = row.title
   path.value = row.path
+  ruleForm.value = row
   ruleForm.value.organizeType = row.organizeType
   ruleForm.value.deptId = row.deptId
+  ruleForm.value.labCapacity = row.labCapacity ? row.labCapacity.split(',') : []
+  ruleForm.value.meterMajor = row.meterMajor
   getuser()
-  getTechnologyJobList()
   getAdministrationJob()
   getDepartmentList()
   getuserInfoList()
@@ -445,7 +468,6 @@
     getInstrumentInfo()
     getDeviceInfo()
   }
-  ruleForm.value = row
   console.log(row, 'row')
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
@@ -538,6 +560,53 @@
           </el-col>
         </el-row>
         <el-row :gutter="24">
+          <el-col v-if="title.split('-')[1] === '科室'" :span="6">
+            <el-form-item label="是否为实验室" prop="isLab">
+              <el-select v-model="ruleForm.isLab" :placeholder="title.split('-')[2] === '详情' ? '' : ''" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
+                <el-option label="是" value="1" />
+                <el-option label="否" value="0" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="title.split('-')[1] !== '部门'" :span="6">
+            <el-form-item label="计量专业" prop="meterMajor">
+              <el-select
+                v-model.trim="ruleForm.meterMajor"
+                clearable
+                :placeholder="title.split('-')[2] === '详情' ? '' : '请选择'"
+                :disabled="ruleForm.isLab === '0' || title.split('-')[2] === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="title.split('-')[1] === '科室'" :span="12">
+            <el-form-item label="实验室能力" prop="labCapacity">
+              <el-select
+                v-model.trim="ruleForm.labCapacity"
+                clearable
+                multiple
+                :placeholder="title.split('-')[2] === '详情' ? '' : '请选择'"
+                :disabled="ruleForm.isLab === '0' || title.split('-')[2] === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureTypeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
@@ -586,13 +655,5 @@
 </template>
 
 <style lang="scss" scoped>
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      content: "";
-      display: none;
-    }
-  }
-}
+// 样式代码
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index f7fd689..33e63c8 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -66,7 +66,7 @@
     columns: [
       { text: '科室编号', value: 'organizeNo', align: 'center' },
       { text: '科室名称', value: 'organizeName', align: 'center' },
-      { text: '专业', value: 'meterMajor', align: 'center' },
+      { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '技术职务', value: 'technologyJobName', align: 'center' },
       { text: '行政职务', value: 'administrationJobName', align: 'center' },
@@ -79,7 +79,7 @@
     columns: [
       { text: '工程组编号', value: 'organizeNo', align: 'center' },
       { text: '工程组名', value: 'organizeName', align: 'center' },
-      { text: '计量专业', value: 'meterMajor', align: 'center' },
+      { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
       { text: '所属科室', value: 'pDeptName', align: 'center' },
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index f7911fa..0528cc7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -7,7 +7,7 @@
   organizeType?: string // 类型
   createTime?: string // 创建时间
   director?: string // 负责人
-  meterMajor?: string // 专业
+  meterMajor: string // 专业
   pDeptId?: string // 所属科室
   createEndTime?: string
   createStartTime?: string
@@ -45,4 +45,6 @@
   technologyJobName: string
   updateTime: string
   title?: string
+  isLab: string // 是否为实验室
+  labCapacity: string | string[]
 }
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 4941fbb..90c6daf 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -21,25 +21,25 @@
 const total = ref<number>(0)
 const select = ref()
 const columns = ref([
-  {
-    text: '人员编号',
-    value: 'staffNo',
-  },
-  {
-    text: '姓名',
-    value: 'name',
-  },
-  {
-    text: '所在部门',
-    value: 'deptId',
-  },
+  { text: '人员编号', value: 'staffNo', width: '160', fixed: true },
+  { text: '姓名', value: 'name', fixed: true },
+  { text: '所在部门', value: 'deptId' },
+  { text: '学历', value: 'education', align: 'center' },
+  { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  { text: '计量专业', value: 'major', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '技术考核', value: 'technologyExam', align: 'center' },
 ])
 // 获取部门
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
 const deptIdList = ref([])
-const getDeptList = () => {
+const getDeptList = () => { // 获取部门
   getDeptTreeList().then((res) => {
     deptIdList.value = toTreeList(res.data, '0', true)
   })
@@ -50,7 +50,7 @@
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records
-      total.value = Number(res.data.total)
+      total.value = parseInt(res.data.total)
     }
   })
 }
@@ -81,8 +81,8 @@
   }
   search()
 }
-// 点击保存
-const submitForm = () => {
+// 点击确定
+const confirmSelect = () => {
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     getStaffDetail(person).then((res) => {
@@ -143,17 +143,17 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <el-table-column label="#" width="55" align="center">
-          <template #default="scope">
-            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column> -->
+          <!-- <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column> -->
         </template>
       </normal-table>
     </div>
     <template #footer>
       <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
         <el-button @click="resetForm">
           取消
         </el-button>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index d0d3ba2..84dd465 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -6,6 +6,8 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -17,22 +19,15 @@
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref([
-  {
-    text: '姓名',
-    value: 'name',
-  },
-  {
-    text: '账户',
-    value: 'account',
-  },
-  {
-    text: '所在部门',
-    value: 'deptName',
-  },
+const total = ref(0)
+const select = ref(-1)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '姓名', value: 'name' },
+  { text: '账户', value: 'account' },
+  { text: '所在部门', value: 'deptName' },
 ])
+// 所在部门
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
@@ -43,7 +38,7 @@
     deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
-// 获取数据列表
+// 获取人员数据列表
 const fetchData = () => {
   select.value = -1
   getUserList(listQuery.value).then((res) => {
@@ -100,8 +95,8 @@
 const initDialog = () => {
   // reset()
   dialogFormVisible.value = true
-  getDeptList()
-  fetchData()
+  getDeptList() // 获取部门信息
+  fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
 </script>
@@ -135,11 +130,11 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <el-table-column label="#" width="55" align="center">
-          <template #default="scope">
-            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column> -->
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
         </template>
       </normal-table>
     </div>
diff --git a/src/views/measure/train/components/selectMeasurePersonDialog.vue b/src/views/measure/train/components/selectMeasurePersonDialog.vue
new file mode 100644
index 0000000..251b1e5
--- /dev/null
+++ b/src/views/measure/train/components/selectMeasurePersonDialog.vue
@@ -0,0 +1,176 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectMeasurePersonDialog">
+import { ElMessage } from 'element-plus'
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 10,
+  offset: 1,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const singleChecked = ref('') // 单选选中id
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref<TableColumn[]>([
+  { text: '人员编号', value: 'staffNo', width: '160', align: 'center', fixed: true },
+  { text: '姓名', value: 'name', align: 'center', fixed: true },
+  { text: '学历', value: 'education', align: 'center' },
+  { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  { text: '计量专业', value: 'major', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '技术考核', value: 'technologyExam', align: 'center' },
+])
+// 获取部门
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
+const getDeptList = () => { // 获取部门
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records.map((item: any) => {
+        return {
+          ...item,
+          sex: item.sex === '1' ? '男' : '女',
+        }
+      })
+      total.value = parseInt(res.data.total)
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请先选择计量人员')
+  }
+  else {
+    emits('add', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
+      </search-item>
+      <search-item>
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/train/components/selectUser.vue b/src/views/measure/train/components/selectUser.vue
new file mode 100644
index 0000000..67eebdb
--- /dev/null
+++ b/src/views/measure/train/components/selectUser.vue
@@ -0,0 +1,237 @@
+<!-- 选择用户 -->
+<!-- 选择成员 -->
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
+import { getUserList } from '@/api/system/user'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
+})
+const emits = defineEmits(['update:visible', 'change'])
+const table = ref() // 表格ref
+
+// 表格表头
+const columns = ref<TableColumn[]>([
+  { text: '真实姓名', value: 'name', align: 'center' },
+  { text: '所在组织机构', value: 'deptName', align: 'center' },
+])
+
+// 表格数据
+const list = ref<IEmployees[]>([])
+
+const loading = ref(false)
+const total = ref(0)
+// 查询参数
+const listQuery = reactive({
+  keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
+  offset: 1,
+  limit: 10,
+  sort: 'id',
+  deptType: '',
+})
+const checkedList = ref([])
+// 多选的数据
+const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
+const closeDialog = () => {
+  emits('update:visible', false)
+}
+const visibleDialog = computed({
+  get() {
+    return props.visible
+  },
+  set() {
+    closeDialog()
+  },
+})
+
+watch(() => props.visible, (val) => {
+  // 清除上次选中
+  if (!val) {
+    table.value.clearMulti()
+  }
+})
+
+// 点击确定，保存选择的成员配置
+const saveDialog = () => {
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
+}
+
+const select = ref('')
+// 获取列表数据
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
+  getUserList(listQuery).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    loading.value = false
+  })
+}
+
+// 多选
+const multiSelect = (val: any) => {
+  multipleTable.value = val
+}
+
+// 查询数据
+const search = () => {
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
+
+onMounted(() => {
+  // 获取列表数据
+  fetchData(true)
+})
+</script>
+
+<template>
+  <div class="select-emplotees-dialog">
+    <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table-area">
+        <!-- 筛选条件 -->
+        <search-area @search="search">
+          <search-item>
+            <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
+          </search-item>
+        </search-area>
+        <!-- 表头标题 -->
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
+          <!-- 查询结果Table显示 -->
+          <normal-table
+            ref="table"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
+          >
+            <!-- 序号 -->
+            <template #preColumns>
+              <el-table-column label="#" width="55" align="center">
+                <template #default="scope">
+                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
+            </template>
+            <!-- 状态 -->
+            <template #columns>
+              <el-table-column label="状态" align="center" width="80">
+                <template #default="scope">
+                  <el-tag :type="scope.row.statusName === '启用' ? 'success' : 'danger'">
+                    {{ scope.row.statusName }}
+                  </el-tag>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+      <!-- </div> -->
+      <template #footer>
+        <el-button @click="closeDialog">
+          取 消
+        </el-button>
+        <el-button type="primary" @click="saveDialog">
+          确 定
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss">
+@import "@/css/dialog.css";
+
+.chengyuan-dialog {
+  .el-table .cell {
+    white-space: nowrap;
+  }
+
+  .el-dialog__body {
+    display: flex;
+    overflow: auto;
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+.chengyuan-dialog {
+  width: 100%;
+
+  .left-container {
+    white-space: nowrap;
+    height: 100%;
+  }
+
+  .table-area {
+    flex: 1;
+    overflow: auto;
+
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
+    .pagination {
+      margin-top: 10px;
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/train/components/userListDialog.vue b/src/views/measure/train/components/userListDialog.vue
index a1d4bae..20488ca 100644
--- a/src/views/measure/train/components/userListDialog.vue
+++ b/src/views/measure/train/components/userListDialog.vue
@@ -21,18 +21,9 @@
 const total = ref<number>(0)
 const select = ref<number>(-1)
 const columns = ref([
-  {
-    text: '姓名',
-    value: 'name',
-  },
-  {
-    text: '单位名称',
-    value: 'company',
-  },
-  {
-    text: '技术职称',
-    value: 'remark',
-  },
+  { text: '姓名', value: 'name' },
+  { text: '单位名称', value: 'company' },
+  { text: '技术职称', value: 'remark' },
 ])
 const list = ref(props.list || [])
 // 搜索
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index bbac2f4..fad7684 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -55,63 +55,18 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '计划编号',
-    value: 'planNo',
-    align: 'center',
-  },
-  {
-    text: '培训名称',
-    value: 'planName',
-    align: 'center',
-  },
-  {
-    text: '培训对象',
-    value: 'trainPerson',
-    align: 'center',
-  },
-  {
-    text: '培训人数',
-    value: 'trainNumber',
-    align: 'center',
-  },
-  {
-    text: '培训学时',
-    value: 'trainHour',
-    align: 'center',
-  },
-  {
-    text: '培训时间',
-    value: 'trainTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '主管部门',
-    value: 'deptName',
-    align: 'center',
-  },
-  {
-    text: '实施单位',
-    value: 'effectiveCompany',
-    align: 'center',
-  },
-  {
-    text: '培训内容',
-    value: 'trainContent',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'remark',
-    align: 'center',
-  },
+  { text: '计划编号', value: 'planNo', width: '160', align: 'center' },
+  { text: '培训名称', value: 'planName', align: 'center' },
+  { text: '培训对象', value: 'trainPerson', align: 'center' },
+  { text: '培训人数', value: 'trainNumber', align: 'center' },
+  { text: '培训学时', value: 'trainHour', align: 'center' },
+  { text: '培训时间', value: 'trainTime', width: '180', align: 'center' },
+  { text: '主管部门', value: 'deptName', align: 'center' },
+  { text: '实施单位', value: 'effectiveCompany', align: 'center' },
+  { text: '负责人', value: 'director', align: 'center' },
+  { text: '培训内容', value: 'trainContent', align: 'center' },
+  { text: '创建时间', value: 'createTime', width: '180', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -331,8 +286,15 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="190">
+          <el-table-column label="操作" align="center" width="170" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2f4b599..2862696 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -1,26 +1,28 @@
+<!-- 培训计划详情 -->
 <script lang="ts" setup name="PlanAdd">
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import userListDialog from '../person/components/userListDialog.vue'
+import selectMeasurePersonDialog from './components/selectMeasurePersonDialog.vue'
 import type { IaddPersonListType, IformInlineType } from './plan_interface'
+import selectEmployeesDialog from '@/components/dialog/selectEmployeesDialog.vue'
 import DeptSelect from '@/components/DeptSelect/index.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import {
-  getDeptTree,
   getListDetail,
   getListSave,
   getListSubmit,
   getListUpdate,
 } from '@/api/system/plan'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
+const userVisible = ref(false) // 控制选择用户弹框显隐
+const checkedList = ref([]) // 选择的成员
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '详情',
 } // 字典
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -29,12 +31,13 @@
     infoId.value = $route.params.id as string
   }
 }
+// 表单
 const formInline = ref<IformInlineType>({
   createTime: '', // 创建时间
   deptId: '', // 部门id
   deptName: '', // 部门名称
   director: '', // 负责人
-  effectiveCompany: '',
+  effectiveCompany: '', // 实施单位
   id: '', // 主键
   planName: '', // 培训名称
   planNo: '', // 培训编号
@@ -47,27 +50,18 @@
   trainStaffList: [], // 人员信息
   trainTime: '', // 培训时间
 })
-const addId = ref('') // 保存后的id
-const ruleFormRef = ref<FormInstance>()
+const addId = ref('') // 保存后的id-用于提交
+const ruleFormRef = ref<FormInstance>() // 表单ref
+// 人员信息表头
 const columns = [
   { text: '学员名称', value: 'name' },
-  { text: '单位名称', value: 'deptName' },
+  { text: '单位名称', value: 'company' },
   { text: '技术职称', value: 'technologyJob' },
-  { text: '签到时间', value: 'createtime' },
+  { text: '签到时间', value: 'createtime', width: '180' },
 ]
 const dialogVisible = ref(false)
-const addPersonList = ref<IaddPersonListType>({
-  company: '',
-  examResult: '',
-  id: '',
-  name: '',
-  remark: '',
-  signTime: '',
-  staffId: '',
-  technologyJob: '',
-})
 const SelectionList = ref<IaddPersonListType[]>([])
-// 校验规则
+// 表单验证规则
 const rules = ref({
   planNo: [{ required: true, message: '计划编号不能为空', trigger: ['blur', 'change'] }],
   planName: [{ required: true, message: '培训名称不能为空', trigger: ['blur', 'change'] }],
@@ -82,23 +76,40 @@
   effectiveCompany: [{ required: true, message: '实施单位不能为空', trigger: ['blur', 'change'] }],
   director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
   trainContent: [{ required: true, message: '培训内容不能为空', trigger: ['blur', 'change'] }],
-}) // 表单验证规则
+})
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
   $router.back()
 }
-const userListRef = ref()
-// 选择人员
+const userListRef = ref() // 选择人员dialog ref
+// 点击表单中的选择人员
 const selectPerson = () => {
-  userListRef.value.initDialog()
+  // userListRef.value.initDialog()
+  userVisible.value = true
 }
 // 增加行
 const addRow = () => {
-  formInline.value.trainStaffList.push(
-    JSON.parse(JSON.stringify(addPersonList.value)),
-  )
+  const index = formInline.value.trainStaffList.findIndex(item => !item.name)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  if (formInline.value) {
+    formInline.value.trainStaffList.push(
+      {
+        company: '', // 单位名称
+        examResult: '', // 考核结果
+        id: '',
+        name: '', // 学员名称
+        remark: '', // 备注
+        signTime: '', // 签到时间
+        staffId: '', // 任务id
+        technologyJob: '', // 技术职称
+      },
+    )
+  }
 }
 // 记录点击的第几行
 const listIndex = ref(0)
@@ -106,20 +117,14 @@
 const userTrainRef = ref()
 // 选择计量人员
 const handleClick = (index: number) => {
-  listIndex.value = index
+  listIndex.value = index // 选择的第几行
   userTrainRef.value.initDialog()
 }
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
 }
-// // 点击弹窗的完成追加到表格数组中
-// const addPushList = () => {
-//   formInline.value.trainStaffList.push(
-//     JSON.parse(JSON.stringify(addPersonList.value)),
-//   )
-//   handleClose()
-// }
+
 // 删除行
 const deleteList = () => {
   formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
@@ -132,9 +137,10 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 选择完负责人的函数
-const confirmPerson = (object: IaddPersonListType) => {
-  formInline.value.director = object.name
+// 选择完负责人
+const confirmPerson = (val: IaddPersonListType) => {
+  formInline.value.director = val.name
+  userVisible.value = false
 }
 if (infoId.value && infoId.value !== '') {
   getListDetail({ id: infoId.value }).then((res) => {
@@ -142,19 +148,16 @@
   })
 }
 // 选完计量人员
-const confirmTrainPerson = (object: IaddPersonListType) => {
-  formInline.value.trainStaffList[listIndex.value] = object
-  formInline.value.trainStaffList[listIndex.value].staffId = object.id
+const confirmSelectPerson = (val: any) => {
+  formInline.value.trainStaffList[listIndex.value].name = val[0].name // 学员名称
+  formInline.value.trainStaffList[listIndex.value].company = val[0].deptId // 单位名称
+  formInline.value.trainStaffList[listIndex.value].technologyJob = val[0].technologyJob // 技术职称
+  formInline.value.trainStaffList[listIndex.value].staffId = val[0].id // 计量人员表id
 }
 // 点击提交
-const getAddList = async (
-  formEl: FormInstance | undefined,
-  buttonType: string,
-) => {
-  if (!formEl) {
-    return
-  }
-  await formEl.validate((valid, fields) => {
+const submit = async (formEl: FormInstance | undefined, buttonType: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid) => {
     if (valid) {
       ElMessageBox.confirm(`确认${buttonType}吗？`, '提示', {
         confirmButtonText: '确认',
@@ -211,6 +214,7 @@
     }
   })
 }
+// 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
   popTitle: '证书报告模板', // 打印配置页上方的标题
@@ -228,9 +232,7 @@
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
-          @click="
-            getAddList(ruleFormRef, '提交')
-          "
+          @click="submit(ruleFormRef, '提交')"
         >
           提交
         </el-button>
@@ -305,8 +307,8 @@
                 type="datetime"
                 style="width: 100%;"
                 placeholder="培训时间"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -369,12 +371,16 @@
               />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="培训内容:" prop="trainContent">
               <el-input
                 v-model="formInline.trainContent"
                 :placeholder="pageType === 'detail' ? '无' : '请输入培训内容'"
                 :disabled="pageType === 'detail'"
+                type="textarea"
+                autosize
               />
             </el-form-item>
           </el-col>
@@ -416,15 +422,8 @@
           :label="item.text"
           align="center"
         >
-          <template
-            v-if="item.text === '学员名称' && pageType !== 'detail'"
-            #default="scope"
-          >
-            <el-input
-              v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
-              class="input"
-            >
+          <template v-if="item.text === '学员名称' && pageType !== 'detail'" #default="scope">
+            <el-input v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input">
               <template #append>
                 <el-button
                   v-if="pageType !== 'detail'"
@@ -440,8 +439,14 @@
       </el-table>
     </detail-block>
   </app-container>
-  <!-- 选择用户列表组件 -->
-  <user-list-dialog ref="userListRef" @add="confirmPerson" />
+
   <!-- 选择计量人员组件列表 -->
-  <user-list-dialog ref="userTrainRef" @add="confirmTrainPerson" />
+  <select-measure-person-dialog ref="userTrainRef" @add="confirmSelectPerson" />
+  <!-- 用户弹框 -->
+  <select-employees-dialog
+    v-model:visible="userVisible"
+    v-model:data="checkedList"
+    :multi="false"
+    @change="confirmPerson"
+  />
 </template>
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 1e81f2c..829dcf4 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -112,14 +112,14 @@
 }
 // 新增人员信息对象类型
 export interface IaddPersonListType {
-  company: string
-  examResult: string
+  company: string // 单位名称
+  examResult: string // 考核结果
   id: string
   name: string // 名称
-  remark: string
-  signTime: string
-  staffId: string
-  technologyJob: string
+  remark: string // 备注
+  signTime: string // 签到时间
+  staffId: string // 人员id
+  technologyJob: string // 技术职称
   updateTime?: string // 更新时间
   createTime?: string // 创建时间
 }
diff --git a/src/views/system/tool/tool_interface.ts b/src/views/system/tool/tool_interface.ts
index be4872a..4b5fa1d 100644
--- a/src/views/system/tool/tool_interface.ts
+++ b/src/views/system/tool/tool_interface.ts
@@ -3,6 +3,7 @@
   signNo: string // 编号
   signName: string// 名称
   signDirector: string // 负责人
+  signUserId?: string // 用户id
   createTime?: string// 创建时间
   limit: number
   offset: number