diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 574d62e..df5e257 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -61,9 +61,18 @@
 }
 
 // 关联委托书的且是已收入的样品的列表
+// export function getSampleList(data: ISampleListQuery) {
+//   return request({
+//     url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// 查询样品列表
 export function getSampleList(data: ISampleListQuery) {
   return request({
-    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/sample/listPageByInterchange?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 574d62e..df5e257 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -61,9 +61,18 @@
 }
 
 // 关联委托书的且是已收入的样品的列表
+// export function getSampleList(data: ISampleListQuery) {
+//   return request({
+//     url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// 查询样品列表
 export function getSampleList(data: ISampleListQuery) {
   return request({
-    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/sample/listPageByInterchange?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index fd22d7c..6e72218 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -1,4 +1,4 @@
-<!-- 任务分发详情 -->
+<!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
@@ -11,7 +11,6 @@
 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
@@ -31,7 +30,7 @@
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
   })
-  // 获取样品属性
+  // 获取检定方式
   getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
@@ -154,7 +153,7 @@
   },
 ]
 
-const currentMenu = ref('证书监控')
+const currentMenu = ref('检定记录')
 const currentMenuObj = computed(() => {
   return menu.find(item => item.name === currentMenu.value)
 })
@@ -175,38 +174,6 @@
   extarCss: '',
 })
 
-// 保存样品信息
-function saveForm(formEl: FormInstance | undefined) {
-  if (!formEl) { return }
-  formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认修改样品信息吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        if (sampleForm.value.id) {
-          updateSample(sampleForm.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
-      })
-    }
-  })
-}
-//
-const getSampleInfo = () => {
-  getSapmleDetail({ id: sampleId.value }).then((res) => {
-    sampleForm.value = res.data
-  })
-}
 // 获取分发详情
 const getInfo = () => {
   // 获取任务详情
@@ -215,58 +182,23 @@
     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
+    taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
+    taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
+    console.log('pppppp')
+    console.log(taskForm.value.measureProcessList)
+
     // 改用一个接口获取
     sampleForm.value = res.data
   })
 }
 
-// 点击标签绑定的扫描
-const startScan = () => {
-  // TODO
-}
-
 // 流程配置组件
 const processConfigRef = ref()
-// 批量添加流程按钮点击
-const batchProcessAdd = () => {
-  processConfigRef.value.batchProcessAdd()
-}
-// 保存流程按钮点击
-const saveProcess = () => {
-  processConfigRef.value.saveProcess()
-}
-
-// 文件上传
-const fileRef = ref()
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
 
 // 从路由中获取页面类型参数
 const $route = useRoute()
-if ($route.params && $route.params.role) {
-  roleType.value = $route.params.role as string // 使用角色
+if ($route.params) {
+  roleType.value = 'detail'
 
   if ($route.params.id) {
     sampleId.value = $route.params.id as string
@@ -527,9 +459,9 @@
                   :disabled="roleType === 'detail'"
                   :class="{ 'detail-input': roleType === 'detail' }"
                 >
-                  <template #append>
+                  <!-- <template #append>
                     <el-button>扫描</el-button>
-                  </template>
+                  </template> -->
                 </el-input>
               </el-form-item>
             </el-col>
@@ -539,8 +471,8 @@
               <el-form-item label="说明书:">
                 <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">
+                <input v-show="roleType === ''" ref="fileRef" type="file">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }">
                   {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
@@ -549,7 +481,7 @@
         </el-form>
       </div>
     </detail-page>
-    <detail-block title="检定流程">
+    <detail-block v-if="taskForm.measureProcessList && taskForm.measureProcessList.length >= 1" title="检定流程">
       <!-- <template #btns>
         <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
           批量添加
@@ -558,15 +490,19 @@
           保存
         </el-button>
       </template> -->
-      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 退回流程 -->
+    <detail-block v-if="taskForm.measureSendBackList && taskForm.measureSendBackList.length >= 1" title="退回流程">
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureSendBackList" :sample-id="sampleId" :detail="true" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
       <template #menu>
         <el-radio-group v-model="currentMenu">
-          <el-radio-button label="证书监控">
+          <!-- <el-radio-button label="证书监控">
             证书监控
-          </el-radio-button>
+          </el-radio-button> -->
           <el-radio-button label="检定记录">
             检定记录
           </el-radio-button>
@@ -576,7 +512,7 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
+      <!-- <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" /> -->
       <!-- 检定记录 -->
       <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 574d62e..df5e257 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -61,9 +61,18 @@
 }
 
 // 关联委托书的且是已收入的样品的列表
+// export function getSampleList(data: ISampleListQuery) {
+//   return request({
+//     url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// 查询样品列表
 export function getSampleList(data: ISampleListQuery) {
   return request({
-    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/sample/listPageByInterchange?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index fd22d7c..6e72218 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -1,4 +1,4 @@
-<!-- 任务分发详情 -->
+<!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
@@ -11,7 +11,6 @@
 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
@@ -31,7 +30,7 @@
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
   })
-  // 获取样品属性
+  // 获取检定方式
   getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
@@ -154,7 +153,7 @@
   },
 ]
 
-const currentMenu = ref('证书监控')
+const currentMenu = ref('检定记录')
 const currentMenuObj = computed(() => {
   return menu.find(item => item.name === currentMenu.value)
 })
@@ -175,38 +174,6 @@
   extarCss: '',
 })
 
-// 保存样品信息
-function saveForm(formEl: FormInstance | undefined) {
-  if (!formEl) { return }
-  formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认修改样品信息吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        if (sampleForm.value.id) {
-          updateSample(sampleForm.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
-      })
-    }
-  })
-}
-//
-const getSampleInfo = () => {
-  getSapmleDetail({ id: sampleId.value }).then((res) => {
-    sampleForm.value = res.data
-  })
-}
 // 获取分发详情
 const getInfo = () => {
   // 获取任务详情
@@ -215,58 +182,23 @@
     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
+    taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
+    taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
+    console.log('pppppp')
+    console.log(taskForm.value.measureProcessList)
+
     // 改用一个接口获取
     sampleForm.value = res.data
   })
 }
 
-// 点击标签绑定的扫描
-const startScan = () => {
-  // TODO
-}
-
 // 流程配置组件
 const processConfigRef = ref()
-// 批量添加流程按钮点击
-const batchProcessAdd = () => {
-  processConfigRef.value.batchProcessAdd()
-}
-// 保存流程按钮点击
-const saveProcess = () => {
-  processConfigRef.value.saveProcess()
-}
-
-// 文件上传
-const fileRef = ref()
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
 
 // 从路由中获取页面类型参数
 const $route = useRoute()
-if ($route.params && $route.params.role) {
-  roleType.value = $route.params.role as string // 使用角色
+if ($route.params) {
+  roleType.value = 'detail'
 
   if ($route.params.id) {
     sampleId.value = $route.params.id as string
@@ -527,9 +459,9 @@
                   :disabled="roleType === 'detail'"
                   :class="{ 'detail-input': roleType === 'detail' }"
                 >
-                  <template #append>
+                  <!-- <template #append>
                     <el-button>扫描</el-button>
-                  </template>
+                  </template> -->
                 </el-input>
               </el-form-item>
             </el-col>
@@ -539,8 +471,8 @@
               <el-form-item label="说明书:">
                 <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">
+                <input v-show="roleType === ''" ref="fileRef" type="file">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }">
                   {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
@@ -549,7 +481,7 @@
         </el-form>
       </div>
     </detail-page>
-    <detail-block title="检定流程">
+    <detail-block v-if="taskForm.measureProcessList && taskForm.measureProcessList.length >= 1" title="检定流程">
       <!-- <template #btns>
         <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
           批量添加
@@ -558,15 +490,19 @@
           保存
         </el-button>
       </template> -->
-      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 退回流程 -->
+    <detail-block v-if="taskForm.measureSendBackList && taskForm.measureSendBackList.length >= 1" title="退回流程">
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureSendBackList" :sample-id="sampleId" :detail="true" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
       <template #menu>
         <el-radio-group v-model="currentMenu">
-          <el-radio-button label="证书监控">
+          <!-- <el-radio-button label="证书监控">
             证书监控
-          </el-radio-button>
+          </el-radio-button> -->
           <el-radio-button label="检定记录">
             检定记录
           </el-radio-button>
@@ -576,7 +512,7 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
+      <!-- <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" /> -->
       <!-- 检定记录 -->
       <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
diff --git a/src/views/business/board/overdueReminder/list.vue b/src/views/business/board/overdueReminder/list.vue
index 387fadc..2421546 100644
--- a/src/views/business/board/overdueReminder/list.vue
+++ b/src/views/business/board/overdueReminder/list.vue
@@ -7,22 +7,24 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { exportInterchangeList, getInterChangeList, interchangeListUrge } from '@/api/business/schedule/interchangeList'
+import { exportTaskList, getTaskList } from '@/api/business/schedule/task'
+import { interchangeListUrge } from '@/api/business/schedule/interchangeList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  isUrgent: '', // 是否加急
+  sampleBelong: '', // 样品属性
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  sampleStatus: '8', // 样品状态:8已超期
   offset: 1,
   limit: 20,
-  orderNo: '', // 委托书编号
-  startTime: '', // 预计送达开始时间
-  endTime: '', // 预计送达结束时间
-  isUrgent: '2', // 是否加急 //2全部
-  sampleBelong: '2', // 样品属性 //2全部
-  sampleStatus: '8', // 样品状态 -- 8已超期
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -55,7 +57,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getInterChangeList(listQuery.value).then((response) => {
+  getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -82,15 +84,16 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
+    orderNo: '', // 委托书编号
     customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    isUrgent: '', // 是否加急
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    sampleStatus: '8', // 样品状态:8已超期
     offset: 1,
     limit: 20,
-    orderNo: '', // 委托书编号
-    startTime: '', // 预计送达开始时间
-    endTime: '', // 预计送达结束时间
-    isUrgent: '2', // 是否加急 //2全部
-    sampleBelong: '2', // 样品属性 //2全部
-    sampleStatus: '8', // 样品状态 -- 8已超期
   }
   fetchData(true)
 }
@@ -136,20 +139,19 @@
   })
   if (list.value.length > 0) {
     const params = {
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      offset: 1,
-      limit: 20,
-      orderNo: listQuery.value.orderNo, // 委托书编号
-      startTime: listQuery.value.startTime, // 预计送达开始时间
-      endTime: listQuery.value.endTime, // 预计送达结束时间
-      isUrgent: '2', // 是否加急 //2全部
-      sampleBelong: '2', // 样品属性 //2全部
+      sampleNo: '', // 样品编号
+      sampleName: '', // 样品名称
+      orderNo: '', // 委托书编号
+      customerNo: '', // 委托方代码
+      customerName: '', // 委托方名称
+      isUrgent: '', // 是否加急
+      sampleBelong: '', // 样品属性
+      startTime: '', //	应检定开始时间
+      endTime: '', //	应检定结束时间
       sampleStatus: '8', // 样品状态 -- 8已超期
       ids: checkoutList.value,
     }
-    exportInterchangeList(params).then((res) => {
+    exportTaskList(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '样品超期提醒列表.xlsx')
     })
@@ -247,7 +249,6 @@
                 详情
               </el-button>
               <el-button
-                v-if="row.isSelfMeasure"
                 size="small"
                 link
                 type="primary"

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 574d62e..df5e257 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -61,9 +61,18 @@
 }
 
 // 关联委托书的且是已收入的样品的列表
+// export function getSampleList(data: ISampleListQuery) {
+//   return request({
+//     url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// 查询样品列表
 export function getSampleList(data: ISampleListQuery) {
   return request({
-    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/sample/listPageByInterchange?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index fd22d7c..6e72218 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -1,4 +1,4 @@
-<!-- 任务分发详情 -->
+<!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
@@ -11,7 +11,6 @@
 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
@@ -31,7 +30,7 @@
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
   })
-  // 获取样品属性
+  // 获取检定方式
   getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
@@ -154,7 +153,7 @@
   },
 ]
 
-const currentMenu = ref('证书监控')
+const currentMenu = ref('检定记录')
 const currentMenuObj = computed(() => {
   return menu.find(item => item.name === currentMenu.value)
 })
@@ -175,38 +174,6 @@
   extarCss: '',
 })
 
-// 保存样品信息
-function saveForm(formEl: FormInstance | undefined) {
-  if (!formEl) { return }
-  formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认修改样品信息吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        if (sampleForm.value.id) {
-          updateSample(sampleForm.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
-      })
-    }
-  })
-}
-//
-const getSampleInfo = () => {
-  getSapmleDetail({ id: sampleId.value }).then((res) => {
-    sampleForm.value = res.data
-  })
-}
 // 获取分发详情
 const getInfo = () => {
   // 获取任务详情
@@ -215,58 +182,23 @@
     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
+    taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
+    taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
+    console.log('pppppp')
+    console.log(taskForm.value.measureProcessList)
+
     // 改用一个接口获取
     sampleForm.value = res.data
   })
 }
 
-// 点击标签绑定的扫描
-const startScan = () => {
-  // TODO
-}
-
 // 流程配置组件
 const processConfigRef = ref()
-// 批量添加流程按钮点击
-const batchProcessAdd = () => {
-  processConfigRef.value.batchProcessAdd()
-}
-// 保存流程按钮点击
-const saveProcess = () => {
-  processConfigRef.value.saveProcess()
-}
-
-// 文件上传
-const fileRef = ref()
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
 
 // 从路由中获取页面类型参数
 const $route = useRoute()
-if ($route.params && $route.params.role) {
-  roleType.value = $route.params.role as string // 使用角色
+if ($route.params) {
+  roleType.value = 'detail'
 
   if ($route.params.id) {
     sampleId.value = $route.params.id as string
@@ -527,9 +459,9 @@
                   :disabled="roleType === 'detail'"
                   :class="{ 'detail-input': roleType === 'detail' }"
                 >
-                  <template #append>
+                  <!-- <template #append>
                     <el-button>扫描</el-button>
-                  </template>
+                  </template> -->
                 </el-input>
               </el-form-item>
             </el-col>
@@ -539,8 +471,8 @@
               <el-form-item label="说明书:">
                 <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">
+                <input v-show="roleType === ''" ref="fileRef" type="file">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }">
                   {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
@@ -549,7 +481,7 @@
         </el-form>
       </div>
     </detail-page>
-    <detail-block title="检定流程">
+    <detail-block v-if="taskForm.measureProcessList && taskForm.measureProcessList.length >= 1" title="检定流程">
       <!-- <template #btns>
         <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
           批量添加
@@ -558,15 +490,19 @@
           保存
         </el-button>
       </template> -->
-      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 退回流程 -->
+    <detail-block v-if="taskForm.measureSendBackList && taskForm.measureSendBackList.length >= 1" title="退回流程">
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureSendBackList" :sample-id="sampleId" :detail="true" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
       <template #menu>
         <el-radio-group v-model="currentMenu">
-          <el-radio-button label="证书监控">
+          <!-- <el-radio-button label="证书监控">
             证书监控
-          </el-radio-button>
+          </el-radio-button> -->
           <el-radio-button label="检定记录">
             检定记录
           </el-radio-button>
@@ -576,7 +512,7 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
+      <!-- <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" /> -->
       <!-- 检定记录 -->
       <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
diff --git a/src/views/business/board/overdueReminder/list.vue b/src/views/business/board/overdueReminder/list.vue
index 387fadc..2421546 100644
--- a/src/views/business/board/overdueReminder/list.vue
+++ b/src/views/business/board/overdueReminder/list.vue
@@ -7,22 +7,24 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { exportInterchangeList, getInterChangeList, interchangeListUrge } from '@/api/business/schedule/interchangeList'
+import { exportTaskList, getTaskList } from '@/api/business/schedule/task'
+import { interchangeListUrge } from '@/api/business/schedule/interchangeList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  isUrgent: '', // 是否加急
+  sampleBelong: '', // 样品属性
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  sampleStatus: '8', // 样品状态:8已超期
   offset: 1,
   limit: 20,
-  orderNo: '', // 委托书编号
-  startTime: '', // 预计送达开始时间
-  endTime: '', // 预计送达结束时间
-  isUrgent: '2', // 是否加急 //2全部
-  sampleBelong: '2', // 样品属性 //2全部
-  sampleStatus: '8', // 样品状态 -- 8已超期
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -55,7 +57,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getInterChangeList(listQuery.value).then((response) => {
+  getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -82,15 +84,16 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
+    orderNo: '', // 委托书编号
     customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    isUrgent: '', // 是否加急
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    sampleStatus: '8', // 样品状态:8已超期
     offset: 1,
     limit: 20,
-    orderNo: '', // 委托书编号
-    startTime: '', // 预计送达开始时间
-    endTime: '', // 预计送达结束时间
-    isUrgent: '2', // 是否加急 //2全部
-    sampleBelong: '2', // 样品属性 //2全部
-    sampleStatus: '8', // 样品状态 -- 8已超期
   }
   fetchData(true)
 }
@@ -136,20 +139,19 @@
   })
   if (list.value.length > 0) {
     const params = {
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      offset: 1,
-      limit: 20,
-      orderNo: listQuery.value.orderNo, // 委托书编号
-      startTime: listQuery.value.startTime, // 预计送达开始时间
-      endTime: listQuery.value.endTime, // 预计送达结束时间
-      isUrgent: '2', // 是否加急 //2全部
-      sampleBelong: '2', // 样品属性 //2全部
+      sampleNo: '', // 样品编号
+      sampleName: '', // 样品名称
+      orderNo: '', // 委托书编号
+      customerNo: '', // 委托方代码
+      customerName: '', // 委托方名称
+      isUrgent: '', // 是否加急
+      sampleBelong: '', // 样品属性
+      startTime: '', //	应检定开始时间
+      endTime: '', //	应检定结束时间
       sampleStatus: '8', // 样品状态 -- 8已超期
       ids: checkoutList.value,
     }
-    exportInterchangeList(params).then((res) => {
+    exportTaskList(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '样品超期提醒列表.xlsx')
     })
@@ -247,7 +249,6 @@
                 详情
               </el-button>
               <el-button
-                v-if="row.isSelfMeasure"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/board/overdueReminder/overdueReminder_interface.ts b/src/views/business/board/overdueReminder/overdueReminder_interface.ts
index 28bdcb1..45bcf9e 100644
--- a/src/views/business/board/overdueReminder/overdueReminder_interface.ts
+++ b/src/views/business/board/overdueReminder/overdueReminder_interface.ts
@@ -4,13 +4,14 @@
   sampleName: string // 样品名称
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
-  offset: number
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
-  startTime: string // 预计送达开始时间
-  endTime: string // 预计送达结束时间
-  isUrgent: string // 是否加急 //2全部
-  sampleBelong: string // 样品属性 //2全部
-  sampleStatus: string // 样品状态
+  offset: number
 }
 // 表格
 export interface IList {

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 574d62e..df5e257 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -61,9 +61,18 @@
 }
 
 // 关联委托书的且是已收入的样品的列表
+// export function getSampleList(data: ISampleListQuery) {
+//   return request({
+//     url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// 查询样品列表
 export function getSampleList(data: ISampleListQuery) {
   return request({
-    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/sample/listPageByInterchange?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index fd22d7c..6e72218 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -1,4 +1,4 @@
-<!-- 任务分发详情 -->
+<!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
@@ -11,7 +11,6 @@
 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
@@ -31,7 +30,7 @@
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
   })
-  // 获取样品属性
+  // 获取检定方式
   getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
@@ -154,7 +153,7 @@
   },
 ]
 
-const currentMenu = ref('证书监控')
+const currentMenu = ref('检定记录')
 const currentMenuObj = computed(() => {
   return menu.find(item => item.name === currentMenu.value)
 })
@@ -175,38 +174,6 @@
   extarCss: '',
 })
 
-// 保存样品信息
-function saveForm(formEl: FormInstance | undefined) {
-  if (!formEl) { return }
-  formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认修改样品信息吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        if (sampleForm.value.id) {
-          updateSample(sampleForm.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
-      })
-    }
-  })
-}
-//
-const getSampleInfo = () => {
-  getSapmleDetail({ id: sampleId.value }).then((res) => {
-    sampleForm.value = res.data
-  })
-}
 // 获取分发详情
 const getInfo = () => {
   // 获取任务详情
@@ -215,58 +182,23 @@
     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
+    taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
+    taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
+    console.log('pppppp')
+    console.log(taskForm.value.measureProcessList)
+
     // 改用一个接口获取
     sampleForm.value = res.data
   })
 }
 
