diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..cba53af 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -14,6 +14,15 @@
   })
 }
 
+// 任务分发详情
+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({
@@ -24,10 +33,19 @@
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    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,
   })
@@ -78,3 +96,20 @@
   })
 }
 
+// 我的检测-列表
+export function getMyMeasureList(data: ILabQuery) {
+  return request({
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 我的检测-列表
+export function getDeptMeasureList(data: ILabQuery) {
+  return request({
+    url: `/business/labExecutive/deptExecutive/List?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..cba53af 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -14,6 +14,15 @@
   })
 }
 
+// 任务分发详情
+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({
@@ -24,10 +33,19 @@
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    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,
   })
@@ -78,3 +96,20 @@
   })
 }
 
+// 我的检测-列表
+export function getMyMeasureList(data: ILabQuery) {
+  return request({
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 我的检测-列表
+export function getDeptMeasureList(data: ILabQuery) {
+  return request({
+    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/task.ts b/src/api/business/task.ts
index c7e8343..cba53af 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -14,6 +14,15 @@
   })
 }
 
+// 任务分发详情
+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({
@@ -24,10 +33,19 @@
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    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,
   })
@@ -78,3 +96,20 @@
   })
 }
 
+// 我的检测-列表
+export function getMyMeasureList(data: ILabQuery) {
+  return request({
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 我的检测-列表
+export function getDeptMeasureList(data: ILabQuery) {
+  return request({
+    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/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/task.ts b/src/api/business/task.ts
index c7e8343..cba53af 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -14,6 +14,15 @@
   })
 }
 
+// 任务分发详情
+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({
@@ -24,10 +33,19 @@
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    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,
   })
@@ -78,3 +96,20 @@
   })
 }
 
+// 我的检测-列表
+export function getMyMeasureList(data: ILabQuery) {
+  return request({
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 我的检测-列表
+export function getDeptMeasureList(data: ILabQuery) {
+  return request({
+    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/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/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 72623a6..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -116,7 +116,7 @@
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..cba53af 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -14,6 +14,15 @@
   })
 }
 
+// 任务分发详情
+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({
@@ -24,10 +33,19 @@
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    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,
   })
@@ -78,3 +96,20 @@
   })
 }
 
+// 我的检测-列表
+export function getMyMeasureList(data: ILabQuery) {
+  return request({
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 我的检测-列表
+export function getDeptMeasureList(data: ILabQuery) {
+  return request({
+    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/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/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 72623a6..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -116,7 +116,7 @@
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
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/task.ts b/src/api/business/task.ts
index c7e8343..cba53af 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -14,6 +14,15 @@
   })
 }
 
+// 任务分发详情
+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({
@@ -24,10 +33,19 @@
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    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,
   })
@@ -78,3 +96,20 @@
   })
 }
 
+// 我的检测-列表
+export function getMyMeasureList(data: ILabQuery) {
+  return request({
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 我的检测-列表
+export function getDeptMeasureList(data: ILabQuery) {
+  return request({
+    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/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/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 72623a6..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -116,7 +116,7 @@
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
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/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/task.ts b/src/api/business/task.ts
index c7e8343..cba53af 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -14,6 +14,15 @@
   })
 }
 
+// 任务分发详情
+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({
@@ -24,10 +33,19 @@
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    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,
   })
@@ -78,3 +96,20 @@
   })
 }
 
+// 我的检测-列表
+export function getMyMeasureList(data: ILabQuery) {
+  return request({
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 我的检测-列表
+export function getDeptMeasureList(data: ILabQuery) {
+  return request({
+    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/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/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 72623a6..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -116,7 +116,7 @@
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
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/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/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/task.ts b/src/api/business/task.ts
index c7e8343..cba53af 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -14,6 +14,15 @@
   })
 }
 
+// 任务分发详情
+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({
@@ -24,10 +33,19 @@
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    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,
   })
@@ -78,3 +96,20 @@
   })
 }
 
+// 我的检测-列表
+export function getMyMeasureList(data: ILabQuery) {
+  return request({
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 我的检测-列表
+export function getDeptMeasureList(data: ILabQuery) {
+  return request({
+    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/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/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 72623a6..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -116,7 +116,7 @@
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
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/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/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/task.ts b/src/api/business/task.ts
index c7e8343..cba53af 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -14,6 +14,15 @@
   })
 }
 
+// 任务分发详情
+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({
@@ -24,10 +33,19 @@
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    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,
   })
@@ -78,3 +96,20 @@
   })
 }
 
+// 我的检测-列表
+export function getMyMeasureList(data: ILabQuery) {
+  return request({
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 我的检测-列表
+export function getDeptMeasureList(data: ILabQuery) {
+  return request({
+    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/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/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 72623a6..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -116,7 +116,7 @@
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
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/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/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/task.ts b/src/api/business/task.ts
index c7e8343..cba53af 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -14,6 +14,15 @@
   })
 }
 
+// 任务分发详情
+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({
@@ -24,10 +33,19 @@
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    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,
   })
@@ -78,3 +96,20 @@
   })
 }
 
+// 我的检测-列表
+export function getMyMeasureList(data: ILabQuery) {
+  return request({
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 我的检测-列表
+export function getDeptMeasureList(data: ILabQuery) {
+  return request({
+    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/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/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 72623a6..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -116,7 +116,7 @@
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
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/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/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..b786ba2 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,110 @@
   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 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 // 送检人联系方式
 }

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index c7e8343..cba53af 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -14,6 +14,15 @@
   })
 }
 
+// 任务分发详情
+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({
@@ -24,10 +33,19 @@
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    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,
   })
@@ -78,3 +96,20 @@
   })
 }
 
+// 我的检测-列表
+export function getMyMeasureList(data: ILabQuery) {
+  return request({
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 我的检测-列表
+export function getDeptMeasureList(data: ILabQuery) {
+  return request({
+    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/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/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 72623a6..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -116,7 +116,7 @@
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
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/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/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..b786ba2 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,110 @@
   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 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 // 送检人联系方式
 }
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/task.ts b/src/api/business/task.ts
index c7e8343..cba53af 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -14,6 +14,15 @@
   })
 }
 
+// 任务分发详情
+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({
@@ -24,10 +33,19 @@
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    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,
   })
@@ -78,3 +96,20 @@
   })
 }
 
+// 我的检测-列表
+export function getMyMeasureList(data: ILabQuery) {
+  return request({
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 我的检测-列表
+export function getDeptMeasureList(data: ILabQuery) {
+  return request({
+    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/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/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 72623a6..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -116,7 +116,7 @@
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
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/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/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..b786ba2 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,110 @@
   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 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 // 送检人联系方式
 }
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/task.ts b/src/api/business/task.ts
index c7e8343..cba53af 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -14,6 +14,15 @@
   })
 }
 
+// 任务分发详情
+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({
@@ -24,10 +33,19 @@
   })
 }
 
-// 检测流程配置
-export function setMeasureProcess(data: { id: string; scheduleId: string }) {
+// 任务分发
+export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    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,
   })
@@ -78,3 +96,20 @@
   })
 }
 
+// 我的检测-列表
+export function getMyMeasureList(data: ILabQuery) {
+  return request({
+    url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 我的检测-列表
+export function getDeptMeasureList(data: ILabQuery) {
+  return request({
+    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/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/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 72623a6..9f8e6fa 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -116,7 +116,7 @@
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
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/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/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..b786ba2 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,110 @@
   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 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 // 送检人联系方式
 }
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/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index f9ee314..3d667a1 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -42,9 +42,9 @@
   manufacturer: '', // 生产厂家
   manufacturerCountry: '', // 厂家国别
   manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  // deliverer: '', // 送检人
-  // delivererTel: '', // 送检人联系方式
+  abc: '', // ABC
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
   measureContent: '', // 检定项目
   measurePeriod: '', // 检定周期
   remark: '', // 备注
@@ -54,6 +54,9 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+  specialRequire: '', // 客户特殊要求
 })
 const powerVoltageMap = [
   {