-// 点击标签绑定的扫描
-const startScan = () => {
-  // TODO
-}
-
 // 流程配置组件
 const processConfigRef = ref()
-// 批量添加流程按钮点击
-const batchProcessAdd = () => {
-  processConfigRef.value.batchProcessAdd()
-}
-// 保存流程按钮点击
-const saveProcess = () => {
-  processConfigRef.value.saveProcess()
-}
-
-// 文件上传
-const fileRef = ref()
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
 
 // 从路由中获取页面类型参数
 const $route = useRoute()
-if ($route.params && $route.params.role) {
-  roleType.value = $route.params.role as string // 使用角色
+if ($route.params) {
+  roleType.value = 'detail'
 
   if ($route.params.id) {
     sampleId.value = $route.params.id as string
@@ -527,9 +459,9 @@
                   :disabled="roleType === 'detail'"
                   :class="{ 'detail-input': roleType === 'detail' }"
                 >
-                  <template #append>
+                  <!-- <template #append>
                     <el-button>扫描</el-button>
-                  </template>
+                  </template> -->
                 </el-input>
               </el-form-item>
             </el-col>
@@ -539,8 +471,8 @@
               <el-form-item label="说明书:">
                 <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">
+                <input v-show="roleType === ''" ref="fileRef" type="file">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }">
                   {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
@@ -549,7 +481,7 @@
         </el-form>
       </div>
     </detail-page>
-    <detail-block title="检定流程">
+    <detail-block v-if="taskForm.measureProcessList && taskForm.measureProcessList.length >= 1" title="检定流程">
       <!-- <template #btns>
         <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
           批量添加
@@ -558,15 +490,19 @@
           保存
         </el-button>
       </template> -->
-      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 退回流程 -->
+    <detail-block v-if="taskForm.measureSendBackList && taskForm.measureSendBackList.length >= 1" title="退回流程">
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureSendBackList" :sample-id="sampleId" :detail="true" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
       <template #menu>
         <el-radio-group v-model="currentMenu">
-          <el-radio-button label="证书监控">
+          <!-- <el-radio-button label="证书监控">
             证书监控
-          </el-radio-button>
+          </el-radio-button> -->
           <el-radio-button label="检定记录">
             检定记录
           </el-radio-button>
@@ -576,7 +512,7 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
+      <!-- <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" /> -->
       <!-- 检定记录 -->
       <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
diff --git a/src/views/business/board/overdueReminder/list.vue b/src/views/business/board/overdueReminder/list.vue
index 387fadc..2421546 100644
--- a/src/views/business/board/overdueReminder/list.vue
+++ b/src/views/business/board/overdueReminder/list.vue
@@ -7,22 +7,24 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { exportInterchangeList, getInterChangeList, interchangeListUrge } from '@/api/business/schedule/interchangeList'
+import { exportTaskList, getTaskList } from '@/api/business/schedule/task'
+import { interchangeListUrge } from '@/api/business/schedule/interchangeList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  isUrgent: '', // 是否加急
+  sampleBelong: '', // 样品属性
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  sampleStatus: '8', // 样品状态:8已超期
   offset: 1,
   limit: 20,
-  orderNo: '', // 委托书编号
-  startTime: '', // 预计送达开始时间
-  endTime: '', // 预计送达结束时间
-  isUrgent: '2', // 是否加急 //2全部
-  sampleBelong: '2', // 样品属性 //2全部
-  sampleStatus: '8', // 样品状态 -- 8已超期
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -55,7 +57,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getInterChangeList(listQuery.value).then((response) => {
+  getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -82,15 +84,16 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
+    orderNo: '', // 委托书编号
     customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    isUrgent: '', // 是否加急
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    sampleStatus: '8', // 样品状态:8已超期
     offset: 1,
     limit: 20,
-    orderNo: '', // 委托书编号
-    startTime: '', // 预计送达开始时间
-    endTime: '', // 预计送达结束时间
-    isUrgent: '2', // 是否加急 //2全部
-    sampleBelong: '2', // 样品属性 //2全部
-    sampleStatus: '8', // 样品状态 -- 8已超期
   }
   fetchData(true)
 }
@@ -136,20 +139,19 @@
   })
   if (list.value.length > 0) {
     const params = {
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      offset: 1,
-      limit: 20,
-      orderNo: listQuery.value.orderNo, // 委托书编号
-      startTime: listQuery.value.startTime, // 预计送达开始时间
-      endTime: listQuery.value.endTime, // 预计送达结束时间
-      isUrgent: '2', // 是否加急 //2全部
-      sampleBelong: '2', // 样品属性 //2全部
+      sampleNo: '', // 样品编号
+      sampleName: '', // 样品名称
+      orderNo: '', // 委托书编号
+      customerNo: '', // 委托方代码
+      customerName: '', // 委托方名称
+      isUrgent: '', // 是否加急
+      sampleBelong: '', // 样品属性
+      startTime: '', //	应检定开始时间
+      endTime: '', //	应检定结束时间
       sampleStatus: '8', // 样品状态 -- 8已超期
       ids: checkoutList.value,
     }
-    exportInterchangeList(params).then((res) => {
+    exportTaskList(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '样品超期提醒列表.xlsx')
     })
@@ -247,7 +249,6 @@
                 详情
               </el-button>
               <el-button
-                v-if="row.isSelfMeasure"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/board/overdueReminder/overdueReminder_interface.ts b/src/views/business/board/overdueReminder/overdueReminder_interface.ts
index 28bdcb1..45bcf9e 100644
--- a/src/views/business/board/overdueReminder/overdueReminder_interface.ts
+++ b/src/views/business/board/overdueReminder/overdueReminder_interface.ts
@@ -4,13 +4,14 @@
   sampleName: string // 样品名称
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
-  offset: number
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
-  startTime: string // 预计送达开始时间
-  endTime: string // 预计送达结束时间
-  isUrgent: string // 是否加急 //2全部
-  sampleBelong: string // 样品属性 //2全部
-  sampleStatus: string // 样品状态
+  offset: number
 }
 // 表格
 export interface IList {
diff --git a/src/views/business/schedule/components/terminateDialog.vue b/src/views/business/schedule/components/terminateDialog.vue
index d5f85a0..17c8b15 100644
--- a/src/views/business/schedule/components/terminateDialog.vue
+++ b/src/views/business/schedule/components/terminateDialog.vue
@@ -32,7 +32,7 @@
  * @param orderId 委托书id
  * @param sampleId 样品id
  */
-function initDialog(row) {
+function initDialog(row: any) {
   // dataFormRef.value!.clearValidate()
   formData.value.orderId = row.orderId
   formData.value.sampleId = row.sampleId

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 574d62e..df5e257 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -61,9 +61,18 @@
 }
 
 // 关联委托书的且是已收入的样品的列表
+// export function getSampleList(data: ISampleListQuery) {
+//   return request({
+//     url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// 查询样品列表
 export function getSampleList(data: ISampleListQuery) {
   return request({
-    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/sample/listPageByInterchange?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index fd22d7c..6e72218 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -1,4 +1,4 @@
-<!-- 任务分发详情 -->
+<!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
@@ -11,7 +11,6 @@
 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
@@ -31,7 +30,7 @@
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
   })
-  // 获取样品属性
+  // 获取检定方式
   getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
@@ -154,7 +153,7 @@
   },
 ]
 
-const currentMenu = ref('证书监控')
+const currentMenu = ref('检定记录')
 const currentMenuObj = computed(() => {
   return menu.find(item => item.name === currentMenu.value)
 })
@@ -175,38 +174,6 @@
   extarCss: '',
 })
 
-// 保存样品信息
-function saveForm(formEl: FormInstance | undefined) {
-  if (!formEl) { return }
-  formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认修改样品信息吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        if (sampleForm.value.id) {
-          updateSample(sampleForm.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
-      })
-    }
-  })
-}
-//
-const getSampleInfo = () => {
-  getSapmleDetail({ id: sampleId.value }).then((res) => {
-    sampleForm.value = res.data
-  })
-}
 // 获取分发详情
 const getInfo = () => {
   // 获取任务详情
@@ -215,58 +182,23 @@
     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
+    taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
+    taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
+    console.log('pppppp')
+    console.log(taskForm.value.measureProcessList)
+
     // 改用一个接口获取
     sampleForm.value = res.data
   })
 }
 
-// 点击标签绑定的扫描
-const startScan = () => {
-  // TODO
-}
-
 // 流程配置组件
 const processConfigRef = ref()
-// 批量添加流程按钮点击
-const batchProcessAdd = () => {
-  processConfigRef.value.batchProcessAdd()
-}
-// 保存流程按钮点击
-const saveProcess = () => {
-  processConfigRef.value.saveProcess()
-}
-
-// 文件上传
-const fileRef = ref()
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
 
 // 从路由中获取页面类型参数
 const $route = useRoute()
-if ($route.params && $route.params.role) {
-  roleType.value = $route.params.role as string // 使用角色
+if ($route.params) {
+  roleType.value = 'detail'
 
   if ($route.params.id) {
     sampleId.value = $route.params.id as string
@@ -527,9 +459,9 @@
                   :disabled="roleType === 'detail'"
                   :class="{ 'detail-input': roleType === 'detail' }"
                 >
-                  <template #append>
+                  <!-- <template #append>
                     <el-button>扫描</el-button>
-                  </template>
+                  </template> -->
                 </el-input>
               </el-form-item>
             </el-col>
@@ -539,8 +471,8 @@
               <el-form-item label="说明书:">
                 <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">
+                <input v-show="roleType === ''" ref="fileRef" type="file">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }">
                   {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
@@ -549,7 +481,7 @@
         </el-form>
       </div>
     </detail-page>
-    <detail-block title="检定流程">
+    <detail-block v-if="taskForm.measureProcessList && taskForm.measureProcessList.length >= 1" title="检定流程">
       <!-- <template #btns>
         <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
           批量添加
@@ -558,15 +490,19 @@
           保存
         </el-button>
       </template> -->
-      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 退回流程 -->
+    <detail-block v-if="taskForm.measureSendBackList && taskForm.measureSendBackList.length >= 1" title="退回流程">
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureSendBackList" :sample-id="sampleId" :detail="true" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
       <template #menu>
         <el-radio-group v-model="currentMenu">
-          <el-radio-button label="证书监控">
+          <!-- <el-radio-button label="证书监控">
             证书监控
-          </el-radio-button>
+          </el-radio-button> -->
           <el-radio-button label="检定记录">
             检定记录
           </el-radio-button>
@@ -576,7 +512,7 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
+      <!-- <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" /> -->
       <!-- 检定记录 -->
       <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
diff --git a/src/views/business/board/overdueReminder/list.vue b/src/views/business/board/overdueReminder/list.vue
index 387fadc..2421546 100644
--- a/src/views/business/board/overdueReminder/list.vue
+++ b/src/views/business/board/overdueReminder/list.vue
@@ -7,22 +7,24 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { exportInterchangeList, getInterChangeList, interchangeListUrge } from '@/api/business/schedule/interchangeList'
+import { exportTaskList, getTaskList } from '@/api/business/schedule/task'
+import { interchangeListUrge } from '@/api/business/schedule/interchangeList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  isUrgent: '', // 是否加急
+  sampleBelong: '', // 样品属性
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  sampleStatus: '8', // 样品状态:8已超期
   offset: 1,
   limit: 20,
-  orderNo: '', // 委托书编号
-  startTime: '', // 预计送达开始时间
-  endTime: '', // 预计送达结束时间
-  isUrgent: '2', // 是否加急 //2全部
-  sampleBelong: '2', // 样品属性 //2全部
-  sampleStatus: '8', // 样品状态 -- 8已超期
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -55,7 +57,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getInterChangeList(listQuery.value).then((response) => {
+  getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -82,15 +84,16 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
+    orderNo: '', // 委托书编号
     customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    isUrgent: '', // 是否加急
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    sampleStatus: '8', // 样品状态:8已超期
     offset: 1,
     limit: 20,
-    orderNo: '', // 委托书编号
-    startTime: '', // 预计送达开始时间
-    endTime: '', // 预计送达结束时间
-    isUrgent: '2', // 是否加急 //2全部
-    sampleBelong: '2', // 样品属性 //2全部
-    sampleStatus: '8', // 样品状态 -- 8已超期
   }
   fetchData(true)
 }
@@ -136,20 +139,19 @@
   })
   if (list.value.length > 0) {
     const params = {
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      offset: 1,
-      limit: 20,
-      orderNo: listQuery.value.orderNo, // 委托书编号
-      startTime: listQuery.value.startTime, // 预计送达开始时间
-      endTime: listQuery.value.endTime, // 预计送达结束时间
-      isUrgent: '2', // 是否加急 //2全部
-      sampleBelong: '2', // 样品属性 //2全部
+      sampleNo: '', // 样品编号
+      sampleName: '', // 样品名称
+      orderNo: '', // 委托书编号
+      customerNo: '', // 委托方代码
+      customerName: '', // 委托方名称
+      isUrgent: '', // 是否加急
+      sampleBelong: '', // 样品属性
+      startTime: '', //	应检定开始时间
+      endTime: '', //	应检定结束时间
       sampleStatus: '8', // 样品状态 -- 8已超期
       ids: checkoutList.value,
     }
-    exportInterchangeList(params).then((res) => {
+    exportTaskList(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '样品超期提醒列表.xlsx')
     })
@@ -247,7 +249,6 @@
                 详情
               </el-button>
               <el-button
-                v-if="row.isSelfMeasure"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/board/overdueReminder/overdueReminder_interface.ts b/src/views/business/board/overdueReminder/overdueReminder_interface.ts
index 28bdcb1..45bcf9e 100644
--- a/src/views/business/board/overdueReminder/overdueReminder_interface.ts
+++ b/src/views/business/board/overdueReminder/overdueReminder_interface.ts
@@ -4,13 +4,14 @@
   sampleName: string // 样品名称
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
-  offset: number
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
-  startTime: string // 预计送达开始时间
-  endTime: string // 预计送达结束时间
-  isUrgent: string // 是否加急 //2全部
-  sampleBelong: string // 样品属性 //2全部
-  sampleStatus: string // 样品状态
+  offset: number
 }
 // 表格
 export interface IList {
diff --git a/src/views/business/schedule/components/terminateDialog.vue b/src/views/business/schedule/components/terminateDialog.vue
index d5f85a0..17c8b15 100644
--- a/src/views/business/schedule/components/terminateDialog.vue
+++ b/src/views/business/schedule/components/terminateDialog.vue
@@ -32,7 +32,7 @@
  * @param orderId 委托书id
  * @param sampleId 样品id
  */
-function initDialog(row) {
+function initDialog(row: any) {
   // dataFormRef.value!.clearValidate()
   formData.value.orderId = row.orderId
   formData.value.sampleId = row.sampleId
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index c629542..83a076e 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -220,6 +220,7 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderNo = val[0].orderCode // 委托书编号
     dataForm.value.orderId = val[0].id // 委托书id
     dataForm.value.deliverer = val[0].deliverer // 送检人
     dataForm.value.delivererTel = val[0].delivererTel // 送检人
@@ -233,13 +234,17 @@
   }
 }
 
-// ------------------------样品-----------------------------
+// ----------------------------------样品----------------------------------------------
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.customerNo) {
+  if (!dataForm.value.orderCode) {
     ElMessage.warning('请先选择委托书')
     return
   }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
   sampleVisible.value = true
 }
 // 修改委托方对话框显隐

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 574d62e..df5e257 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -61,9 +61,18 @@
 }
 
 // 关联委托书的且是已收入的样品的列表
+// export function getSampleList(data: ISampleListQuery) {
+//   return request({
+//     url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// 查询样品列表
 export function getSampleList(data: ISampleListQuery) {
   return request({
-    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/sample/listPageByInterchange?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index fd22d7c..6e72218 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -1,4 +1,4 @@
-<!-- 任务分发详情 -->
+<!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
@@ -11,7 +11,6 @@
 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
@@ -31,7 +30,7 @@
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
   })
-  // 获取样品属性
+  // 获取检定方式
   getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
@@ -154,7 +153,7 @@
   },
 ]
 
-const currentMenu = ref('证书监控')
+const currentMenu = ref('检定记录')
 const currentMenuObj = computed(() => {
   return menu.find(item => item.name === currentMenu.value)
 })
@@ -175,38 +174,6 @@
   extarCss: '',
 })
 
-// 保存样品信息
-function saveForm(formEl: FormInstance | undefined) {
-  if (!formEl) { return }
-  formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认修改样品信息吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        if (sampleForm.value.id) {
-          updateSample(sampleForm.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
-      })
-    }
-  })
-}
-//
-const getSampleInfo = () => {
-  getSapmleDetail({ id: sampleId.value }).then((res) => {
-    sampleForm.value = res.data
-  })
-}
 // 获取分发详情
 const getInfo = () => {
   // 获取任务详情
@@ -215,58 +182,23 @@
     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
+    taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
+    taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
+    console.log('pppppp')
+    console.log(taskForm.value.measureProcessList)
+
     // 改用一个接口获取
     sampleForm.value = res.data
   })
 }
 
-// 点击标签绑定的扫描
-const startScan = () => {
-  // TODO
-}
-
 // 流程配置组件
 const processConfigRef = ref()
-// 批量添加流程按钮点击
-const batchProcessAdd = () => {
-  processConfigRef.value.batchProcessAdd()
-}
-// 保存流程按钮点击
-const saveProcess = () => {
-  processConfigRef.value.saveProcess()
-}
-
-// 文件上传
-const fileRef = ref()
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
 
 // 从路由中获取页面类型参数
 const $route = useRoute()
-if ($route.params && $route.params.role) {
-  roleType.value = $route.params.role as string // 使用角色
+if ($route.params) {
+  roleType.value = 'detail'
 
   if ($route.params.id) {
     sampleId.value = $route.params.id as string
@@ -527,9 +459,9 @@
                   :disabled="roleType === 'detail'"
                   :class="{ 'detail-input': roleType === 'detail' }"
                 >
-                  <template #append>
+                  <!-- <template #append>
                     <el-button>扫描</el-button>
-                  </template>
+                  </template> -->
                 </el-input>
               </el-form-item>
             </el-col>
@@ -539,8 +471,8 @@
               <el-form-item label="说明书:">
                 <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">
+                <input v-show="roleType === ''" ref="fileRef" type="file">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }">
                   {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
@@ -549,7 +481,7 @@
         </el-form>
       </div>
     </detail-page>
-    <detail-block title="检定流程">
+    <detail-block v-if="taskForm.measureProcessList && taskForm.measureProcessList.length >= 1" title="检定流程">
       <!-- <template #btns>
         <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
           批量添加
@@ -558,15 +490,19 @@
           保存
         </el-button>
       </template> -->
-      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 退回流程 -->
+    <detail-block v-if="taskForm.measureSendBackList && taskForm.measureSendBackList.length >= 1" title="退回流程">
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureSendBackList" :sample-id="sampleId" :detail="true" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
       <template #menu>
         <el-radio-group v-model="currentMenu">
-          <el-radio-button label="证书监控">
+          <!-- <el-radio-button label="证书监控">
             证书监控
-          </el-radio-button>
+          </el-radio-button> -->
           <el-radio-button label="检定记录">
             检定记录
           </el-radio-button>
@@ -576,7 +512,7 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
+      <!-- <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" /> -->
       <!-- 检定记录 -->
       <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
diff --git a/src/views/business/board/overdueReminder/list.vue b/src/views/business/board/overdueReminder/list.vue
index 387fadc..2421546 100644
--- a/src/views/business/board/overdueReminder/list.vue
+++ b/src/views/business/board/overdueReminder/list.vue
@@ -7,22 +7,24 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { exportInterchangeList, getInterChangeList, interchangeListUrge } from '@/api/business/schedule/interchangeList'
+import { exportTaskList, getTaskList } from '@/api/business/schedule/task'
+import { interchangeListUrge } from '@/api/business/schedule/interchangeList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  isUrgent: '', // 是否加急
+  sampleBelong: '', // 样品属性
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  sampleStatus: '8', // 样品状态:8已超期
   offset: 1,
   limit: 20,
-  orderNo: '', // 委托书编号
-  startTime: '', // 预计送达开始时间
-  endTime: '', // 预计送达结束时间
-  isUrgent: '2', // 是否加急 //2全部
-  sampleBelong: '2', // 样品属性 //2全部
-  sampleStatus: '8', // 样品状态 -- 8已超期
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -55,7 +57,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getInterChangeList(listQuery.value).then((response) => {
+  getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -82,15 +84,16 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
+    orderNo: '', // 委托书编号
     customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    isUrgent: '', // 是否加急
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    sampleStatus: '8', // 样品状态:8已超期
     offset: 1,
     limit: 20,
-    orderNo: '', // 委托书编号
-    startTime: '', // 预计送达开始时间
-    endTime: '', // 预计送达结束时间
-    isUrgent: '2', // 是否加急 //2全部
-    sampleBelong: '2', // 样品属性 //2全部
-    sampleStatus: '8', // 样品状态 -- 8已超期
   }
   fetchData(true)
 }
@@ -136,20 +139,19 @@
   })
   if (list.value.length > 0) {
     const params = {
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      offset: 1,
-      limit: 20,
-      orderNo: listQuery.value.orderNo, // 委托书编号
-      startTime: listQuery.value.startTime, // 预计送达开始时间
-      endTime: listQuery.value.endTime, // 预计送达结束时间
-      isUrgent: '2', // 是否加急 //2全部
-      sampleBelong: '2', // 样品属性 //2全部
+      sampleNo: '', // 样品编号
+      sampleName: '', // 样品名称
+      orderNo: '', // 委托书编号
+      customerNo: '', // 委托方代码
+      customerName: '', // 委托方名称
+      isUrgent: '', // 是否加急
+      sampleBelong: '', // 样品属性
+      startTime: '', //	应检定开始时间
+      endTime: '', //	应检定结束时间
       sampleStatus: '8', // 样品状态 -- 8已超期
       ids: checkoutList.value,
     }
-    exportInterchangeList(params).then((res) => {
+    exportTaskList(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '样品超期提醒列表.xlsx')
     })
@@ -247,7 +249,6 @@
                 详情
               </el-button>
               <el-button
-                v-if="row.isSelfMeasure"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/board/overdueReminder/overdueReminder_interface.ts b/src/views/business/board/overdueReminder/overdueReminder_interface.ts
index 28bdcb1..45bcf9e 100644
--- a/src/views/business/board/overdueReminder/overdueReminder_interface.ts
+++ b/src/views/business/board/overdueReminder/overdueReminder_interface.ts
@@ -4,13 +4,14 @@
   sampleName: string // 样品名称
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
-  offset: number
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
-  startTime: string // 预计送达开始时间
-  endTime: string // 预计送达结束时间
-  isUrgent: string // 是否加急 //2全部
-  sampleBelong: string // 样品属性 //2全部
-  sampleStatus: string // 样品状态
+  offset: number
 }
 // 表格
 export interface IList {
diff --git a/src/views/business/schedule/components/terminateDialog.vue b/src/views/business/schedule/components/terminateDialog.vue
index d5f85a0..17c8b15 100644
--- a/src/views/business/schedule/components/terminateDialog.vue
+++ b/src/views/business/schedule/components/terminateDialog.vue
@@ -32,7 +32,7 @@
  * @param orderId 委托书id
  * @param sampleId 样品id
  */
-function initDialog(row) {
+function initDialog(row: any) {
   // dataFormRef.value!.clearValidate()
   formData.value.orderId = row.orderId
   formData.value.sampleId = row.sampleId
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index c629542..83a076e 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -220,6 +220,7 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderNo = val[0].orderCode // 委托书编号
     dataForm.value.orderId = val[0].id // 委托书id
     dataForm.value.deliverer = val[0].deliverer // 送检人
     dataForm.value.delivererTel = val[0].delivererTel // 送检人
@@ -233,13 +234,17 @@
   }
 }
 
-// ------------------------样品-----------------------------
+// ----------------------------------样品----------------------------------------------
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.customerNo) {
+  if (!dataForm.value.orderCode) {
     ElMessage.warning('请先选择委托书')
     return
   }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
   sampleVisible.value = true
 }
 // 修改委托方对话框显隐
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index b3089b4..4b4432e 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -79,6 +79,7 @@
   customerId: string // 委托方id
   sampleName: string // 样品名称
   sampleNo: string // 样品编号
+  customerName: string // 委托方名称
   offset: number
   limit: number
 }

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 574d62e..df5e257 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -61,9 +61,18 @@
 }
 
 // 关联委托书的且是已收入的样品的列表
+// export function getSampleList(data: ISampleListQuery) {
+//   return request({
+//     url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// 查询样品列表
 export function getSampleList(data: ISampleListQuery) {
   return request({
-    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/sample/listPageByInterchange?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index fd22d7c..6e72218 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -1,4 +1,4 @@
-<!-- 任务分发详情 -->
+<!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
@@ -11,7 +11,6 @@
 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
@@ -31,7 +30,7 @@
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
   })
-  // 获取样品属性
+  // 获取检定方式
   getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
@@ -154,7 +153,7 @@
   },
 ]
 
-const currentMenu = ref('证书监控')
+const currentMenu = ref('检定记录')
 const currentMenuObj = computed(() => {
   return menu.find(item => item.name === currentMenu.value)
 })
@@ -175,38 +174,6 @@
   extarCss: '',
 })
 
-// 保存样品信息
-function saveForm(formEl: FormInstance | undefined) {
-  if (!formEl) { return }
-  formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认修改样品信息吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        if (sampleForm.value.id) {
-          updateSample(sampleForm.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
-      })
-    }
-  })
-}
-//
-const getSampleInfo = () => {
-  getSapmleDetail({ id: sampleId.value }).then((res) => {
-    sampleForm.value = res.data
-  })
-}
 // 获取分发详情
 const getInfo = () => {
   // 获取任务详情
@@ -215,58 +182,23 @@
     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
+    taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
+    taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
+    console.log('pppppp')
+    console.log(taskForm.value.measureProcessList)
+
     // 改用一个接口获取
     sampleForm.value = res.data
   })
 }
 
-// 点击标签绑定的扫描
-const startScan = () => {
-  // TODO
-}
-
 // 流程配置组件
 const processConfigRef = ref()
-// 批量添加流程按钮点击
-const batchProcessAdd = () => {
-  processConfigRef.value.batchProcessAdd()
-}
-// 保存流程按钮点击
-const saveProcess = () => {
-  processConfigRef.value.saveProcess()
-}
-
-// 文件上传
-const fileRef = ref()
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
 
 // 从路由中获取页面类型参数
 const $route = useRoute()
-if ($route.params && $route.params.role) {
-  roleType.value = $route.params.role as string // 使用角色
+if ($route.params) {
+  roleType.value = 'detail'
 
   if ($route.params.id) {
     sampleId.value = $route.params.id as string
@@ -527,9 +459,9 @@
                   :disabled="roleType === 'detail'"
                   :class="{ 'detail-input': roleType === 'detail' }"
                 >
-                  <template #append>
+                  <!-- <template #append>
                     <el-button>扫描</el-button>
-                  </template>
+                  </template> -->
                 </el-input>
               </el-form-item>
             </el-col>
@@ -539,8 +471,8 @@
               <el-form-item label="说明书:">
                 <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">
+                <input v-show="roleType === ''" ref="fileRef" type="file">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }">
                   {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
@@ -549,7 +481,7 @@
         </el-form>
       </div>
     </detail-page>
-    <detail-block title="检定流程">
+    <detail-block v-if="taskForm.measureProcessList && taskForm.measureProcessList.length >= 1" title="检定流程">
       <!-- <template #btns>
         <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
           批量添加
@@ -558,15 +490,19 @@
           保存
         </el-button>
       </template> -->
-      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 退回流程 -->
+    <detail-block v-if="taskForm.measureSendBackList && taskForm.measureSendBackList.length >= 1" title="退回流程">
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureSendBackList" :sample-id="sampleId" :detail="true" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
       <template #menu>
         <el-radio-group v-model="currentMenu">
-          <el-radio-button label="证书监控">
+          <!-- <el-radio-button label="证书监控">
             证书监控
-          </el-radio-button>
+          </el-radio-button> -->
           <el-radio-button label="检定记录">
             检定记录
           </el-radio-button>
@@ -576,7 +512,7 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
+      <!-- <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" /> -->
       <!-- 检定记录 -->
       <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
diff --git a/src/views/business/board/overdueReminder/list.vue b/src/views/business/board/overdueReminder/list.vue
index 387fadc..2421546 100644
--- a/src/views/business/board/overdueReminder/list.vue
+++ b/src/views/business/board/overdueReminder/list.vue
@@ -7,22 +7,24 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { exportInterchangeList, getInterChangeList, interchangeListUrge } from '@/api/business/schedule/interchangeList'
+import { exportTaskList, getTaskList } from '@/api/business/schedule/task'
+import { interchangeListUrge } from '@/api/business/schedule/interchangeList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  isUrgent: '', // 是否加急
+  sampleBelong: '', // 样品属性
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  sampleStatus: '8', // 样品状态:8已超期
   offset: 1,
   limit: 20,
-  orderNo: '', // 委托书编号
-  startTime: '', // 预计送达开始时间
-  endTime: '', // 预计送达结束时间
-  isUrgent: '2', // 是否加急 //2全部
-  sampleBelong: '2', // 样品属性 //2全部
-  sampleStatus: '8', // 样品状态 -- 8已超期
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -55,7 +57,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getInterChangeList(listQuery.value).then((response) => {
+  getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -82,15 +84,16 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
+    orderNo: '', // 委托书编号
     customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    isUrgent: '', // 是否加急
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    sampleStatus: '8', // 样品状态:8已超期
     offset: 1,
     limit: 20,
-    orderNo: '', // 委托书编号
-    startTime: '', // 预计送达开始时间
-    endTime: '', // 预计送达结束时间
-    isUrgent: '2', // 是否加急 //2全部
-    sampleBelong: '2', // 样品属性 //2全部
-    sampleStatus: '8', // 样品状态 -- 8已超期
   }
   fetchData(true)
 }
@@ -136,20 +139,19 @@
   })
   if (list.value.length > 0) {
     const params = {
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      offset: 1,
-      limit: 20,
-      orderNo: listQuery.value.orderNo, // 委托书编号
-      startTime: listQuery.value.startTime, // 预计送达开始时间
-      endTime: listQuery.value.endTime, // 预计送达结束时间
-      isUrgent: '2', // 是否加急 //2全部
-      sampleBelong: '2', // 样品属性 //2全部
+      sampleNo: '', // 样品编号
+      sampleName: '', // 样品名称
+      orderNo: '', // 委托书编号
+      customerNo: '', // 委托方代码
+      customerName: '', // 委托方名称
+      isUrgent: '', // 是否加急
+      sampleBelong: '', // 样品属性
+      startTime: '', //	应检定开始时间
+      endTime: '', //	应检定结束时间
       sampleStatus: '8', // 样品状态 -- 8已超期
       ids: checkoutList.value,
     }
-    exportInterchangeList(params).then((res) => {
+    exportTaskList(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '样品超期提醒列表.xlsx')
     })
@@ -247,7 +249,6 @@
                 详情
               </el-button>
               <el-button
-                v-if="row.isSelfMeasure"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/board/overdueReminder/overdueReminder_interface.ts b/src/views/business/board/overdueReminder/overdueReminder_interface.ts
index 28bdcb1..45bcf9e 100644
--- a/src/views/business/board/overdueReminder/overdueReminder_interface.ts
+++ b/src/views/business/board/overdueReminder/overdueReminder_interface.ts
@@ -4,13 +4,14 @@
   sampleName: string // 样品名称
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
-  offset: number
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
-  startTime: string // 预计送达开始时间
-  endTime: string // 预计送达结束时间
-  isUrgent: string // 是否加急 //2全部
-  sampleBelong: string // 样品属性 //2全部
-  sampleStatus: string // 样品状态
+  offset: number
 }
 // 表格
 export interface IList {
diff --git a/src/views/business/schedule/components/terminateDialog.vue b/src/views/business/schedule/components/terminateDialog.vue
index d5f85a0..17c8b15 100644
--- a/src/views/business/schedule/components/terminateDialog.vue
+++ b/src/views/business/schedule/components/terminateDialog.vue
@@ -32,7 +32,7 @@
  * @param orderId 委托书id
  * @param sampleId 样品id
  */
-function initDialog(row) {
+function initDialog(row: any) {
   // dataFormRef.value!.clearValidate()
   formData.value.orderId = row.orderId
   formData.value.sampleId = row.sampleId
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index c629542..83a076e 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -220,6 +220,7 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderNo = val[0].orderCode // 委托书编号
     dataForm.value.orderId = val[0].id // 委托书id
     dataForm.value.deliverer = val[0].deliverer // 送检人
     dataForm.value.delivererTel = val[0].delivererTel // 送检人
@@ -233,13 +234,17 @@
   }
 }
 
-// ------------------------样品-----------------------------
+// ----------------------------------样品----------------------------------------------
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.customerNo) {
+  if (!dataForm.value.orderCode) {
     ElMessage.warning('请先选择委托书')
     return
   }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
   sampleVisible.value = true
 }
 // 修改委托方对话框显隐
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index b3089b4..4b4432e 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -79,6 +79,7 @@
   customerId: string // 委托方id
   sampleName: string // 样品名称
   sampleNo: string // 样品编号
+  customerName: string // 委托方名称
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index 11d3092..6c1cb6c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -25,6 +25,7 @@
   customerId: '', // 委托方id
   sampleName: '', // 样品名称
   sampleNo: '', // 样品编号
+  customerName: '', // 委托方名称
   offset: 1,
   limit: 20,
 })
@@ -36,9 +37,9 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '检定周期', value: 'measurePeriod', align: 'center' },
-  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
-  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  // { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  // { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  // { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -84,6 +85,7 @@
     customerId: '', // 委托方id
     sampleName: '', // 样品名称
     sampleNo: '', // 样品编号
+    customerName: '', // 委托方名称
     offset: 1,
     limit: 20,
   }
@@ -127,56 +129,55 @@
 </script>
 
 <template>
-  <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" @close="cancle">
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.sampleNo"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.sampleName"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="loadingTable"
-        is-showmulti-select
-        :is-multi="true"
-        :height="260"
-        :page-sizes="[20]"
-        @change="changePage"
-        @multiSelect="handleSelectionChange"
-      >
-        <template #preColumns>
-          <el-table-column label="#" width="55" align="center" fixed>
-            <template #default="scope">
-              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-      <template #footer>
-        <el-button type="primary" @click="clickConfirmSample">
-          确定
-        </el-button>
-        <el-button @click="cancle">
-          取消
-        </el-button>
+  <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <search-area
+      style="padding: 0;"
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      :data="list"
+      :total="total"
+      :columns="columns"
+      :query="listQuery"
+      :list-loading="loadingTable"
+      is-showmulti-select
+      :is-multi="true"
+      :height="260"
+      :page-sizes="[20]"
+      @change="changePage"
+      @multiSelect="handleSelectionChange"
+    >
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center" fixed>
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
       </template>
-    </el-dialog>
-  </div>
+    </normal-table>
+    <template #footer>
+      <el-button type="primary" @click="clickConfirmSample">
+        确定
+      </el-button>
+      <el-button @click="cancle">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
 </template>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 574d62e..df5e257 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -61,9 +61,18 @@
 }
 
 // 关联委托书的且是已收入的样品的列表
+// export function getSampleList(data: ISampleListQuery) {
+//   return request({
+//     url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// 查询样品列表
 export function getSampleList(data: ISampleListQuery) {
   return request({
-    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/sample/listPageByInterchange?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index fd22d7c..6e72218 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -1,4 +1,4 @@
-<!-- 任务分发详情 -->
+<!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
@@ -11,7 +11,6 @@
 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
@@ -31,7 +30,7 @@
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
   })
-  // 获取样品属性
+  // 获取检定方式
   getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
@@ -154,7 +153,7 @@
   },
 ]
 
-const currentMenu = ref('证书监控')
+const currentMenu = ref('检定记录')
 const currentMenuObj = computed(() => {
   return menu.find(item => item.name === currentMenu.value)
 })
@@ -175,38 +174,6 @@
   extarCss: '',
 })
 
-// 保存样品信息
-function saveForm(formEl: FormInstance | undefined) {
-  if (!formEl) { return }
-  formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认修改样品信息吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        if (sampleForm.value.id) {
-          updateSample(sampleForm.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
-      })
-    }
-  })
-}
-//
-const getSampleInfo = () => {
-  getSapmleDetail({ id: sampleId.value }).then((res) => {
-    sampleForm.value = res.data
-  })
-}
 // 获取分发详情
 const getInfo = () => {
   // 获取任务详情
@@ -215,58 +182,23 @@
     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
+    taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
+    taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
+    console.log('pppppp')
+    console.log(taskForm.value.measureProcessList)
+
     // 改用一个接口获取
     sampleForm.value = res.data
   })
 }
 
-// 点击标签绑定的扫描
-const startScan = () => {
-  // TODO
-}
-
 // 流程配置组件
 const processConfigRef = ref()
-// 批量添加流程按钮点击
-const batchProcessAdd = () => {
-  processConfigRef.value.batchProcessAdd()
-}
-// 保存流程按钮点击
-const saveProcess = () => {
-  processConfigRef.value.saveProcess()
-}
-
-// 文件上传
-const fileRef = ref()
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
 
 // 从路由中获取页面类型参数
 const $route = useRoute()
-if ($route.params && $route.params.role) {
-  roleType.value = $route.params.role as string // 使用角色
+if ($route.params) {
+  roleType.value = 'detail'
 
   if ($route.params.id) {
     sampleId.value = $route.params.id as string
@@ -527,9 +459,9 @@
                   :disabled="roleType === 'detail'"
                   :class="{ 'detail-input': roleType === 'detail' }"
                 >
-                  <template #append>
+                  <!-- <template #append>
                     <el-button>扫描</el-button>
-                  </template>
+                  </template> -->
                 </el-input>
               </el-form-item>
             </el-col>
@@ -539,8 +471,8 @@
               <el-form-item label="说明书:">
                 <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">
+                <input v-show="roleType === ''" ref="fileRef" type="file">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }">
                   {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
@@ -549,7 +481,7 @@
         </el-form>
       </div>
     </detail-page>
-    <detail-block title="检定流程">
+    <detail-block v-if="taskForm.measureProcessList && taskForm.measureProcessList.length >= 1" title="检定流程">
       <!-- <template #btns>
         <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
           批量添加
@@ -558,15 +490,19 @@
           保存
         </el-button>
       </template> -->
-      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 退回流程 -->
+    <detail-block v-if="taskForm.measureSendBackList && taskForm.measureSendBackList.length >= 1" title="退回流程">
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureSendBackList" :sample-id="sampleId" :detail="true" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
       <template #menu>
         <el-radio-group v-model="currentMenu">
-          <el-radio-button label="证书监控">
+          <!-- <el-radio-button label="证书监控">
             证书监控
-          </el-radio-button>
+          </el-radio-button> -->
           <el-radio-button label="检定记录">
             检定记录
           </el-radio-button>
@@ -576,7 +512,7 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
+      <!-- <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" /> -->
       <!-- 检定记录 -->
       <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
diff --git a/src/views/business/board/overdueReminder/list.vue b/src/views/business/board/overdueReminder/list.vue
index 387fadc..2421546 100644
--- a/src/views/business/board/overdueReminder/list.vue
+++ b/src/views/business/board/overdueReminder/list.vue
@@ -7,22 +7,24 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { exportInterchangeList, getInterChangeList, interchangeListUrge } from '@/api/business/schedule/interchangeList'
+import { exportTaskList, getTaskList } from '@/api/business/schedule/task'
+import { interchangeListUrge } from '@/api/business/schedule/interchangeList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  isUrgent: '', // 是否加急
+  sampleBelong: '', // 样品属性
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  sampleStatus: '8', // 样品状态:8已超期
   offset: 1,
   limit: 20,
-  orderNo: '', // 委托书编号
-  startTime: '', // 预计送达开始时间
-  endTime: '', // 预计送达结束时间
-  isUrgent: '2', // 是否加急 //2全部
-  sampleBelong: '2', // 样品属性 //2全部
-  sampleStatus: '8', // 样品状态 -- 8已超期
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -55,7 +57,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getInterChangeList(listQuery.value).then((response) => {
+  getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -82,15 +84,16 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
+    orderNo: '', // 委托书编号
     customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    isUrgent: '', // 是否加急
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    sampleStatus: '8', // 样品状态:8已超期
     offset: 1,
     limit: 20,
-    orderNo: '', // 委托书编号
-    startTime: '', // 预计送达开始时间
-    endTime: '', // 预计送达结束时间
-    isUrgent: '2', // 是否加急 //2全部
-    sampleBelong: '2', // 样品属性 //2全部
-    sampleStatus: '8', // 样品状态 -- 8已超期
   }
   fetchData(true)
 }
@@ -136,20 +139,19 @@
   })
   if (list.value.length > 0) {
     const params = {
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      offset: 1,
-      limit: 20,
-      orderNo: listQuery.value.orderNo, // 委托书编号
-      startTime: listQuery.value.startTime, // 预计送达开始时间
-      endTime: listQuery.value.endTime, // 预计送达结束时间
-      isUrgent: '2', // 是否加急 //2全部
-      sampleBelong: '2', // 样品属性 //2全部
+      sampleNo: '', // 样品编号
+      sampleName: '', // 样品名称
+      orderNo: '', // 委托书编号
+      customerNo: '', // 委托方代码
+      customerName: '', // 委托方名称
+      isUrgent: '', // 是否加急
+      sampleBelong: '', // 样品属性
+      startTime: '', //	应检定开始时间
+      endTime: '', //	应检定结束时间
       sampleStatus: '8', // 样品状态 -- 8已超期
       ids: checkoutList.value,
     }
-    exportInterchangeList(params).then((res) => {
+    exportTaskList(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '样品超期提醒列表.xlsx')
     })
@@ -247,7 +249,6 @@
                 详情
               </el-button>
               <el-button
-                v-if="row.isSelfMeasure"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/board/overdueReminder/overdueReminder_interface.ts b/src/views/business/board/overdueReminder/overdueReminder_interface.ts
index 28bdcb1..45bcf9e 100644
--- a/src/views/business/board/overdueReminder/overdueReminder_interface.ts
+++ b/src/views/business/board/overdueReminder/overdueReminder_interface.ts
@@ -4,13 +4,14 @@
   sampleName: string // 样品名称
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
-  offset: number
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
-  startTime: string // 预计送达开始时间
-  endTime: string // 预计送达结束时间
-  isUrgent: string // 是否加急 //2全部
-  sampleBelong: string // 样品属性 //2全部
-  sampleStatus: string // 样品状态
+  offset: number
 }
 // 表格
 export interface IList {
diff --git a/src/views/business/schedule/components/terminateDialog.vue b/src/views/business/schedule/components/terminateDialog.vue
index d5f85a0..17c8b15 100644
--- a/src/views/business/schedule/components/terminateDialog.vue
+++ b/src/views/business/schedule/components/terminateDialog.vue
@@ -32,7 +32,7 @@
  * @param orderId 委托书id
  * @param sampleId 样品id
  */
-function initDialog(row) {
+function initDialog(row: any) {
   // dataFormRef.value!.clearValidate()
   formData.value.orderId = row.orderId
   formData.value.sampleId = row.sampleId
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index c629542..83a076e 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -220,6 +220,7 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderNo = val[0].orderCode // 委托书编号
     dataForm.value.orderId = val[0].id // 委托书id
     dataForm.value.deliverer = val[0].deliverer // 送检人
     dataForm.value.delivererTel = val[0].delivererTel // 送检人
@@ -233,13 +234,17 @@
   }
 }
 
-// ------------------------样品-----------------------------
+// ----------------------------------样品----------------------------------------------
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.customerNo) {
+  if (!dataForm.value.orderCode) {
     ElMessage.warning('请先选择委托书')
     return
   }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
   sampleVisible.value = true
 }
 // 修改委托方对话框显隐
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index b3089b4..4b4432e 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -79,6 +79,7 @@
   customerId: string // 委托方id
   sampleName: string // 样品名称
   sampleNo: string // 样品编号
+  customerName: string // 委托方名称
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index 11d3092..6c1cb6c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -25,6 +25,7 @@
   customerId: '', // 委托方id
   sampleName: '', // 样品名称
   sampleNo: '', // 样品编号
+  customerName: '', // 委托方名称
   offset: 1,
   limit: 20,
 })
@@ -36,9 +37,9 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '检定周期', value: 'measurePeriod', align: 'center' },
-  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
-  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  // { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  // { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  // { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -84,6 +85,7 @@
     customerId: '', // 委托方id
     sampleName: '', // 样品名称
     sampleNo: '', // 样品编号
+    customerName: '', // 委托方名称
     offset: 1,
     limit: 20,
   }
@@ -127,56 +129,55 @@
 </script>
 
 <template>
-  <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" @close="cancle">
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.sampleNo"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.sampleName"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="loadingTable"
-        is-showmulti-select
-        :is-multi="true"
-        :height="260"
-        :page-sizes="[20]"
-        @change="changePage"
-        @multiSelect="handleSelectionChange"
-      >
-        <template #preColumns>
-          <el-table-column label="#" width="55" align="center" fixed>
-            <template #default="scope">
-              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-      <template #footer>
-        <el-button type="primary" @click="clickConfirmSample">
-          确定
-        </el-button>
-        <el-button @click="cancle">
-          取消
-        </el-button>
+  <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <search-area
+      style="padding: 0;"
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      :data="list"
+      :total="total"
+      :columns="columns"
+      :query="listQuery"
+      :list-loading="loadingTable"
+      is-showmulti-select
+      :is-multi="true"
+      :height="260"
+      :page-sizes="[20]"
+      @change="changePage"
+      @multiSelect="handleSelectionChange"
+    >
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center" fixed>
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
       </template>
-    </el-dialog>
-  </div>
+    </normal-table>
+    <template #footer>
+      <el-button type="primary" @click="clickConfirmSample">
+        确定
+      </el-button>
+      <el-button @click="cancle">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
 </template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 68ced75..142db45 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -313,6 +313,10 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!list.value.length) {
+    ElMessage.warning('要求样品清单不能为空')
+    return
+  }
   // 检查表格是否存在增加行信息没有完善的情况
   const result = checkList()
   if (result !== 'pass') {

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 574d62e..df5e257 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -61,9 +61,18 @@
 }
 
 // 关联委托书的且是已收入的样品的列表
+// export function getSampleList(data: ISampleListQuery) {
+//   return request({
+//     url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// 查询样品列表
 export function getSampleList(data: ISampleListQuery) {
   return request({
-    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/sample/listPageByInterchange?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index fd22d7c..6e72218 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -1,4 +1,4 @@
-<!-- 任务分发详情 -->
+<!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
@@ -11,7 +11,6 @@
 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
@@ -31,7 +30,7 @@
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
   })
-  // 获取样品属性
+  // 获取检定方式
   getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
@@ -154,7 +153,7 @@
   },
 ]
 
-const currentMenu = ref('证书监控')
+const currentMenu = ref('检定记录')
 const currentMenuObj = computed(() => {
   return menu.find(item => item.name === currentMenu.value)
 })
@@ -175,38 +174,6 @@
   extarCss: '',
 })
 
-// 保存样品信息
-function saveForm(formEl: FormInstance | undefined) {
-  if (!formEl) { return }
-  formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认修改样品信息吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        if (sampleForm.value.id) {
-          updateSample(sampleForm.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
-      })
-    }
-  })
-}
-//
-const getSampleInfo = () => {
-  getSapmleDetail({ id: sampleId.value }).then((res) => {
-    sampleForm.value = res.data
-  })
-}
 // 获取分发详情
 const getInfo = () => {
   // 获取任务详情
@@ -215,58 +182,23 @@
     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
+    taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
+    taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
+    console.log('pppppp')
+    console.log(taskForm.value.measureProcessList)
+
     // 改用一个接口获取
     sampleForm.value = res.data
   })
 }
 
-// 点击标签绑定的扫描
-const startScan = () => {
-  // TODO
-}
-
 // 流程配置组件
 const processConfigRef = ref()
-// 批量添加流程按钮点击
-const batchProcessAdd = () => {
-  processConfigRef.value.batchProcessAdd()
-}
-// 保存流程按钮点击
-const saveProcess = () => {
-  processConfigRef.value.saveProcess()
-}
-
-// 文件上传
-const fileRef = ref()
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
 
 // 从路由中获取页面类型参数
 const $route = useRoute()
-if ($route.params && $route.params.role) {
-  roleType.value = $route.params.role as string // 使用角色
+if ($route.params) {
+  roleType.value = 'detail'
 
   if ($route.params.id) {
     sampleId.value = $route.params.id as string
@@ -527,9 +459,9 @@
                   :disabled="roleType === 'detail'"
                   :class="{ 'detail-input': roleType === 'detail' }"
                 >
-                  <template #append>
+                  <!-- <template #append>
                     <el-button>扫描</el-button>
-                  </template>
+                  </template> -->
                 </el-input>
               </el-form-item>
             </el-col>
@@ -539,8 +471,8 @@
               <el-form-item label="说明书:">
                 <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">
+                <input v-show="roleType === ''" ref="fileRef" type="file">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }">
                   {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
@@ -549,7 +481,7 @@
         </el-form>
       </div>
     </detail-page>
-    <detail-block title="检定流程">
+    <detail-block v-if="taskForm.measureProcessList && taskForm.measureProcessList.length >= 1" title="检定流程">
       <!-- <template #btns>
         <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
           批量添加
@@ -558,15 +490,19 @@
           保存
         </el-button>
       </template> -->
-      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 退回流程 -->
+    <detail-block v-if="taskForm.measureSendBackList && taskForm.measureSendBackList.length >= 1" title="退回流程">
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureSendBackList" :sample-id="sampleId" :detail="true" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
       <template #menu>
         <el-radio-group v-model="currentMenu">
-          <el-radio-button label="证书监控">
+          <!-- <el-radio-button label="证书监控">
             证书监控
-          </el-radio-button>
+          </el-radio-button> -->
           <el-radio-button label="检定记录">
             检定记录
           </el-radio-button>
@@ -576,7 +512,7 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
+      <!-- <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" /> -->
       <!-- 检定记录 -->
       <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
diff --git a/src/views/business/board/overdueReminder/list.vue b/src/views/business/board/overdueReminder/list.vue
index 387fadc..2421546 100644
--- a/src/views/business/board/overdueReminder/list.vue
+++ b/src/views/business/board/overdueReminder/list.vue
@@ -7,22 +7,24 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { exportInterchangeList, getInterChangeList, interchangeListUrge } from '@/api/business/schedule/interchangeList'
+import { exportTaskList, getTaskList } from '@/api/business/schedule/task'
+import { interchangeListUrge } from '@/api/business/schedule/interchangeList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  isUrgent: '', // 是否加急
+  sampleBelong: '', // 样品属性
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  sampleStatus: '8', // 样品状态:8已超期
   offset: 1,
   limit: 20,
-  orderNo: '', // 委托书编号
-  startTime: '', // 预计送达开始时间
-  endTime: '', // 预计送达结束时间
-  isUrgent: '2', // 是否加急 //2全部
-  sampleBelong: '2', // 样品属性 //2全部
-  sampleStatus: '8', // 样品状态 -- 8已超期
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -55,7 +57,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getInterChangeList(listQuery.value).then((response) => {
+  getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -82,15 +84,16 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
+    orderNo: '', // 委托书编号
     customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    isUrgent: '', // 是否加急
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    sampleStatus: '8', // 样品状态:8已超期
     offset: 1,
     limit: 20,
-    orderNo: '', // 委托书编号
-    startTime: '', // 预计送达开始时间
-    endTime: '', // 预计送达结束时间
-    isUrgent: '2', // 是否加急 //2全部
-    sampleBelong: '2', // 样品属性 //2全部
-    sampleStatus: '8', // 样品状态 -- 8已超期
   }
   fetchData(true)
 }
@@ -136,20 +139,19 @@
   })
   if (list.value.length > 0) {
     const params = {
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      offset: 1,
-      limit: 20,
-      orderNo: listQuery.value.orderNo, // 委托书编号
-      startTime: listQuery.value.startTime, // 预计送达开始时间
-      endTime: listQuery.value.endTime, // 预计送达结束时间
-      isUrgent: '2', // 是否加急 //2全部
-      sampleBelong: '2', // 样品属性 //2全部
+      sampleNo: '', // 样品编号
+      sampleName: '', // 样品名称
+      orderNo: '', // 委托书编号
+      customerNo: '', // 委托方代码
+      customerName: '', // 委托方名称
+      isUrgent: '', // 是否加急
+      sampleBelong: '', // 样品属性
+      startTime: '', //	应检定开始时间
+      endTime: '', //	应检定结束时间
       sampleStatus: '8', // 样品状态 -- 8已超期
       ids: checkoutList.value,
     }
-    exportInterchangeList(params).then((res) => {
+    exportTaskList(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '样品超期提醒列表.xlsx')
     })
@@ -247,7 +249,6 @@
                 详情
               </el-button>
               <el-button
-                v-if="row.isSelfMeasure"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/board/overdueReminder/overdueReminder_interface.ts b/src/views/business/board/overdueReminder/overdueReminder_interface.ts
index 28bdcb1..45bcf9e 100644
--- a/src/views/business/board/overdueReminder/overdueReminder_interface.ts
+++ b/src/views/business/board/overdueReminder/overdueReminder_interface.ts
@@ -4,13 +4,14 @@
   sampleName: string // 样品名称
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
-  offset: number
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
-  startTime: string // 预计送达开始时间
-  endTime: string // 预计送达结束时间
-  isUrgent: string // 是否加急 //2全部
-  sampleBelong: string // 样品属性 //2全部
-  sampleStatus: string // 样品状态
+  offset: number
 }
 // 表格
 export interface IList {
diff --git a/src/views/business/schedule/components/terminateDialog.vue b/src/views/business/schedule/components/terminateDialog.vue
index d5f85a0..17c8b15 100644
--- a/src/views/business/schedule/components/terminateDialog.vue
+++ b/src/views/business/schedule/components/terminateDialog.vue
@@ -32,7 +32,7 @@
  * @param orderId 委托书id
  * @param sampleId 样品id
  */
-function initDialog(row) {
+function initDialog(row: any) {
   // dataFormRef.value!.clearValidate()
   formData.value.orderId = row.orderId
   formData.value.sampleId = row.sampleId
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index c629542..83a076e 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -220,6 +220,7 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderNo = val[0].orderCode // 委托书编号
     dataForm.value.orderId = val[0].id // 委托书id
     dataForm.value.deliverer = val[0].deliverer // 送检人
     dataForm.value.delivererTel = val[0].delivererTel // 送检人
@@ -233,13 +234,17 @@
   }
 }
 
-// ------------------------样品-----------------------------
+// ----------------------------------样品----------------------------------------------
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.customerNo) {
+  if (!dataForm.value.orderCode) {
     ElMessage.warning('请先选择委托书')
     return
   }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
   sampleVisible.value = true
 }
 // 修改委托方对话框显隐
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index b3089b4..4b4432e 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -79,6 +79,7 @@
   customerId: string // 委托方id
   sampleName: string // 样品名称
   sampleNo: string // 样品编号
+  customerName: string // 委托方名称
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index 11d3092..6c1cb6c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -25,6 +25,7 @@
   customerId: '', // 委托方id
   sampleName: '', // 样品名称
   sampleNo: '', // 样品编号
+  customerName: '', // 委托方名称
   offset: 1,
   limit: 20,
 })
@@ -36,9 +37,9 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '检定周期', value: 'measurePeriod', align: 'center' },
-  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
-  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  // { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  // { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  // { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -84,6 +85,7 @@
     customerId: '', // 委托方id
     sampleName: '', // 样品名称
     sampleNo: '', // 样品编号
+    customerName: '', // 委托方名称
     offset: 1,
     limit: 20,
   }
@@ -127,56 +129,55 @@
 </script>
 
 <template>
-  <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" @close="cancle">
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.sampleNo"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.sampleName"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="loadingTable"
-        is-showmulti-select
-        :is-multi="true"
-        :height="260"
-        :page-sizes="[20]"
-        @change="changePage"
-        @multiSelect="handleSelectionChange"
-      >
-        <template #preColumns>
-          <el-table-column label="#" width="55" align="center" fixed>
-            <template #default="scope">
-              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-      <template #footer>
-        <el-button type="primary" @click="clickConfirmSample">
-          确定
-        </el-button>
-        <el-button @click="cancle">
-          取消
-        </el-button>
+  <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <search-area
+      style="padding: 0;"
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      :data="list"
+      :total="total"
+      :columns="columns"
+      :query="listQuery"
+      :list-loading="loadingTable"
+      is-showmulti-select
+      :is-multi="true"
+      :height="260"
+      :page-sizes="[20]"
+      @change="changePage"
+      @multiSelect="handleSelectionChange"
+    >
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center" fixed>
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
       </template>
-    </el-dialog>
-  </div>
+    </normal-table>
+    <template #footer>
+      <el-button type="primary" @click="clickConfirmSample">
+        确定
+      </el-button>
+      <el-button @click="cancle">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
 </template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 68ced75..142db45 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -313,6 +313,10 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!list.value.length) {
+    ElMessage.warning('要求样品清单不能为空')
+    return
+  }
   // 检查表格是否存在增加行信息没有完善的情况
   const result = checkList()
   if (result !== 'pass') {
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index 720a2e3..5c07d92 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -29,8 +29,8 @@
 
 // 查询条件
 const listQuery = ref({
-  // sampleNo: '', // 样品编号
-  // sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
   // sampleModel: '', // 型号
   orderId: props.orderId || '', // 委托书id
   customerId: props.customerId || '', // 委托方id
@@ -51,8 +51,8 @@
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
-  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
-  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  // { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  // { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -97,12 +97,14 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
-    sampleModel: '', // 型号
-    customerNo: '', // 委托方代码
-    customerName: '', // 委托方名称
-    startTime: '', // 检定开始时间
-    endTime: '', // 检定结束时间
-    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    // sampleModel: '', // 型号
+    orderId: props.orderId || '', // 委托书id
+    customerId: props.customerId || '', // 委托方id
+    customerNo: props.customerNo || '', // 委托方代码
+    // customerName: '', // 委托方名称
+    // startTime: '', // 检定开始时间
+    // endTime: '', // 检定结束时间
+    // overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
     offset: 1,
     limit: 20,
   }
@@ -146,48 +148,57 @@
 </script>
 
 <template>
-  <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
-      <!-- <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.sampleNo"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.sampleName"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-      </search-area> -->
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="loadingTable"
-        is-showmulti-select
-        :is-multi="true"
-        :height="260"
-        :page-sizes="[20]"
-        @change="changePage"
-        @multi-select="handleSelectionChange"
-      />
-      <template #footer>
-        <el-button type="primary" @click="clickConfirmSample">
-          确定
-        </el-button>
-        <el-button @click="cancle">
-          取消
-        </el-button>
+  <!-- <div class="select-kehu-dialog"> -->
+  <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <search-area
+      style="padding: 0;"
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      :data="list"
+      :total="total"
+      :columns="columns"
+      :query="listQuery"
+      :list-loading="loadingTable"
+      is-showmulti-select
+      :is-multi="true"
+      :height="260"
+      :page-sizes="[20]"
+      @change="changePage"
+      @multi-select="handleSelectionChange"
+    >
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center" fixed="left">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
       </template>
-    </el-dialog>
-  </div>
+    </normal-table>
+    <template #footer>
+      <el-button type="primary" @click="clickConfirmSample">
+        确定
+      </el-button>
+      <el-button @click="cancle">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+  <!-- </div> -->
 </template>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 574d62e..df5e257 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -61,9 +61,18 @@
 }
 
 // 关联委托书的且是已收入的样品的列表
+// export function getSampleList(data: ISampleListQuery) {
+//   return request({
+//     url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// 查询样品列表
 export function getSampleList(data: ISampleListQuery) {
   return request({
-    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/sample/listPageByInterchange?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index fd22d7c..6e72218 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -1,4 +1,4 @@
-<!-- 任务分发详情 -->
+<!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
@@ -11,7 +11,6 @@
 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
@@ -31,7 +30,7 @@
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
   })
-  // 获取样品属性
+  // 获取检定方式
   getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
@@ -154,7 +153,7 @@
   },
 ]
 
-const currentMenu = ref('证书监控')
+const currentMenu = ref('检定记录')
 const currentMenuObj = computed(() => {
   return menu.find(item => item.name === currentMenu.value)
 })
@@ -175,38 +174,6 @@
   extarCss: '',
 })
 
-// 保存样品信息
-function saveForm(formEl: FormInstance | undefined) {
-  if (!formEl) { return }
-  formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认修改样品信息吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        if (sampleForm.value.id) {
-          updateSample(sampleForm.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
-      })
-    }
-  })
-}
-//
-const getSampleInfo = () => {
-  getSapmleDetail({ id: sampleId.value }).then((res) => {
-    sampleForm.value = res.data
-  })
-}
 // 获取分发详情
 const getInfo = () => {
   // 获取任务详情
@@ -215,58 +182,23 @@
     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
+    taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
+    taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
+    console.log('pppppp')
+    console.log(taskForm.value.measureProcessList)
+
     // 改用一个接口获取
     sampleForm.value = res.data
   })
 }
 
-// 点击标签绑定的扫描
-const startScan = () => {
-  // TODO
-}
-
 // 流程配置组件
 const processConfigRef = ref()
-// 批量添加流程按钮点击
-const batchProcessAdd = () => {
-  processConfigRef.value.batchProcessAdd()
-}
-// 保存流程按钮点击
-const saveProcess = () => {
-  processConfigRef.value.saveProcess()
-}
-
-// 文件上传
-const fileRef = ref()
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
 
 // 从路由中获取页面类型参数
 const $route = useRoute()
-if ($route.params && $route.params.role) {
-  roleType.value = $route.params.role as string // 使用角色
+if ($route.params) {
+  roleType.value = 'detail'
 
   if ($route.params.id) {
     sampleId.value = $route.params.id as string
@@ -527,9 +459,9 @@
                   :disabled="roleType === 'detail'"
                   :class="{ 'detail-input': roleType === 'detail' }"
                 >
-                  <template #append>
+                  <!-- <template #append>
                     <el-button>扫描</el-button>
-                  </template>
+                  </template> -->
                 </el-input>
               </el-form-item>
             </el-col>
@@ -539,8 +471,8 @@
               <el-form-item label="说明书:">
                 <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">
+                <input v-show="roleType === ''" ref="fileRef" type="file">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }">
                   {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
@@ -549,7 +481,7 @@
         </el-form>
       </div>
     </detail-page>
-    <detail-block title="检定流程">
+    <detail-block v-if="taskForm.measureProcessList && taskForm.measureProcessList.length >= 1" title="检定流程">
       <!-- <template #btns>
         <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
           批量添加
@@ -558,15 +490,19 @@
           保存
         </el-button>
       </template> -->
-      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 退回流程 -->
+    <detail-block v-if="taskForm.measureSendBackList && taskForm.measureSendBackList.length >= 1" title="退回流程">
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureSendBackList" :sample-id="sampleId" :detail="true" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
       <template #menu>
         <el-radio-group v-model="currentMenu">
-          <el-radio-button label="证书监控">
+          <!-- <el-radio-button label="证书监控">
             证书监控
-          </el-radio-button>
+          </el-radio-button> -->
           <el-radio-button label="检定记录">
             检定记录
           </el-radio-button>
@@ -576,7 +512,7 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
+      <!-- <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" /> -->
       <!-- 检定记录 -->
       <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
diff --git a/src/views/business/board/overdueReminder/list.vue b/src/views/business/board/overdueReminder/list.vue
index 387fadc..2421546 100644
--- a/src/views/business/board/overdueReminder/list.vue
+++ b/src/views/business/board/overdueReminder/list.vue
@@ -7,22 +7,24 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { exportInterchangeList, getInterChangeList, interchangeListUrge } from '@/api/business/schedule/interchangeList'
+import { exportTaskList, getTaskList } from '@/api/business/schedule/task'
+import { interchangeListUrge } from '@/api/business/schedule/interchangeList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  isUrgent: '', // 是否加急
+  sampleBelong: '', // 样品属性
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  sampleStatus: '8', // 样品状态:8已超期
   offset: 1,
   limit: 20,
-  orderNo: '', // 委托书编号
-  startTime: '', // 预计送达开始时间
-  endTime: '', // 预计送达结束时间
-  isUrgent: '2', // 是否加急 //2全部
-  sampleBelong: '2', // 样品属性 //2全部
-  sampleStatus: '8', // 样品状态 -- 8已超期
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -55,7 +57,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getInterChangeList(listQuery.value).then((response) => {
+  getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -82,15 +84,16 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
+    orderNo: '', // 委托书编号
     customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    isUrgent: '', // 是否加急
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    sampleStatus: '8', // 样品状态:8已超期
     offset: 1,
     limit: 20,
-    orderNo: '', // 委托书编号
-    startTime: '', // 预计送达开始时间
-    endTime: '', // 预计送达结束时间
-    isUrgent: '2', // 是否加急 //2全部
-    sampleBelong: '2', // 样品属性 //2全部
-    sampleStatus: '8', // 样品状态 -- 8已超期
   }
   fetchData(true)
 }
@@ -136,20 +139,19 @@
   })
   if (list.value.length > 0) {
     const params = {
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      offset: 1,
-      limit: 20,
-      orderNo: listQuery.value.orderNo, // 委托书编号
-      startTime: listQuery.value.startTime, // 预计送达开始时间
-      endTime: listQuery.value.endTime, // 预计送达结束时间
-      isUrgent: '2', // 是否加急 //2全部
-      sampleBelong: '2', // 样品属性 //2全部
+      sampleNo: '', // 样品编号
+      sampleName: '', // 样品名称
+      orderNo: '', // 委托书编号
+      customerNo: '', // 委托方代码
+      customerName: '', // 委托方名称
+      isUrgent: '', // 是否加急
+      sampleBelong: '', // 样品属性
+      startTime: '', //	应检定开始时间
+      endTime: '', //	应检定结束时间
       sampleStatus: '8', // 样品状态 -- 8已超期
       ids: checkoutList.value,
     }
-    exportInterchangeList(params).then((res) => {
+    exportTaskList(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '样品超期提醒列表.xlsx')
     })
@@ -247,7 +249,6 @@
                 详情
               </el-button>
               <el-button
-                v-if="row.isSelfMeasure"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/board/overdueReminder/overdueReminder_interface.ts b/src/views/business/board/overdueReminder/overdueReminder_interface.ts
index 28bdcb1..45bcf9e 100644
--- a/src/views/business/board/overdueReminder/overdueReminder_interface.ts
+++ b/src/views/business/board/overdueReminder/overdueReminder_interface.ts
@@ -4,13 +4,14 @@
   sampleName: string // 样品名称
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
-  offset: number
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
-  startTime: string // 预计送达开始时间
-  endTime: string // 预计送达结束时间
-  isUrgent: string // 是否加急 //2全部
-  sampleBelong: string // 样品属性 //2全部
-  sampleStatus: string // 样品状态
+  offset: number
 }
 // 表格
 export interface IList {
diff --git a/src/views/business/schedule/components/terminateDialog.vue b/src/views/business/schedule/components/terminateDialog.vue
index d5f85a0..17c8b15 100644
--- a/src/views/business/schedule/components/terminateDialog.vue
+++ b/src/views/business/schedule/components/terminateDialog.vue
@@ -32,7 +32,7 @@
  * @param orderId 委托书id
  * @param sampleId 样品id
  */
-function initDialog(row) {
+function initDialog(row: any) {
   // dataFormRef.value!.clearValidate()
   formData.value.orderId = row.orderId
   formData.value.sampleId = row.sampleId
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index c629542..83a076e 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -220,6 +220,7 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderNo = val[0].orderCode // 委托书编号
     dataForm.value.orderId = val[0].id // 委托书id
     dataForm.value.deliverer = val[0].deliverer // 送检人
     dataForm.value.delivererTel = val[0].delivererTel // 送检人
@@ -233,13 +234,17 @@
   }
 }
 
-// ------------------------样品-----------------------------
+// ----------------------------------样品----------------------------------------------
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.customerNo) {
+  if (!dataForm.value.orderCode) {
     ElMessage.warning('请先选择委托书')
     return
   }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
   sampleVisible.value = true
 }
 // 修改委托方对话框显隐
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index b3089b4..4b4432e 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -79,6 +79,7 @@
   customerId: string // 委托方id
   sampleName: string // 样品名称
   sampleNo: string // 样品编号
+  customerName: string // 委托方名称
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index 11d3092..6c1cb6c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -25,6 +25,7 @@
   customerId: '', // 委托方id
   sampleName: '', // 样品名称
   sampleNo: '', // 样品编号
+  customerName: '', // 委托方名称
   offset: 1,
   limit: 20,
 })
@@ -36,9 +37,9 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '检定周期', value: 'measurePeriod', align: 'center' },
-  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
-  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  // { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  // { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  // { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -84,6 +85,7 @@
     customerId: '', // 委托方id
     sampleName: '', // 样品名称
     sampleNo: '', // 样品编号
+    customerName: '', // 委托方名称
     offset: 1,
     limit: 20,
   }
@@ -127,56 +129,55 @@
 </script>
 
 <template>
-  <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" @close="cancle">
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.sampleNo"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.sampleName"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="loadingTable"
-        is-showmulti-select
-        :is-multi="true"
-        :height="260"
-        :page-sizes="[20]"
-        @change="changePage"
-        @multiSelect="handleSelectionChange"
-      >
-        <template #preColumns>
-          <el-table-column label="#" width="55" align="center" fixed>
-            <template #default="scope">
-              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-      <template #footer>
-        <el-button type="primary" @click="clickConfirmSample">
-          确定
-        </el-button>
-        <el-button @click="cancle">
-          取消
-        </el-button>
+  <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <search-area
+      style="padding: 0;"
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      :data="list"
+      :total="total"
+      :columns="columns"
+      :query="listQuery"
+      :list-loading="loadingTable"
+      is-showmulti-select
+      :is-multi="true"
+      :height="260"
+      :page-sizes="[20]"
+      @change="changePage"
+      @multiSelect="handleSelectionChange"
+    >
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center" fixed>
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
       </template>
-    </el-dialog>
-  </div>
+    </normal-table>
+    <template #footer>
+      <el-button type="primary" @click="clickConfirmSample">
+        确定
+      </el-button>
+      <el-button @click="cancle">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
 </template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 68ced75..142db45 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -313,6 +313,10 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!list.value.length) {
+    ElMessage.warning('要求样品清单不能为空')
+    return
+  }
   // 检查表格是否存在增加行信息没有完善的情况
   const result = checkList()
   if (result !== 'pass') {
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index 720a2e3..5c07d92 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -29,8 +29,8 @@
 
 // 查询条件
 const listQuery = ref({
-  // sampleNo: '', // 样品编号
-  // sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
   // sampleModel: '', // 型号
   orderId: props.orderId || '', // 委托书id
   customerId: props.customerId || '', // 委托方id
@@ -51,8 +51,8 @@
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
-  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
-  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  // { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  // { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -97,12 +97,14 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
-    sampleModel: '', // 型号
-    customerNo: '', // 委托方代码
-    customerName: '', // 委托方名称
-    startTime: '', // 检定开始时间
-    endTime: '', // 检定结束时间
-    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    // sampleModel: '', // 型号
+    orderId: props.orderId || '', // 委托书id
+    customerId: props.customerId || '', // 委托方id
+    customerNo: props.customerNo || '', // 委托方代码
+    // customerName: '', // 委托方名称
+    // startTime: '', // 检定开始时间
+    // endTime: '', // 检定结束时间
+    // overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
     offset: 1,
     limit: 20,
   }
@@ -146,48 +148,57 @@
 </script>
 
 <template>
-  <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
-      <!-- <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.sampleNo"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.sampleName"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-      </search-area> -->
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="loadingTable"
-        is-showmulti-select
-        :is-multi="true"
-        :height="260"
-        :page-sizes="[20]"
-        @change="changePage"
-        @multi-select="handleSelectionChange"
-      />
-      <template #footer>
-        <el-button type="primary" @click="clickConfirmSample">
-          确定
-        </el-button>
-        <el-button @click="cancle">
-          取消
-        </el-button>
+  <!-- <div class="select-kehu-dialog"> -->
+  <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <search-area
+      style="padding: 0;"
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      :data="list"
+      :total="total"
+      :columns="columns"
+      :query="listQuery"
+      :list-loading="loadingTable"
+      is-showmulti-select
+      :is-multi="true"
+      :height="260"
+      :page-sizes="[20]"
+      @change="changePage"
+      @multi-select="handleSelectionChange"
+    >
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center" fixed="left">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
       </template>
-    </el-dialog>
-  </div>
+    </normal-table>
+    <template #footer>
+      <el-button type="primary" @click="clickConfirmSample">
+        确定
+      </el-button>
+      <el-button @click="cancle">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+  <!-- </div> -->
 </template>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index 6474dce..fb6a3f5 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -10,7 +10,7 @@
 const dialogVisible = ref(false) // 弹窗显示
 const sampleId = ref('') // 样品id
 const orderId = ref('') // 委托单id
-
+const type = ref('distribute')
 // 委托书-证书类别列表
 const certificationTypes = ref<dictType[]>([])
 // 获取字典值
@@ -53,10 +53,16 @@
 }
 
 // 初始化弹窗
-const initDialog = (orderid: string, sampleid: string) => {
+const initDialog = (orderid: string, sampleid: string, sampleStatus: string) => {
   dialogVisible.value = true
   sampleId.value = sampleid
   orderId.value = orderid
+  if (sampleStatus === '3') { // 检测中
+    type.value = 'testing'
+  }
+  else if (sampleStatus === '2') { // 待分发
+    type.value = 'distribute'
+  }
   getInfo()
 }
 
@@ -105,7 +111,7 @@
     <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
       批量添加
     </el-button>
-    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <process-config v-if="orderId" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
     <template #footer>
       <el-button type="primary" @click="saveProcess">
         确定

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 574d62e..df5e257 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -61,9 +61,18 @@
 }
 
 // 关联委托书的且是已收入的样品的列表
+// export function getSampleList(data: ISampleListQuery) {
+//   return request({
+//     url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// 查询样品列表
 export function getSampleList(data: ISampleListQuery) {
   return request({
-    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/sample/listPageByInterchange?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index fd22d7c..6e72218 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -1,4 +1,4 @@
-<!-- 任务分发详情 -->
+<!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
@@ -11,7 +11,6 @@
 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
@@ -31,7 +30,7 @@
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
   })
-  // 获取样品属性
+  // 获取检定方式
   getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
@@ -154,7 +153,7 @@
   },
 ]
 
-const currentMenu = ref('证书监控')
+const currentMenu = ref('检定记录')
 const currentMenuObj = computed(() => {
   return menu.find(item => item.name === currentMenu.value)
 })
@@ -175,38 +174,6 @@
   extarCss: '',
 })
 
-// 保存样品信息
-function saveForm(formEl: FormInstance | undefined) {
-  if (!formEl) { return }
-  formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认修改样品信息吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        if (sampleForm.value.id) {
-          updateSample(sampleForm.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
-      })
-    }
-  })
-}
-//
-const getSampleInfo = () => {
-  getSapmleDetail({ id: sampleId.value }).then((res) => {
-    sampleForm.value = res.data
-  })
-}
 // 获取分发详情
 const getInfo = () => {
   // 获取任务详情
@@ -215,58 +182,23 @@
     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
+    taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
+    taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
+    console.log('pppppp')
+    console.log(taskForm.value.measureProcessList)
+
     // 改用一个接口获取
     sampleForm.value = res.data
   })
 }
 
-// 点击标签绑定的扫描
-const startScan = () => {
-  // TODO
-}
-
 // 流程配置组件
 const processConfigRef = ref()
-// 批量添加流程按钮点击
-const batchProcessAdd = () => {
-  processConfigRef.value.batchProcessAdd()
-}
-// 保存流程按钮点击
-const saveProcess = () => {
-  processConfigRef.value.saveProcess()
-}
-
-// 文件上传
-const fileRef = ref()
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
 
 // 从路由中获取页面类型参数
 const $route = useRoute()
-if ($route.params && $route.params.role) {
-  roleType.value = $route.params.role as string // 使用角色
+if ($route.params) {
+  roleType.value = 'detail'
 
   if ($route.params.id) {
     sampleId.value = $route.params.id as string
@@ -527,9 +459,9 @@
                   :disabled="roleType === 'detail'"
                   :class="{ 'detail-input': roleType === 'detail' }"
                 >
-                  <template #append>
+                  <!-- <template #append>
                     <el-button>扫描</el-button>
-                  </template>
+                  </template> -->
                 </el-input>
               </el-form-item>
             </el-col>
@@ -539,8 +471,8 @@
               <el-form-item label="说明书:">
                 <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">
+                <input v-show="roleType === ''" ref="fileRef" type="file">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }">
                   {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
@@ -549,7 +481,7 @@
         </el-form>
       </div>
     </detail-page>
-    <detail-block title="检定流程">
+    <detail-block v-if="taskForm.measureProcessList && taskForm.measureProcessList.length >= 1" title="检定流程">
       <!-- <template #btns>
         <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
           批量添加
@@ -558,15 +490,19 @@
           保存
         </el-button>
       </template> -->
-      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 退回流程 -->
+    <detail-block v-if="taskForm.measureSendBackList && taskForm.measureSendBackList.length >= 1" title="退回流程">
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureSendBackList" :sample-id="sampleId" :detail="true" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
       <template #menu>
         <el-radio-group v-model="currentMenu">
-          <el-radio-button label="证书监控">
+          <!-- <el-radio-button label="证书监控">
             证书监控
-          </el-radio-button>
+          </el-radio-button> -->
           <el-radio-button label="检定记录">
             检定记录
           </el-radio-button>
@@ -576,7 +512,7 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
+      <!-- <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" /> -->
       <!-- 检定记录 -->
       <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
diff --git a/src/views/business/board/overdueReminder/list.vue b/src/views/business/board/overdueReminder/list.vue
index 387fadc..2421546 100644
--- a/src/views/business/board/overdueReminder/list.vue
+++ b/src/views/business/board/overdueReminder/list.vue
@@ -7,22 +7,24 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { exportInterchangeList, getInterChangeList, interchangeListUrge } from '@/api/business/schedule/interchangeList'
+import { exportTaskList, getTaskList } from '@/api/business/schedule/task'
+import { interchangeListUrge } from '@/api/business/schedule/interchangeList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  isUrgent: '', // 是否加急
+  sampleBelong: '', // 样品属性
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  sampleStatus: '8', // 样品状态:8已超期
   offset: 1,
   limit: 20,
-  orderNo: '', // 委托书编号
-  startTime: '', // 预计送达开始时间
-  endTime: '', // 预计送达结束时间
-  isUrgent: '2', // 是否加急 //2全部
-  sampleBelong: '2', // 样品属性 //2全部
-  sampleStatus: '8', // 样品状态 -- 8已超期
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -55,7 +57,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getInterChangeList(listQuery.value).then((response) => {
+  getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -82,15 +84,16 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
+    orderNo: '', // 委托书编号
     customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    isUrgent: '', // 是否加急
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    sampleStatus: '8', // 样品状态:8已超期
     offset: 1,
     limit: 20,
-    orderNo: '', // 委托书编号
-    startTime: '', // 预计送达开始时间
-    endTime: '', // 预计送达结束时间
-    isUrgent: '2', // 是否加急 //2全部
-    sampleBelong: '2', // 样品属性 //2全部
-    sampleStatus: '8', // 样品状态 -- 8已超期
   }
   fetchData(true)
 }
@@ -136,20 +139,19 @@
   })
   if (list.value.length > 0) {
     const params = {
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      offset: 1,
-      limit: 20,
-      orderNo: listQuery.value.orderNo, // 委托书编号
-      startTime: listQuery.value.startTime, // 预计送达开始时间
-      endTime: listQuery.value.endTime, // 预计送达结束时间
-      isUrgent: '2', // 是否加急 //2全部
-      sampleBelong: '2', // 样品属性 //2全部
+      sampleNo: '', // 样品编号
+      sampleName: '', // 样品名称
+      orderNo: '', // 委托书编号
+      customerNo: '', // 委托方代码
+      customerName: '', // 委托方名称
+      isUrgent: '', // 是否加急
+      sampleBelong: '', // 样品属性
+      startTime: '', //	应检定开始时间
+      endTime: '', //	应检定结束时间
       sampleStatus: '8', // 样品状态 -- 8已超期
       ids: checkoutList.value,
     }
-    exportInterchangeList(params).then((res) => {
+    exportTaskList(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '样品超期提醒列表.xlsx')
     })
@@ -247,7 +249,6 @@
                 详情
               </el-button>
               <el-button
-                v-if="row.isSelfMeasure"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/board/overdueReminder/overdueReminder_interface.ts b/src/views/business/board/overdueReminder/overdueReminder_interface.ts
index 28bdcb1..45bcf9e 100644
--- a/src/views/business/board/overdueReminder/overdueReminder_interface.ts
+++ b/src/views/business/board/overdueReminder/overdueReminder_interface.ts
@@ -4,13 +4,14 @@
   sampleName: string // 样品名称
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
-  offset: number
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
-  startTime: string // 预计送达开始时间
-  endTime: string // 预计送达结束时间
-  isUrgent: string // 是否加急 //2全部
-  sampleBelong: string // 样品属性 //2全部
-  sampleStatus: string // 样品状态
+  offset: number
 }
 // 表格
 export interface IList {
diff --git a/src/views/business/schedule/components/terminateDialog.vue b/src/views/business/schedule/components/terminateDialog.vue
index d5f85a0..17c8b15 100644
--- a/src/views/business/schedule/components/terminateDialog.vue
+++ b/src/views/business/schedule/components/terminateDialog.vue
@@ -32,7 +32,7 @@
  * @param orderId 委托书id
  * @param sampleId 样品id
  */
-function initDialog(row) {
+function initDialog(row: any) {
   // dataFormRef.value!.clearValidate()
   formData.value.orderId = row.orderId
   formData.value.sampleId = row.sampleId
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index c629542..83a076e 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -220,6 +220,7 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderNo = val[0].orderCode // 委托书编号
     dataForm.value.orderId = val[0].id // 委托书id
     dataForm.value.deliverer = val[0].deliverer // 送检人
     dataForm.value.delivererTel = val[0].delivererTel // 送检人
@@ -233,13 +234,17 @@
   }
 }
 
-// ------------------------样品-----------------------------
+// ----------------------------------样品----------------------------------------------
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.customerNo) {
+  if (!dataForm.value.orderCode) {
     ElMessage.warning('请先选择委托书')
     return
   }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
   sampleVisible.value = true
 }
 // 修改委托方对话框显隐
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index b3089b4..4b4432e 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -79,6 +79,7 @@
   customerId: string // 委托方id
   sampleName: string // 样品名称
   sampleNo: string // 样品编号
+  customerName: string // 委托方名称
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index 11d3092..6c1cb6c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -25,6 +25,7 @@
   customerId: '', // 委托方id
   sampleName: '', // 样品名称
   sampleNo: '', // 样品编号
+  customerName: '', // 委托方名称
   offset: 1,
   limit: 20,
 })
@@ -36,9 +37,9 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '检定周期', value: 'measurePeriod', align: 'center' },
-  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
-  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  // { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  // { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  // { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -84,6 +85,7 @@
     customerId: '', // 委托方id
     sampleName: '', // 样品名称
     sampleNo: '', // 样品编号
+    customerName: '', // 委托方名称
     offset: 1,
     limit: 20,
   }
@@ -127,56 +129,55 @@
 </script>
 
 <template>
-  <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" @close="cancle">
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.sampleNo"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.sampleName"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="loadingTable"
-        is-showmulti-select
-        :is-multi="true"
-        :height="260"
-        :page-sizes="[20]"
-        @change="changePage"
-        @multiSelect="handleSelectionChange"
-      >
-        <template #preColumns>
-          <el-table-column label="#" width="55" align="center" fixed>
-            <template #default="scope">
-              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-      <template #footer>
-        <el-button type="primary" @click="clickConfirmSample">
-          确定
-        </el-button>
-        <el-button @click="cancle">
-          取消
-        </el-button>
+  <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <search-area
+      style="padding: 0;"
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      :data="list"
+      :total="total"
+      :columns="columns"
+      :query="listQuery"
+      :list-loading="loadingTable"
+      is-showmulti-select
+      :is-multi="true"
+      :height="260"
+      :page-sizes="[20]"
+      @change="changePage"
+      @multiSelect="handleSelectionChange"
+    >
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center" fixed>
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
       </template>
-    </el-dialog>
-  </div>
+    </normal-table>
+    <template #footer>
+      <el-button type="primary" @click="clickConfirmSample">
+        确定
+      </el-button>
+      <el-button @click="cancle">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
 </template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 68ced75..142db45 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -313,6 +313,10 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!list.value.length) {
+    ElMessage.warning('要求样品清单不能为空')
+    return
+  }
   // 检查表格是否存在增加行信息没有完善的情况
   const result = checkList()
   if (result !== 'pass') {
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index 720a2e3..5c07d92 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -29,8 +29,8 @@
 
 // 查询条件
 const listQuery = ref({
-  // sampleNo: '', // 样品编号
-  // sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
   // sampleModel: '', // 型号
   orderId: props.orderId || '', // 委托书id
   customerId: props.customerId || '', // 委托方id
@@ -51,8 +51,8 @@
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
-  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
-  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  // { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  // { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -97,12 +97,14 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
-    sampleModel: '', // 型号
-    customerNo: '', // 委托方代码
-    customerName: '', // 委托方名称
-    startTime: '', // 检定开始时间
-    endTime: '', // 检定结束时间
-    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    // sampleModel: '', // 型号
+    orderId: props.orderId || '', // 委托书id
+    customerId: props.customerId || '', // 委托方id
+    customerNo: props.customerNo || '', // 委托方代码
+    // customerName: '', // 委托方名称
+    // startTime: '', // 检定开始时间
+    // endTime: '', // 检定结束时间
+    // overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
     offset: 1,
     limit: 20,
   }
@@ -146,48 +148,57 @@
 </script>
 
 <template>
-  <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
-      <!-- <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.sampleNo"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.sampleName"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-      </search-area> -->
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="loadingTable"
-        is-showmulti-select
-        :is-multi="true"
-        :height="260"
-        :page-sizes="[20]"
-        @change="changePage"
-        @multi-select="handleSelectionChange"
-      />
-      <template #footer>
-        <el-button type="primary" @click="clickConfirmSample">
-          确定
-        </el-button>
-        <el-button @click="cancle">
-          取消
-        </el-button>
+  <!-- <div class="select-kehu-dialog"> -->
+  <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <search-area
+      style="padding: 0;"
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      :data="list"
+      :total="total"
+      :columns="columns"
+      :query="listQuery"
+      :list-loading="loadingTable"
+      is-showmulti-select
+      :is-multi="true"
+      :height="260"
+      :page-sizes="[20]"
+      @change="changePage"
+      @multi-select="handleSelectionChange"
+    >
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center" fixed="left">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
       </template>
-    </el-dialog>
-  </div>
+    </normal-table>
+    <template #footer>
+      <el-button type="primary" @click="clickConfirmSample">
+        确定
+      </el-button>
+      <el-button @click="cancle">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+  <!-- </div> -->
 </template>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index 6474dce..fb6a3f5 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -10,7 +10,7 @@
 const dialogVisible = ref(false) // 弹窗显示
 const sampleId = ref('') // 样品id
 const orderId = ref('') // 委托单id
-
+const type = ref('distribute')
 // 委托书-证书类别列表
 const certificationTypes = ref<dictType[]>([])
 // 获取字典值
@@ -53,10 +53,16 @@
 }
 
 // 初始化弹窗
-const initDialog = (orderid: string, sampleid: string) => {
+const initDialog = (orderid: string, sampleid: string, sampleStatus: string) => {
   dialogVisible.value = true
   sampleId.value = sampleid
   orderId.value = orderid
+  if (sampleStatus === '3') { // 检测中
+    type.value = 'testing'
+  }
+  else if (sampleStatus === '2') { // 待分发
+    type.value = 'distribute'
+  }
   getInfo()
 }
 
@@ -105,7 +111,7 @@
     <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
       批量添加
     </el-button>
-    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <process-config v-if="orderId" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
     <template #footer>
       <el-button type="primary" @click="saveProcess">
         确定
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 43f2165..bb66076 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -56,7 +56,8 @@
   if (props.list.length > 0) {
     processList.value = props.list as ISchedule[]
   }
-})
+},
+{ deep: true, immediate: true })
 
 // 点击添加流程
 const processAdd = () => {
@@ -103,6 +104,7 @@
 const saveProcess = () => {
   const form = {
     measureProcessList: processList.value,
+    executiveList: processList.value,
     orderId: props.orderId,
     sampleId: props.sampleId,
   }
@@ -138,7 +140,7 @@
       <draggable v-model="processList" item-key="id" class="process-draggable" handle=".handle" :move="checkMove">
         <!-- eslint-disable-next-line vue/no-unused-vars -->
         <template #item="{ process, index }">
-          <process-node v-model="processList[index]" :step="index + 1" @delete="deleteProcess(index)" />
+          <process-node v-model="processList[index]" :step="index + 1" :detail="props.detail" @delete="deleteProcess(index)" />
         </template>
         <template #footer>
           <process-node-add v-if="!props.detail" @click="processAdd" />

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 574d62e..df5e257 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -61,9 +61,18 @@
 }
 
 // 关联委托书的且是已收入的样品的列表
+// export function getSampleList(data: ISampleListQuery) {
+//   return request({
+//     url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// 查询样品列表
 export function getSampleList(data: ISampleListQuery) {
   return request({
-    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/sample/listPageByInterchange?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index fd22d7c..6e72218 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -1,4 +1,4 @@
-<!-- 任务分发详情 -->
+<!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
@@ -11,7 +11,6 @@
 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
@@ -31,7 +30,7 @@
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
   })
-  // 获取样品属性
+  // 获取检定方式
   getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
@@ -154,7 +153,7 @@
   },
 ]
 
-const currentMenu = ref('证书监控')
+const currentMenu = ref('检定记录')
 const currentMenuObj = computed(() => {
   return menu.find(item => item.name === currentMenu.value)
 })
@@ -175,38 +174,6 @@
   extarCss: '',
 })
 
-// 保存样品信息
-function saveForm(formEl: FormInstance | undefined) {
-  if (!formEl) { return }
-  formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认修改样品信息吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        if (sampleForm.value.id) {
-          updateSample(sampleForm.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
-      })
-    }
-  })
-}
-//
-const getSampleInfo = () => {
-  getSapmleDetail({ id: sampleId.value }).then((res) => {
-    sampleForm.value = res.data
-  })
-}
 // 获取分发详情
 const getInfo = () => {
   // 获取任务详情
@@ -215,58 +182,23 @@
     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
+    taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
+    taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
+    console.log('pppppp')
+    console.log(taskForm.value.measureProcessList)
+
     // 改用一个接口获取
     sampleForm.value = res.data
   })
 }
 
-// 点击标签绑定的扫描
-const startScan = () => {
-  // TODO
-}
-
 // 流程配置组件
 const processConfigRef = ref()
-// 批量添加流程按钮点击
-const batchProcessAdd = () => {
-  processConfigRef.value.batchProcessAdd()
-}
-// 保存流程按钮点击
-const saveProcess = () => {
-  processConfigRef.value.saveProcess()
-}
-
-// 文件上传
-const fileRef = ref()
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
 
 // 从路由中获取页面类型参数
 const $route = useRoute()
-if ($route.params && $route.params.role) {
-  roleType.value = $route.params.role as string // 使用角色
+if ($route.params) {
+  roleType.value = 'detail'
 
   if ($route.params.id) {
     sampleId.value = $route.params.id as string
@@ -527,9 +459,9 @@
                   :disabled="roleType === 'detail'"
                   :class="{ 'detail-input': roleType === 'detail' }"
                 >
-                  <template #append>
+                  <!-- <template #append>
                     <el-button>扫描</el-button>
-                  </template>
+                  </template> -->
                 </el-input>
               </el-form-item>
             </el-col>
@@ -539,8 +471,8 @@
               <el-form-item label="说明书:">
                 <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">
+                <input v-show="roleType === ''" ref="fileRef" type="file">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }">
                   {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
@@ -549,7 +481,7 @@
         </el-form>
       </div>
     </detail-page>
-    <detail-block title="检定流程">
+    <detail-block v-if="taskForm.measureProcessList && taskForm.measureProcessList.length >= 1" title="检定流程">
       <!-- <template #btns>
         <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
           批量添加
@@ -558,15 +490,19 @@
           保存
         </el-button>
       </template> -->
-      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 退回流程 -->
+    <detail-block v-if="taskForm.measureSendBackList && taskForm.measureSendBackList.length >= 1" title="退回流程">
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureSendBackList" :sample-id="sampleId" :detail="true" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
       <template #menu>
         <el-radio-group v-model="currentMenu">
-          <el-radio-button label="证书监控">
+          <!-- <el-radio-button label="证书监控">
             证书监控
-          </el-radio-button>
+          </el-radio-button> -->
           <el-radio-button label="检定记录">
             检定记录
           </el-radio-button>
@@ -576,7 +512,7 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
+      <!-- <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" /> -->
       <!-- 检定记录 -->
       <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
diff --git a/src/views/business/board/overdueReminder/list.vue b/src/views/business/board/overdueReminder/list.vue
index 387fadc..2421546 100644
--- a/src/views/business/board/overdueReminder/list.vue
+++ b/src/views/business/board/overdueReminder/list.vue
@@ -7,22 +7,24 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { exportInterchangeList, getInterChangeList, interchangeListUrge } from '@/api/business/schedule/interchangeList'
+import { exportTaskList, getTaskList } from '@/api/business/schedule/task'
+import { interchangeListUrge } from '@/api/business/schedule/interchangeList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  isUrgent: '', // 是否加急
+  sampleBelong: '', // 样品属性
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  sampleStatus: '8', // 样品状态:8已超期
   offset: 1,
   limit: 20,
-  orderNo: '', // 委托书编号
-  startTime: '', // 预计送达开始时间
-  endTime: '', // 预计送达结束时间
-  isUrgent: '2', // 是否加急 //2全部
-  sampleBelong: '2', // 样品属性 //2全部
-  sampleStatus: '8', // 样品状态 -- 8已超期
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -55,7 +57,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getInterChangeList(listQuery.value).then((response) => {
+  getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -82,15 +84,16 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
+    orderNo: '', // 委托书编号
     customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    isUrgent: '', // 是否加急
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    sampleStatus: '8', // 样品状态:8已超期
     offset: 1,
     limit: 20,
-    orderNo: '', // 委托书编号
-    startTime: '', // 预计送达开始时间
-    endTime: '', // 预计送达结束时间
-    isUrgent: '2', // 是否加急 //2全部
-    sampleBelong: '2', // 样品属性 //2全部
-    sampleStatus: '8', // 样品状态 -- 8已超期
   }
   fetchData(true)
 }
@@ -136,20 +139,19 @@
   })
   if (list.value.length > 0) {
     const params = {
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      offset: 1,
-      limit: 20,
-      orderNo: listQuery.value.orderNo, // 委托书编号
-      startTime: listQuery.value.startTime, // 预计送达开始时间
-      endTime: listQuery.value.endTime, // 预计送达结束时间
-      isUrgent: '2', // 是否加急 //2全部
-      sampleBelong: '2', // 样品属性 //2全部
+      sampleNo: '', // 样品编号
+      sampleName: '', // 样品名称
+      orderNo: '', // 委托书编号
+      customerNo: '', // 委托方代码
+      customerName: '', // 委托方名称
+      isUrgent: '', // 是否加急
+      sampleBelong: '', // 样品属性
+      startTime: '', //	应检定开始时间
+      endTime: '', //	应检定结束时间
       sampleStatus: '8', // 样品状态 -- 8已超期
       ids: checkoutList.value,
     }
-    exportInterchangeList(params).then((res) => {
+    exportTaskList(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '样品超期提醒列表.xlsx')
     })
@@ -247,7 +249,6 @@
                 详情
               </el-button>
               <el-button
-                v-if="row.isSelfMeasure"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/board/overdueReminder/overdueReminder_interface.ts b/src/views/business/board/overdueReminder/overdueReminder_interface.ts
index 28bdcb1..45bcf9e 100644
--- a/src/views/business/board/overdueReminder/overdueReminder_interface.ts
+++ b/src/views/business/board/overdueReminder/overdueReminder_interface.ts
@@ -4,13 +4,14 @@
   sampleName: string // 样品名称
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
-  offset: number
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
-  startTime: string // 预计送达开始时间
-  endTime: string // 预计送达结束时间
-  isUrgent: string // 是否加急 //2全部
-  sampleBelong: string // 样品属性 //2全部
-  sampleStatus: string // 样品状态
+  offset: number
 }
 // 表格
 export interface IList {
diff --git a/src/views/business/schedule/components/terminateDialog.vue b/src/views/business/schedule/components/terminateDialog.vue
index d5f85a0..17c8b15 100644
--- a/src/views/business/schedule/components/terminateDialog.vue
+++ b/src/views/business/schedule/components/terminateDialog.vue
@@ -32,7 +32,7 @@
  * @param orderId 委托书id
  * @param sampleId 样品id
  */
-function initDialog(row) {
+function initDialog(row: any) {
   // dataFormRef.value!.clearValidate()
   formData.value.orderId = row.orderId
   formData.value.sampleId = row.sampleId
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index c629542..83a076e 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -220,6 +220,7 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderNo = val[0].orderCode // 委托书编号
     dataForm.value.orderId = val[0].id // 委托书id
     dataForm.value.deliverer = val[0].deliverer // 送检人
     dataForm.value.delivererTel = val[0].delivererTel // 送检人
@@ -233,13 +234,17 @@
   }
 }
 
-// ------------------------样品-----------------------------
+// ----------------------------------样品----------------------------------------------
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.customerNo) {
+  if (!dataForm.value.orderCode) {
     ElMessage.warning('请先选择委托书')
     return
   }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
   sampleVisible.value = true
 }
 // 修改委托方对话框显隐
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index b3089b4..4b4432e 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -79,6 +79,7 @@
   customerId: string // 委托方id
   sampleName: string // 样品名称
   sampleNo: string // 样品编号
+  customerName: string // 委托方名称
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index 11d3092..6c1cb6c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -25,6 +25,7 @@
   customerId: '', // 委托方id
   sampleName: '', // 样品名称
   sampleNo: '', // 样品编号
+  customerName: '', // 委托方名称
   offset: 1,
   limit: 20,
 })
@@ -36,9 +37,9 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '检定周期', value: 'measurePeriod', align: 'center' },
-  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
-  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  // { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  // { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  // { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -84,6 +85,7 @@
     customerId: '', // 委托方id
     sampleName: '', // 样品名称
     sampleNo: '', // 样品编号
+    customerName: '', // 委托方名称
     offset: 1,
     limit: 20,
   }
@@ -127,56 +129,55 @@
 </script>
 
 <template>
-  <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" @close="cancle">
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.sampleNo"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.sampleName"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="loadingTable"
-        is-showmulti-select
-        :is-multi="true"
-        :height="260"
-        :page-sizes="[20]"
-        @change="changePage"
-        @multiSelect="handleSelectionChange"
-      >
-        <template #preColumns>
-          <el-table-column label="#" width="55" align="center" fixed>
-            <template #default="scope">
-              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-      <template #footer>
-        <el-button type="primary" @click="clickConfirmSample">
-          确定
-        </el-button>
-        <el-button @click="cancle">
-          取消
-        </el-button>
+  <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <search-area
+      style="padding: 0;"
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      :data="list"
+      :total="total"
+      :columns="columns"
+      :query="listQuery"
+      :list-loading="loadingTable"
+      is-showmulti-select
+      :is-multi="true"
+      :height="260"
+      :page-sizes="[20]"
+      @change="changePage"
+      @multiSelect="handleSelectionChange"
+    >
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center" fixed>
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
       </template>
-    </el-dialog>
-  </div>
+    </normal-table>
+    <template #footer>
+      <el-button type="primary" @click="clickConfirmSample">
+        确定
+      </el-button>
+      <el-button @click="cancle">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
 </template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 68ced75..142db45 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -313,6 +313,10 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!list.value.length) {
+    ElMessage.warning('要求样品清单不能为空')
+    return
+  }
   // 检查表格是否存在增加行信息没有完善的情况
   const result = checkList()
   if (result !== 'pass') {
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index 720a2e3..5c07d92 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -29,8 +29,8 @@
 
 // 查询条件
 const listQuery = ref({
-  // sampleNo: '', // 样品编号
-  // sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
   // sampleModel: '', // 型号
   orderId: props.orderId || '', // 委托书id
   customerId: props.customerId || '', // 委托方id
@@ -51,8 +51,8 @@
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
-  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
-  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  // { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  // { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -97,12 +97,14 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
-    sampleModel: '', // 型号
-    customerNo: '', // 委托方代码
-    customerName: '', // 委托方名称
-    startTime: '', // 检定开始时间
-    endTime: '', // 检定结束时间
-    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    // sampleModel: '', // 型号
+    orderId: props.orderId || '', // 委托书id
+    customerId: props.customerId || '', // 委托方id
+    customerNo: props.customerNo || '', // 委托方代码
+    // customerName: '', // 委托方名称
+    // startTime: '', // 检定开始时间
+    // endTime: '', // 检定结束时间
+    // overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
     offset: 1,
     limit: 20,
   }
@@ -146,48 +148,57 @@
 </script>
 
 <template>
-  <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
-      <!-- <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.sampleNo"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.sampleName"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-      </search-area> -->
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="loadingTable"
-        is-showmulti-select
-        :is-multi="true"
-        :height="260"
-        :page-sizes="[20]"
-        @change="changePage"
-        @multi-select="handleSelectionChange"
-      />
-      <template #footer>
-        <el-button type="primary" @click="clickConfirmSample">
-          确定
-        </el-button>
-        <el-button @click="cancle">
-          取消
-        </el-button>
+  <!-- <div class="select-kehu-dialog"> -->
+  <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <search-area
+      style="padding: 0;"
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      :data="list"
+      :total="total"
+      :columns="columns"
+      :query="listQuery"
+      :list-loading="loadingTable"
+      is-showmulti-select
+      :is-multi="true"
+      :height="260"
+      :page-sizes="[20]"
+      @change="changePage"
+      @multi-select="handleSelectionChange"
+    >
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center" fixed="left">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
       </template>
-    </el-dialog>
-  </div>
+    </normal-table>
+    <template #footer>
+      <el-button type="primary" @click="clickConfirmSample">
+        确定
+      </el-button>
+      <el-button @click="cancle">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+  <!-- </div> -->
 </template>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index 6474dce..fb6a3f5 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -10,7 +10,7 @@
 const dialogVisible = ref(false) // 弹窗显示
 const sampleId = ref('') // 样品id
 const orderId = ref('') // 委托单id
-
+const type = ref('distribute')
 // 委托书-证书类别列表
 const certificationTypes = ref<dictType[]>([])
 // 获取字典值
@@ -53,10 +53,16 @@
 }
 
 // 初始化弹窗
-const initDialog = (orderid: string, sampleid: string) => {
+const initDialog = (orderid: string, sampleid: string, sampleStatus: string) => {
   dialogVisible.value = true
   sampleId.value = sampleid
   orderId.value = orderid
+  if (sampleStatus === '3') { // 检测中
+    type.value = 'testing'
+  }
+  else if (sampleStatus === '2') { // 待分发
+    type.value = 'distribute'
+  }
   getInfo()
 }
 
@@ -105,7 +111,7 @@
     <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
       批量添加
     </el-button>
-    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <process-config v-if="orderId" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
     <template #footer>
       <el-button type="primary" @click="saveProcess">
         确定
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 43f2165..bb66076 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -56,7 +56,8 @@
   if (props.list.length > 0) {
     processList.value = props.list as ISchedule[]
   }
-})
+},
+{ deep: true, immediate: true })
 
 // 点击添加流程
 const processAdd = () => {
@@ -103,6 +104,7 @@
 const saveProcess = () => {
   const form = {
     measureProcessList: processList.value,
+    executiveList: processList.value,
     orderId: props.orderId,
     sampleId: props.sampleId,
   }
@@ -138,7 +140,7 @@
       <draggable v-model="processList" item-key="id" class="process-draggable" handle=".handle" :move="checkMove">
         <!-- eslint-disable-next-line vue/no-unused-vars -->
         <template #item="{ process, index }">
-          <process-node v-model="processList[index]" :step="index + 1" @delete="deleteProcess(index)" />
+          <process-node v-model="processList[index]" :step="index + 1" :detail="props.detail" @delete="deleteProcess(index)" />
         </template>
         <template #footer>
           <process-node-add v-if="!props.detail" @click="processAdd" />
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index d76d41d..fbe1c47 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -25,7 +25,7 @@
       }
     },
   },
-  // 是否为详情展示页面-暂时无用
+  // 是否为详情展示页面
   detail: {
     type: Boolean,
     default: false,
@@ -111,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
+        <el-icon v-show="canMove && !props.detail" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon v-show="canMove" class="icon-button handle" title="移动">
+        <el-icon v-show="canMove && !props.detail" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -130,14 +130,14 @@
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit">
-          <template v-if="personEdit" #append>
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit || props.detail">
+          <template v-if="personEdit && !props.detail" #append>
             <el-button :icon="Aim" size="small" link :disabled="processNodeData.measureSegment === ''" @click="choosePerson" />
           </template>
         </el-input>
       </div>
       <div class="line">
-        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit || props.detail" /><span class="unit"> 份</span>
       </div>
       <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 574d62e..df5e257 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -61,9 +61,18 @@
 }
 
 // 关联委托书的且是已收入的样品的列表
+// export function getSampleList(data: ISampleListQuery) {
+//   return request({
+//     url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// 查询样品列表
 export function getSampleList(data: ISampleListQuery) {
   return request({
-    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/sample/listPageByInterchange?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index fd22d7c..6e72218 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -1,4 +1,4 @@
-<!-- 任务分发详情 -->
+<!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
@@ -11,7 +11,6 @@
 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
@@ -31,7 +30,7 @@
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
   })
-  // 获取样品属性
+  // 获取检定方式
   getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
@@ -154,7 +153,7 @@
   },
 ]
 
-const currentMenu = ref('证书监控')
+const currentMenu = ref('检定记录')
 const currentMenuObj = computed(() => {
   return menu.find(item => item.name === currentMenu.value)
 })
@@ -175,38 +174,6 @@
   extarCss: '',
 })
 
-// 保存样品信息
-function saveForm(formEl: FormInstance | undefined) {
-  if (!formEl) { return }
-  formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认修改样品信息吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        if (sampleForm.value.id) {
-          updateSample(sampleForm.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
-      })
-    }
-  })
-}
-//
-const getSampleInfo = () => {
-  getSapmleDetail({ id: sampleId.value }).then((res) => {
-    sampleForm.value = res.data
-  })
-}
 // 获取分发详情
 const getInfo = () => {
   // 获取任务详情
@@ -215,58 +182,23 @@
     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
+    taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
+    taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
+    console.log('pppppp')
+    console.log(taskForm.value.measureProcessList)
+
     // 改用一个接口获取
     sampleForm.value = res.data
   })
 }
 
-// 点击标签绑定的扫描
-const startScan = () => {
-  // TODO
-}
-
 // 流程配置组件
 const processConfigRef = ref()
-// 批量添加流程按钮点击
-const batchProcessAdd = () => {
-  processConfigRef.value.batchProcessAdd()
-}
-// 保存流程按钮点击
-const saveProcess = () => {
-  processConfigRef.value.saveProcess()
-}
-
-// 文件上传
-const fileRef = ref()
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
 
 // 从路由中获取页面类型参数
 const $route = useRoute()
-if ($route.params && $route.params.role) {
-  roleType.value = $route.params.role as string // 使用角色
+if ($route.params) {
+  roleType.value = 'detail'
 
   if ($route.params.id) {
     sampleId.value = $route.params.id as string
@@ -527,9 +459,9 @@
                   :disabled="roleType === 'detail'"
                   :class="{ 'detail-input': roleType === 'detail' }"
                 >
-                  <template #append>
+                  <!-- <template #append>
                     <el-button>扫描</el-button>
-                  </template>
+                  </template> -->
                 </el-input>
               </el-form-item>
             </el-col>
@@ -539,8 +471,8 @@
               <el-form-item label="说明书:">
                 <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">
+                <input v-show="roleType === ''" ref="fileRef" type="file">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }">
                   {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
@@ -549,7 +481,7 @@
         </el-form>
       </div>
     </detail-page>
-    <detail-block title="检定流程">
+    <detail-block v-if="taskForm.measureProcessList && taskForm.measureProcessList.length >= 1" title="检定流程">
       <!-- <template #btns>
         <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
           批量添加
@@ -558,15 +490,19 @@
           保存
         </el-button>
       </template> -->
-      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 退回流程 -->
+    <detail-block v-if="taskForm.measureSendBackList && taskForm.measureSendBackList.length >= 1" title="退回流程">
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureSendBackList" :sample-id="sampleId" :detail="true" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
       <template #menu>
         <el-radio-group v-model="currentMenu">
-          <el-radio-button label="证书监控">
+          <!-- <el-radio-button label="证书监控">
             证书监控
-          </el-radio-button>
+          </el-radio-button> -->
           <el-radio-button label="检定记录">
             检定记录
           </el-radio-button>
@@ -576,7 +512,7 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
+      <!-- <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" /> -->
       <!-- 检定记录 -->
       <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
diff --git a/src/views/business/board/overdueReminder/list.vue b/src/views/business/board/overdueReminder/list.vue
index 387fadc..2421546 100644
--- a/src/views/business/board/overdueReminder/list.vue
+++ b/src/views/business/board/overdueReminder/list.vue
@@ -7,22 +7,24 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { exportInterchangeList, getInterChangeList, interchangeListUrge } from '@/api/business/schedule/interchangeList'
+import { exportTaskList, getTaskList } from '@/api/business/schedule/task'
+import { interchangeListUrge } from '@/api/business/schedule/interchangeList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  isUrgent: '', // 是否加急
+  sampleBelong: '', // 样品属性
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  sampleStatus: '8', // 样品状态:8已超期
   offset: 1,
   limit: 20,
-  orderNo: '', // 委托书编号
-  startTime: '', // 预计送达开始时间
-  endTime: '', // 预计送达结束时间
-  isUrgent: '2', // 是否加急 //2全部
-  sampleBelong: '2', // 样品属性 //2全部
-  sampleStatus: '8', // 样品状态 -- 8已超期
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -55,7 +57,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getInterChangeList(listQuery.value).then((response) => {
+  getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -82,15 +84,16 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
+    orderNo: '', // 委托书编号
     customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    isUrgent: '', // 是否加急
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    sampleStatus: '8', // 样品状态:8已超期
     offset: 1,
     limit: 20,
-    orderNo: '', // 委托书编号
-    startTime: '', // 预计送达开始时间
-    endTime: '', // 预计送达结束时间
-    isUrgent: '2', // 是否加急 //2全部
-    sampleBelong: '2', // 样品属性 //2全部
-    sampleStatus: '8', // 样品状态 -- 8已超期
   }
   fetchData(true)
 }
@@ -136,20 +139,19 @@
   })
   if (list.value.length > 0) {
     const params = {
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      offset: 1,
-      limit: 20,
-      orderNo: listQuery.value.orderNo, // 委托书编号
-      startTime: listQuery.value.startTime, // 预计送达开始时间
-      endTime: listQuery.value.endTime, // 预计送达结束时间
-      isUrgent: '2', // 是否加急 //2全部
-      sampleBelong: '2', // 样品属性 //2全部
+      sampleNo: '', // 样品编号
+      sampleName: '', // 样品名称
+      orderNo: '', // 委托书编号
+      customerNo: '', // 委托方代码
+      customerName: '', // 委托方名称
+      isUrgent: '', // 是否加急
+      sampleBelong: '', // 样品属性
+      startTime: '', //	应检定开始时间
+      endTime: '', //	应检定结束时间
       sampleStatus: '8', // 样品状态 -- 8已超期
       ids: checkoutList.value,
     }
-    exportInterchangeList(params).then((res) => {
+    exportTaskList(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '样品超期提醒列表.xlsx')
     })
@@ -247,7 +249,6 @@
                 详情
               </el-button>
               <el-button
-                v-if="row.isSelfMeasure"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/board/overdueReminder/overdueReminder_interface.ts b/src/views/business/board/overdueReminder/overdueReminder_interface.ts
index 28bdcb1..45bcf9e 100644
--- a/src/views/business/board/overdueReminder/overdueReminder_interface.ts
+++ b/src/views/business/board/overdueReminder/overdueReminder_interface.ts
@@ -4,13 +4,14 @@
   sampleName: string // 样品名称
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
-  offset: number
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
-  startTime: string // 预计送达开始时间
-  endTime: string // 预计送达结束时间
-  isUrgent: string // 是否加急 //2全部
-  sampleBelong: string // 样品属性 //2全部
-  sampleStatus: string // 样品状态
+  offset: number
 }
 // 表格
 export interface IList {
diff --git a/src/views/business/schedule/components/terminateDialog.vue b/src/views/business/schedule/components/terminateDialog.vue
index d5f85a0..17c8b15 100644
--- a/src/views/business/schedule/components/terminateDialog.vue
+++ b/src/views/business/schedule/components/terminateDialog.vue
@@ -32,7 +32,7 @@
  * @param orderId 委托书id
  * @param sampleId 样品id
  */
-function initDialog(row) {
+function initDialog(row: any) {
   // dataFormRef.value!.clearValidate()
   formData.value.orderId = row.orderId
   formData.value.sampleId = row.sampleId
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index c629542..83a076e 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -220,6 +220,7 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderNo = val[0].orderCode // 委托书编号
     dataForm.value.orderId = val[0].id // 委托书id
     dataForm.value.deliverer = val[0].deliverer // 送检人
     dataForm.value.delivererTel = val[0].delivererTel // 送检人
@@ -233,13 +234,17 @@
   }
 }
 
-// ------------------------样品-----------------------------
+// ----------------------------------样品----------------------------------------------
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.customerNo) {
+  if (!dataForm.value.orderCode) {
     ElMessage.warning('请先选择委托书')
     return
   }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
   sampleVisible.value = true
 }
 // 修改委托方对话框显隐
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index b3089b4..4b4432e 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -79,6 +79,7 @@
   customerId: string // 委托方id
   sampleName: string // 样品名称
   sampleNo: string // 样品编号
+  customerName: string // 委托方名称
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index 11d3092..6c1cb6c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -25,6 +25,7 @@
   customerId: '', // 委托方id
   sampleName: '', // 样品名称
   sampleNo: '', // 样品编号
+  customerName: '', // 委托方名称
   offset: 1,
   limit: 20,
 })
@@ -36,9 +37,9 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '检定周期', value: 'measurePeriod', align: 'center' },
-  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
-  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  // { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  // { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  // { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -84,6 +85,7 @@
     customerId: '', // 委托方id
     sampleName: '', // 样品名称
     sampleNo: '', // 样品编号
+    customerName: '', // 委托方名称
     offset: 1,
     limit: 20,
   }
@@ -127,56 +129,55 @@
 </script>
 
 <template>
-  <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" @close="cancle">
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.sampleNo"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.sampleName"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="loadingTable"
-        is-showmulti-select
-        :is-multi="true"
-        :height="260"
-        :page-sizes="[20]"
-        @change="changePage"
-        @multiSelect="handleSelectionChange"
-      >
-        <template #preColumns>
-          <el-table-column label="#" width="55" align="center" fixed>
-            <template #default="scope">
-              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-      <template #footer>
-        <el-button type="primary" @click="clickConfirmSample">
-          确定
-        </el-button>
-        <el-button @click="cancle">
-          取消
-        </el-button>
+  <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <search-area
+      style="padding: 0;"
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      :data="list"
+      :total="total"
+      :columns="columns"
+      :query="listQuery"
+      :list-loading="loadingTable"
+      is-showmulti-select
+      :is-multi="true"
+      :height="260"
+      :page-sizes="[20]"
+      @change="changePage"
+      @multiSelect="handleSelectionChange"
+    >
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center" fixed>
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
       </template>
-    </el-dialog>
-  </div>
+    </normal-table>
+    <template #footer>
+      <el-button type="primary" @click="clickConfirmSample">
+        确定
+      </el-button>
+      <el-button @click="cancle">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
 </template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 68ced75..142db45 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -313,6 +313,10 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!list.value.length) {
+    ElMessage.warning('要求样品清单不能为空')
+    return
+  }
   // 检查表格是否存在增加行信息没有完善的情况
   const result = checkList()
   if (result !== 'pass') {
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index 720a2e3..5c07d92 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -29,8 +29,8 @@
 
 // 查询条件
 const listQuery = ref({
-  // sampleNo: '', // 样品编号
-  // sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
   // sampleModel: '', // 型号
   orderId: props.orderId || '', // 委托书id
   customerId: props.customerId || '', // 委托方id
@@ -51,8 +51,8 @@
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
-  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
-  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  // { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  // { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -97,12 +97,14 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
-    sampleModel: '', // 型号
-    customerNo: '', // 委托方代码
-    customerName: '', // 委托方名称
-    startTime: '', // 检定开始时间
-    endTime: '', // 检定结束时间
-    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    // sampleModel: '', // 型号
+    orderId: props.orderId || '', // 委托书id
+    customerId: props.customerId || '', // 委托方id
+    customerNo: props.customerNo || '', // 委托方代码
+    // customerName: '', // 委托方名称
+    // startTime: '', // 检定开始时间
+    // endTime: '', // 检定结束时间
+    // overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
     offset: 1,
     limit: 20,
   }
@@ -146,48 +148,57 @@
 </script>
 
 <template>
-  <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
-      <!-- <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.sampleNo"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.sampleName"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-      </search-area> -->
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="loadingTable"
-        is-showmulti-select
-        :is-multi="true"
-        :height="260"
-        :page-sizes="[20]"
-        @change="changePage"
-        @multi-select="handleSelectionChange"
-      />
-      <template #footer>
-        <el-button type="primary" @click="clickConfirmSample">
-          确定
-        </el-button>
-        <el-button @click="cancle">
-          取消
-        </el-button>
+  <!-- <div class="select-kehu-dialog"> -->
+  <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <search-area
+      style="padding: 0;"
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      :data="list"
+      :total="total"
+      :columns="columns"
+      :query="listQuery"
+      :list-loading="loadingTable"
+      is-showmulti-select
+      :is-multi="true"
+      :height="260"
+      :page-sizes="[20]"
+      @change="changePage"
+      @multi-select="handleSelectionChange"
+    >
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center" fixed="left">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
       </template>
-    </el-dialog>
-  </div>
+    </normal-table>
+    <template #footer>
+      <el-button type="primary" @click="clickConfirmSample">
+        确定
+      </el-button>
+      <el-button @click="cancle">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+  <!-- </div> -->
 </template>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index 6474dce..fb6a3f5 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -10,7 +10,7 @@
 const dialogVisible = ref(false) // 弹窗显示
 const sampleId = ref('') // 样品id
 const orderId = ref('') // 委托单id
-
+const type = ref('distribute')
 // 委托书-证书类别列表
 const certificationTypes = ref<dictType[]>([])
 // 获取字典值
@@ -53,10 +53,16 @@
 }
 
 // 初始化弹窗
-const initDialog = (orderid: string, sampleid: string) => {
+const initDialog = (orderid: string, sampleid: string, sampleStatus: string) => {
   dialogVisible.value = true
   sampleId.value = sampleid
   orderId.value = orderid
+  if (sampleStatus === '3') { // 检测中
+    type.value = 'testing'
+  }
+  else if (sampleStatus === '2') { // 待分发
+    type.value = 'distribute'
+  }
   getInfo()
 }
 
@@ -105,7 +111,7 @@
     <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
       批量添加
     </el-button>
-    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <process-config v-if="orderId" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
     <template #footer>
       <el-button type="primary" @click="saveProcess">
         确定
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 43f2165..bb66076 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -56,7 +56,8 @@
   if (props.list.length > 0) {
     processList.value = props.list as ISchedule[]
   }
-})
+},
+{ deep: true, immediate: true })
 
 // 点击添加流程
 const processAdd = () => {
@@ -103,6 +104,7 @@
 const saveProcess = () => {
   const form = {
     measureProcessList: processList.value,
+    executiveList: processList.value,
     orderId: props.orderId,
     sampleId: props.sampleId,
   }
@@ -138,7 +140,7 @@
       <draggable v-model="processList" item-key="id" class="process-draggable" handle=".handle" :move="checkMove">
         <!-- eslint-disable-next-line vue/no-unused-vars -->
         <template #item="{ process, index }">
-          <process-node v-model="processList[index]" :step="index + 1" @delete="deleteProcess(index)" />
+          <process-node v-model="processList[index]" :step="index + 1" :detail="props.detail" @delete="deleteProcess(index)" />
         </template>
         <template #footer>
           <process-node-add v-if="!props.detail" @click="processAdd" />
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index d76d41d..fbe1c47 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -25,7 +25,7 @@
       }
     },
   },
-  // 是否为详情展示页面-暂时无用
+  // 是否为详情展示页面
   detail: {
     type: Boolean,
     default: false,
@@ -111,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
+        <el-icon v-show="canMove && !props.detail" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon v-show="canMove" class="icon-button handle" title="移动">
+        <el-icon v-show="canMove && !props.detail" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -130,14 +130,14 @@
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit">
-          <template v-if="personEdit" #append>
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit || props.detail">
+          <template v-if="personEdit && !props.detail" #append>
             <el-button :icon="Aim" size="small" link :disabled="processNodeData.measureSegment === ''" @click="choosePerson" />
           </template>
         </el-input>
       </div>
       <div class="line">
-        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit || props.detail" /><span class="unit"> 份</span>
       </div>
       <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index d64aa23..1d1e04f 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -215,8 +215,11 @@
     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
+    taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
+    taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
+    console.log('pppppp')
+    console.log(taskForm.value.measureProcessList)
+
     // 改用一个接口获取
     sampleForm.value = res.data
   })
@@ -558,7 +561,11 @@
           保存
         </el-button>
       </template> -->
-      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 退回流程 -->
+    <detail-block v-if="taskForm.measureSendBackList && taskForm.measureSendBackList.length >= 1" title="退回流程">
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureSendBackList" :sample-id="sampleId" :detail="true" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index 574d62e..df5e257 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -61,9 +61,18 @@
 }
 
 // 关联委托书的且是已收入的样品的列表
+// export function getSampleList(data: ISampleListQuery) {
+//   return request({
+//     url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+//     method: 'post',
+//     data,
+//   })
+// }
+
+// 查询样品列表
 export function getSampleList(data: ISampleListQuery) {
   return request({
-    url: `${prefix}/sampleList?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/sample/listPageByInterchange?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index fd22d7c..6e72218 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -1,4 +1,4 @@
-<!-- 任务分发详情 -->
+<!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
@@ -11,7 +11,6 @@
 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
@@ -31,7 +30,7 @@
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
   })
-  // 获取样品属性
+  // 获取检定方式
   getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
@@ -154,7 +153,7 @@
   },
 ]
 
-const currentMenu = ref('证书监控')
+const currentMenu = ref('检定记录')
 const currentMenuObj = computed(() => {
   return menu.find(item => item.name === currentMenu.value)
 })
@@ -175,38 +174,6 @@
   extarCss: '',
 })
 
-// 保存样品信息
-function saveForm(formEl: FormInstance | undefined) {
-  if (!formEl) { return }
-  formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认修改样品信息吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        if (sampleForm.value.id) {
-          updateSample(sampleForm.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
-      })
-    }
-  })
-}
-//
-const getSampleInfo = () => {
-  getSapmleDetail({ id: sampleId.value }).then((res) => {
-    sampleForm.value = res.data
-  })
-}
 // 获取分发详情
 const getInfo = () => {
   // 获取任务详情
@@ -215,58 +182,23 @@
     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
+    taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
+    taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
+    console.log('pppppp')
+    console.log(taskForm.value.measureProcessList)
+
     // 改用一个接口获取
     sampleForm.value = res.data
   })
 }
 
-// 点击标签绑定的扫描
-const startScan = () => {
-  // TODO
-}
-
 // 流程配置组件
 const processConfigRef = ref()
-// 批量添加流程按钮点击
-const batchProcessAdd = () => {
-  processConfigRef.value.batchProcessAdd()
-}
-// 保存流程按钮点击
-const saveProcess = () => {
-  processConfigRef.value.saveProcess()
-}
-
-// 文件上传
-const fileRef = ref()
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    // UploadFile(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     sampleForm.value.minioFileName = res.data[0]
-    //     // 重置当前验证
-    //     ElMessage.success('文件上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
 
 // 从路由中获取页面类型参数
 const $route = useRoute()
-if ($route.params && $route.params.role) {
-  roleType.value = $route.params.role as string // 使用角色
+if ($route.params) {
+  roleType.value = 'detail'
 
   if ($route.params.id) {
     sampleId.value = $route.params.id as string
@@ -527,9 +459,9 @@
                   :disabled="roleType === 'detail'"
                   :class="{ 'detail-input': roleType === 'detail' }"
                 >
-                  <template #append>
+                  <!-- <template #append>
                     <el-button>扫描</el-button>
-                  </template>
+                  </template> -->
                 </el-input>
               </el-form-item>
             </el-col>
@@ -539,8 +471,8 @@
               <el-form-item label="说明书:">
                 <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">
+                <input v-show="roleType === ''" ref="fileRef" type="file">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }">
                   {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
@@ -549,7 +481,7 @@
         </el-form>
       </div>
     </detail-page>
-    <detail-block title="检定流程">
+    <detail-block v-if="taskForm.measureProcessList && taskForm.measureProcessList.length >= 1" title="检定流程">
       <!-- <template #btns>
         <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
           批量添加
@@ -558,15 +490,19 @@
           保存
         </el-button>
       </template> -->
-      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 退回流程 -->
+    <detail-block v-if="taskForm.measureSendBackList && taskForm.measureSendBackList.length >= 1" title="退回流程">
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureSendBackList" :sample-id="sampleId" :detail="true" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
       <template #menu>
         <el-radio-group v-model="currentMenu">
-          <el-radio-button label="证书监控">
+          <!-- <el-radio-button label="证书监控">
             证书监控
-          </el-radio-button>
+          </el-radio-button> -->
           <el-radio-button label="检定记录">
             检定记录
           </el-radio-button>
@@ -576,7 +512,7 @@
         </el-radio-group>
       </template>
       <!-- 证书监控 -->
-      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
+      <!-- <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" /> -->
       <!-- 检定记录 -->
       <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
       <!-- 证书记录 -->
diff --git a/src/views/business/board/overdueReminder/list.vue b/src/views/business/board/overdueReminder/list.vue
index 387fadc..2421546 100644
--- a/src/views/business/board/overdueReminder/list.vue
+++ b/src/views/business/board/overdueReminder/list.vue
@@ -7,22 +7,24 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { exportInterchangeList, getInterChangeList, interchangeListUrge } from '@/api/business/schedule/interchangeList'
+import { exportTaskList, getTaskList } from '@/api/business/schedule/task'
+import { interchangeListUrge } from '@/api/business/schedule/interchangeList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  orderNo: '', // 委托书编号
   customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  isUrgent: '', // 是否加急
+  sampleBelong: '', // 样品属性
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  sampleStatus: '8', // 样品状态:8已超期
   offset: 1,
   limit: 20,
-  orderNo: '', // 委托书编号
-  startTime: '', // 预计送达开始时间
-  endTime: '', // 预计送达结束时间
-  isUrgent: '2', // 是否加急 //2全部
-  sampleBelong: '2', // 样品属性 //2全部
-  sampleStatus: '8', // 样品状态 -- 8已超期
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -55,7 +57,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getInterChangeList(listQuery.value).then((response) => {
+  getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -82,15 +84,16 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
+    orderNo: '', // 委托书编号
     customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    isUrgent: '', // 是否加急
+    sampleBelong: '', // 样品属性
+    startTime: '', // 应检完时间-开始
+    endTime: '', // 应检完时间-结束
+    sampleStatus: '8', // 样品状态:8已超期
     offset: 1,
     limit: 20,
-    orderNo: '', // 委托书编号
-    startTime: '', // 预计送达开始时间
-    endTime: '', // 预计送达结束时间
-    isUrgent: '2', // 是否加急 //2全部
-    sampleBelong: '2', // 样品属性 //2全部
-    sampleStatus: '8', // 样品状态 -- 8已超期
   }
   fetchData(true)
 }
@@ -136,20 +139,19 @@
   })
   if (list.value.length > 0) {
     const params = {
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      offset: 1,
-      limit: 20,
-      orderNo: listQuery.value.orderNo, // 委托书编号
-      startTime: listQuery.value.startTime, // 预计送达开始时间
-      endTime: listQuery.value.endTime, // 预计送达结束时间
-      isUrgent: '2', // 是否加急 //2全部
-      sampleBelong: '2', // 样品属性 //2全部
+      sampleNo: '', // 样品编号
+      sampleName: '', // 样品名称
+      orderNo: '', // 委托书编号
+      customerNo: '', // 委托方代码
+      customerName: '', // 委托方名称
+      isUrgent: '', // 是否加急
+      sampleBelong: '', // 样品属性
+      startTime: '', //	应检定开始时间
+      endTime: '', //	应检定结束时间
       sampleStatus: '8', // 样品状态 -- 8已超期
       ids: checkoutList.value,
     }
-    exportInterchangeList(params).then((res) => {
+    exportTaskList(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '样品超期提醒列表.xlsx')
     })
@@ -247,7 +249,6 @@
                 详情
               </el-button>
               <el-button
-                v-if="row.isSelfMeasure"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/board/overdueReminder/overdueReminder_interface.ts b/src/views/business/board/overdueReminder/overdueReminder_interface.ts
index 28bdcb1..45bcf9e 100644
--- a/src/views/business/board/overdueReminder/overdueReminder_interface.ts
+++ b/src/views/business/board/overdueReminder/overdueReminder_interface.ts
@@ -4,13 +4,14 @@
   sampleName: string // 样品名称
   orderNo: string // 委托书编号
   customerNo: string // 委托方代码
-  offset: number
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
   limit: number
-  startTime: string // 预计送达开始时间
-  endTime: string // 预计送达结束时间
-  isUrgent: string // 是否加急 //2全部
-  sampleBelong: string // 样品属性 //2全部
-  sampleStatus: string // 样品状态
+  offset: number
 }
 // 表格
 export interface IList {
diff --git a/src/views/business/schedule/components/terminateDialog.vue b/src/views/business/schedule/components/terminateDialog.vue
index d5f85a0..17c8b15 100644
--- a/src/views/business/schedule/components/terminateDialog.vue
+++ b/src/views/business/schedule/components/terminateDialog.vue
@@ -32,7 +32,7 @@
  * @param orderId 委托书id
  * @param sampleId 样品id
  */
-function initDialog(row) {
+function initDialog(row: any) {
   // dataFormRef.value!.clearValidate()
   formData.value.orderId = row.orderId
   formData.value.sampleId = row.sampleId
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index c629542..83a076e 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -220,6 +220,7 @@
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
     dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderNo = val[0].orderCode // 委托书编号
     dataForm.value.orderId = val[0].id // 委托书id
     dataForm.value.deliverer = val[0].deliverer // 送检人
     dataForm.value.delivererTel = val[0].delivererTel // 送检人
@@ -233,13 +234,17 @@
   }
 }
 
-// ------------------------样品-----------------------------
+// ----------------------------------样品----------------------------------------------
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.customerNo) {
+  if (!dataForm.value.orderCode) {
     ElMessage.warning('请先选择委托书')
     return
   }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
   sampleVisible.value = true
 }
 // 修改委托方对话框显隐
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index b3089b4..4b4432e 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -79,6 +79,7 @@
   customerId: string // 委托方id
   sampleName: string // 样品名称
   sampleNo: string // 样品编号
+  customerName: string // 委托方名称
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index 11d3092..6c1cb6c 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -25,6 +25,7 @@
   customerId: '', // 委托方id
   sampleName: '', // 样品名称
   sampleNo: '', // 样品编号
+  customerName: '', // 委托方名称
   offset: 1,
   limit: 20,
 })
@@ -36,9 +37,9 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '检定周期', value: 'measurePeriod', align: 'center' },
-  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
-  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  // { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  // { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  // { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -84,6 +85,7 @@
     customerId: '', // 委托方id
     sampleName: '', // 样品名称
     sampleNo: '', // 样品编号
+    customerName: '', // 委托方名称
     offset: 1,
     limit: 20,
   }
@@ -127,56 +129,55 @@
 </script>
 
 <template>
-  <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" @close="cancle">
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.sampleNo"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.sampleName"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="loadingTable"
-        is-showmulti-select
-        :is-multi="true"
-        :height="260"
-        :page-sizes="[20]"
-        @change="changePage"
-        @multiSelect="handleSelectionChange"
-      >
-        <template #preColumns>
-          <el-table-column label="#" width="55" align="center" fixed>
-            <template #default="scope">
-              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-      <template #footer>
-        <el-button type="primary" @click="clickConfirmSample">
-          确定
-        </el-button>
-        <el-button @click="cancle">
-          取消
-        </el-button>
+  <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <search-area
+      style="padding: 0;"
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      :data="list"
+      :total="total"
+      :columns="columns"
+      :query="listQuery"
+      :list-loading="loadingTable"
+      is-showmulti-select
+      :is-multi="true"
+      :height="260"
+      :page-sizes="[20]"
+      @change="changePage"
+      @multiSelect="handleSelectionChange"
+    >
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center" fixed>
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
       </template>
-    </el-dialog>
-  </div>
+    </normal-table>
+    <template #footer>
+      <el-button type="primary" @click="clickConfirmSample">
+        确定
+      </el-button>
+      <el-button @click="cancle">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
 </template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 68ced75..142db45 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -313,6 +313,10 @@
 
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
+  if (!list.value.length) {
+    ElMessage.warning('要求样品清单不能为空')
+    return
+  }
   // 检查表格是否存在增加行信息没有完善的情况
   const result = checkList()
   if (result !== 'pass') {
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index 720a2e3..5c07d92 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -29,8 +29,8 @@
 
 // 查询条件
 const listQuery = ref({
-  // sampleNo: '', // 样品编号
-  // sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
   // sampleModel: '', // 型号
   orderId: props.orderId || '', // 委托书id
   customerId: props.customerId || '', // 委托方id
@@ -51,8 +51,8 @@
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
-  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
-  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  // { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  // { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
   { text: '备注', value: 'remark', align: 'center', width: '180px' },
 ])
 // 表格数据
@@ -97,12 +97,14 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
-    sampleModel: '', // 型号
-    customerNo: '', // 委托方代码
-    customerName: '', // 委托方名称
-    startTime: '', // 检定开始时间
-    endTime: '', // 检定结束时间
-    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    // sampleModel: '', // 型号
+    orderId: props.orderId || '', // 委托书id
+    customerId: props.customerId || '', // 委托方id
+    customerNo: props.customerNo || '', // 委托方代码
+    // customerName: '', // 委托方名称
+    // startTime: '', // 检定开始时间
+    // endTime: '', // 检定结束时间
+    // overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
     offset: 1,
     limit: 20,
   }
@@ -146,48 +148,57 @@
 </script>
 
 <template>
-  <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
-      <!-- <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.sampleNo"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.sampleName"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-      </search-area> -->
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="loadingTable"
-        is-showmulti-select
-        :is-multi="true"
-        :height="260"
-        :page-sizes="[20]"
-        @change="changePage"
-        @multi-select="handleSelectionChange"
-      />
-      <template #footer>
-        <el-button type="primary" @click="clickConfirmSample">
-          确定
-        </el-button>
-        <el-button @click="cancle">
-          取消
-        </el-button>
+  <!-- <div class="select-kehu-dialog"> -->
+  <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <search-area
+      style="padding: 0;"
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      :data="list"
+      :total="total"
+      :columns="columns"
+      :query="listQuery"
+      :list-loading="loadingTable"
+      is-showmulti-select
+      :is-multi="true"
+      :height="260"
+      :page-sizes="[20]"
+      @change="changePage"
+      @multi-select="handleSelectionChange"
+    >
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center" fixed="left">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
       </template>
-    </el-dialog>
-  </div>
+    </normal-table>
+    <template #footer>
+      <el-button type="primary" @click="clickConfirmSample">
+        确定
+      </el-button>
+      <el-button @click="cancle">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+  <!-- </div> -->
 </template>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index 6474dce..fb6a3f5 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -10,7 +10,7 @@
 const dialogVisible = ref(false) // 弹窗显示
 const sampleId = ref('') // 样品id
 const orderId = ref('') // 委托单id
-
+const type = ref('distribute')
 // 委托书-证书类别列表
 const certificationTypes = ref<dictType[]>([])
 // 获取字典值
@@ -53,10 +53,16 @@
 }
 
 // 初始化弹窗
-const initDialog = (orderid: string, sampleid: string) => {
+const initDialog = (orderid: string, sampleid: string, sampleStatus: string) => {
   dialogVisible.value = true
   sampleId.value = sampleid
   orderId.value = orderid
+  if (sampleStatus === '3') { // 检测中
+    type.value = 'testing'
+  }
+  else if (sampleStatus === '2') { // 待分发
+    type.value = 'distribute'
+  }
   getInfo()
 }
 
@@ -105,7 +111,7 @@
     <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
       批量添加
     </el-button>
-    <process-config v-if="orderId" ref="processConfigRef" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
+    <process-config v-if="orderId" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="cancel" />
     <template #footer>
       <el-button type="primary" @click="saveProcess">
         确定
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 43f2165..bb66076 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -56,7 +56,8 @@
   if (props.list.length > 0) {
     processList.value = props.list as ISchedule[]
   }
-})
+},
+{ deep: true, immediate: true })
 
 // 点击添加流程
 const processAdd = () => {
@@ -103,6 +104,7 @@
 const saveProcess = () => {
   const form = {
     measureProcessList: processList.value,
+    executiveList: processList.value,
     orderId: props.orderId,
     sampleId: props.sampleId,
   }
@@ -138,7 +140,7 @@
       <draggable v-model="processList" item-key="id" class="process-draggable" handle=".handle" :move="checkMove">
         <!-- eslint-disable-next-line vue/no-unused-vars -->
         <template #item="{ process, index }">
-          <process-node v-model="processList[index]" :step="index + 1" @delete="deleteProcess(index)" />
+          <process-node v-model="processList[index]" :step="index + 1" :detail="props.detail" @delete="deleteProcess(index)" />
         </template>
         <template #footer>
           <process-node-add v-if="!props.detail" @click="processAdd" />
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index d76d41d..fbe1c47 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -25,7 +25,7 @@
       }
     },
   },
-  // 是否为详情展示页面-暂时无用
+  // 是否为详情展示页面
   detail: {
     type: Boolean,
     default: false,
@@ -111,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
+        <el-icon v-show="canMove && !props.detail" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon v-show="canMove" class="icon-button handle" title="移动">
+        <el-icon v-show="canMove && !props.detail" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -130,14 +130,14 @@
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit">
-          <template v-if="personEdit" #append>
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit || props.detail">
+          <template v-if="personEdit && !props.detail" #append>
             <el-button :icon="Aim" size="small" link :disabled="processNodeData.measureSegment === ''" @click="choosePerson" />
           </template>
         </el-input>
       </div>
       <div class="line">
-        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit || props.detail" /><span class="unit"> 份</span>
       </div>
       <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index d64aa23..1d1e04f 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -215,8 +215,11 @@
     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
+    taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
+    taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
+    console.log('pppppp')
+    console.log(taskForm.value.measureProcessList)
+
     // 改用一个接口获取
     sampleForm.value = res.data
   })
@@ -558,7 +561,11 @@
           保存
         </el-button>
       </template> -->
-      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 退回流程 -->
+    <detail-block v-if="taskForm.measureSendBackList && taskForm.measureSendBackList.length >= 1" title="退回流程">
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureSendBackList" :sample-id="sampleId" :detail="true" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch :title="currentMenu">
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 64473c3..0efec98 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -46,7 +46,7 @@
   getDictByCode('sampleStatus').then((response) => {
     // 制作右上角的菜单
     response.data.forEach((item: dictType) => {
-      if (['待分发', '检测中', '检测完成', '已超期(查询使用)'].includes(item.name)) {
+      if (['待分发', '检测中', '检测完成', '已超期'].includes(item.name)) {
         if (item.name === '待分发') {
           active.value = item.value
           activeTitle.value = item.name
@@ -58,6 +58,7 @@
         })
       }
     })
+    console.log('88', menu.value)
 
     if (window.sessionStorage.getItem('taskActive') != null) {
       active.value = window.sessionStorage.getItem('taskActive') as string
@@ -99,6 +100,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.sampleStatus = active.value || '2'
   getTaskList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
@@ -146,7 +148,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, listQuery.value.sampleStatus)
 }
 // 点击标签绑定
 const barCodeBind = ref()
@@ -323,6 +325,7 @@
               <el-button v-if="proxy.hasPerm('/schedule/taskList/binding')" size="small" link type="primary" @click="bindLabel(row)">
                 标签绑定
               </el-button>
+              <!-- 检测完成的不允许分发 -->
               <el-button
                 v-if="proxy.hasPerm('/schedule/taskList/distribute') && listQuery.sampleStatus !== '4'" size="small" type="primary" link
                 @click="handleDistribute(row)"