diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
index 85b8c88..919203e 100644
--- a/src/components/MultiHeaderTable/index.vue
+++ b/src/components/MultiHeaderTable/index.vue
@@ -295,6 +295,7 @@
               v-model="scope.row[item.value]"
               :precision="item.precision"
               :min="min"
+              @change="handleInputNumberChange(scope)"
             />
 
             <template v-else-if="item.type === 'text'">

diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
index 85b8c88..919203e 100644
--- a/src/components/MultiHeaderTable/index.vue
+++ b/src/components/MultiHeaderTable/index.vue
@@ -295,6 +295,7 @@
               v-model="scope.row[item.value]"
               :precision="item.precision"
               :min="min"
+              @change="handleInputNumberChange(scope)"
             />
 
             <template v-else-if="item.type === 'text'">
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index b004107..0ceeddf 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const needFilterByInterchangeId = ref(false) // 交接单中需要过滤掉已经绑定委托单的样品
 const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
@@ -33,6 +34,9 @@
   loadingTable.value = true
   getOrderDetail({ id: orderId.value }).then((res) => {
     list.value = res.data.customerSampleInfoList
+    if (needFilterByInterchangeId.value) {
+      list.value = list.value.filter((item: { interchangeId: string }) => item.interchangeId === '')
+    }
     loadingTable.value = false
   })
 }
@@ -61,10 +65,12 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string, isMultiParam = true) => {
+const initDialog = (orderIdParam: string, isMultiParam = true, specialOprate = '') => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
   isMulti.value = isMultiParam
+  needFilterByInterchangeId.value = specialOprate === 'needFilterByInterchangeId'
+  console.log('p-p--0-0--9', needFilterByInterchangeId.value, specialOprate)
   getList()
 }
 defineExpose({ initDialog })

diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
index 85b8c88..919203e 100644
--- a/src/components/MultiHeaderTable/index.vue
+++ b/src/components/MultiHeaderTable/index.vue
@@ -295,6 +295,7 @@
               v-model="scope.row[item.value]"
               :precision="item.precision"
               :min="min"
+              @change="handleInputNumberChange(scope)"
             />
 
             <template v-else-if="item.type === 'text'">
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index b004107..0ceeddf 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const needFilterByInterchangeId = ref(false) // 交接单中需要过滤掉已经绑定委托单的样品
 const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
@@ -33,6 +34,9 @@
   loadingTable.value = true
   getOrderDetail({ id: orderId.value }).then((res) => {
     list.value = res.data.customerSampleInfoList
+    if (needFilterByInterchangeId.value) {
+      list.value = list.value.filter((item: { interchangeId: string }) => item.interchangeId === '')
+    }
     loadingTable.value = false
   })
 }
@@ -61,10 +65,12 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string, isMultiParam = true) => {
+const initDialog = (orderIdParam: string, isMultiParam = true, specialOprate = '') => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
   isMulti.value = isMultiParam
+  needFilterByInterchangeId.value = specialOprate === 'needFilterByInterchangeId'
+  console.log('p-p--0-0--9', needFilterByInterchangeId.value, specialOprate)
   getList()
 }
 defineExpose({ initDialog })
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index 5f0c979..cb14f2b 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -15,7 +15,8 @@
 import selectTechFilesDialog from './dialog/selectTechFilesDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { UploadFile } from '@/api/measure/file'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { addMeasureData, downLoadTemplate, draftUpdateMeasureData, failUpdateMeasureData, getMeasureDataDetail, submit } from '@/api/business/lab/measureData'
 import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
@@ -38,8 +39,6 @@
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute()
 const query = $route.query
-console.log('opopopop', query)
-
 const approvalDialog = ref() // 审批对话ref
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // 列表id
@@ -236,8 +235,12 @@
       if (res.code === 200) {
         form.value.certificateReportFile = res.data[0]
         // 重置当前验证
-        ElMessage.success('文件上传成功')
+        // ElMessage.success('文件上传成功')
+
         loading.close()
+        ElMessageBox.alert('文件上传成功！请点击保存按钮！', '提示', {
+          confirmButtonText: '确定',
+        })
       }
       else {
         ElMessage.error(res.message)
@@ -422,7 +425,7 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       downLoadTemplate(params).then((res) => {
-        exportFile(res.data, `${form.value.certificateReportName}.xls`)
+        exportFile(res.data, `${form.value.certificateReportName}${form.value.templateName}.xls`)
         loading.close()
       }).catch(() => {
         loading.close()
@@ -614,14 +617,15 @@
         })
       })
   }
+
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', query.taskId)
+    approvalDialog.value.initDialog('agree', query.taskId, query.id, query.decisionItem)
   }
   else if (val === '驳回') {
-    approvalDialog.value.initDialog('reject', query.taskId)
+    approvalDialog.value.initDialog('reject', query.taskId, query.id, query.decisionItem)
   }
   else if (val === '拒绝') {
-    approvalDialog.value.initDialog('refuse', query.taskId)
+    approvalDialog.value.initDialog('refuse', query.taskId, query.id, query.decisionItem)
   }
 }
 // ------------------------------------事件-------------------------------------------------
@@ -676,7 +680,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
-        <el-button type="primary" @click="downloadCertTemplate">
+        <el-button v-if="(submitId !== '' && pageType === 'add') || pageType !== 'add'" type="primary" @click="downloadCertTemplate">
           下载证书模板
         </el-button>
         <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">

diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
index 85b8c88..919203e 100644
--- a/src/components/MultiHeaderTable/index.vue
+++ b/src/components/MultiHeaderTable/index.vue
@@ -295,6 +295,7 @@
               v-model="scope.row[item.value]"
               :precision="item.precision"
               :min="min"
+              @change="handleInputNumberChange(scope)"
             />
 
             <template v-else-if="item.type === 'text'">
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index b004107..0ceeddf 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const needFilterByInterchangeId = ref(false) // 交接单中需要过滤掉已经绑定委托单的样品
 const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
@@ -33,6 +34,9 @@
   loadingTable.value = true
   getOrderDetail({ id: orderId.value }).then((res) => {
     list.value = res.data.customerSampleInfoList
+    if (needFilterByInterchangeId.value) {
+      list.value = list.value.filter((item: { interchangeId: string }) => item.interchangeId === '')
+    }
     loadingTable.value = false
   })
 }
@@ -61,10 +65,12 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string, isMultiParam = true) => {
+const initDialog = (orderIdParam: string, isMultiParam = true, specialOprate = '') => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
   isMulti.value = isMultiParam
+  needFilterByInterchangeId.value = specialOprate === 'needFilterByInterchangeId'
+  console.log('p-p--0-0--9', needFilterByInterchangeId.value, specialOprate)
   getList()
 }
 defineExpose({ initDialog })
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index 5f0c979..cb14f2b 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -15,7 +15,8 @@
 import selectTechFilesDialog from './dialog/selectTechFilesDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { UploadFile } from '@/api/measure/file'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { addMeasureData, downLoadTemplate, draftUpdateMeasureData, failUpdateMeasureData, getMeasureDataDetail, submit } from '@/api/business/lab/measureData'
 import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
@@ -38,8 +39,6 @@
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute()
 const query = $route.query
-console.log('opopopop', query)
-
 const approvalDialog = ref() // 审批对话ref
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // 列表id
@@ -236,8 +235,12 @@
       if (res.code === 200) {
         form.value.certificateReportFile = res.data[0]
         // 重置当前验证
-        ElMessage.success('文件上传成功')
+        // ElMessage.success('文件上传成功')
+
         loading.close()
+        ElMessageBox.alert('文件上传成功！请点击保存按钮！', '提示', {
+          confirmButtonText: '确定',
+        })
       }
       else {
         ElMessage.error(res.message)
@@ -422,7 +425,7 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       downLoadTemplate(params).then((res) => {
-        exportFile(res.data, `${form.value.certificateReportName}.xls`)
+        exportFile(res.data, `${form.value.certificateReportName}${form.value.templateName}.xls`)
         loading.close()
       }).catch(() => {
         loading.close()
@@ -614,14 +617,15 @@
         })
       })
   }
+
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', query.taskId)
+    approvalDialog.value.initDialog('agree', query.taskId, query.id, query.decisionItem)
   }
   else if (val === '驳回') {
-    approvalDialog.value.initDialog('reject', query.taskId)
+    approvalDialog.value.initDialog('reject', query.taskId, query.id, query.decisionItem)
   }
   else if (val === '拒绝') {
-    approvalDialog.value.initDialog('refuse', query.taskId)
+    approvalDialog.value.initDialog('refuse', query.taskId, query.id, query.decisionItem)
   }
 }
 // ------------------------------------事件-------------------------------------------------
@@ -676,7 +680,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
-        <el-button type="primary" @click="downloadCertTemplate">
+        <el-button v-if="(submitId !== '' && pageType === 'add') || pageType !== 'add'" type="primary" @click="downloadCertTemplate">
           下载证书模板
         </el-button>
         <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 96ffa13..07c62b0 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -9,7 +9,8 @@
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 import { cancelApproval } from '@/api/approval'
@@ -70,7 +71,7 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '检定员', value: 'measurePerson', align: 'center' },
   { text: '证书附件', value: 'certificateReportFile', align: 'center', isLink: true, width: '460' },
   { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
 ])
@@ -230,13 +231,16 @@
       })
   }
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+    approvalDialog.value.initDialog('agree', row.taskId, row.id, row.decisionItem)
+    // approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
   }
   else if (val === '驳回') {
-    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+    approvalDialog.value.initDialog('reject', row.taskId, row.id, row.decisionItem)
+    // approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
   }
   else if (val === '拒绝') {
-    approvalDialog.value.initDialog('refuse', row.taskId)
+    approvalDialog.value.initDialog('refuse', row.taskId, row.id)
+    // approvalDialog.value.initDialog('refuse', row.taskId)
   }
   else if (val === 'detail' || val === 'edit') { // 详情和编辑
     $router.push({

diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
index 85b8c88..919203e 100644
--- a/src/components/MultiHeaderTable/index.vue
+++ b/src/components/MultiHeaderTable/index.vue
@@ -295,6 +295,7 @@
               v-model="scope.row[item.value]"
               :precision="item.precision"
               :min="min"
+              @change="handleInputNumberChange(scope)"
             />
 
             <template v-else-if="item.type === 'text'">
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index b004107..0ceeddf 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const needFilterByInterchangeId = ref(false) // 交接单中需要过滤掉已经绑定委托单的样品
 const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
@@ -33,6 +34,9 @@
   loadingTable.value = true
   getOrderDetail({ id: orderId.value }).then((res) => {
     list.value = res.data.customerSampleInfoList
+    if (needFilterByInterchangeId.value) {
+      list.value = list.value.filter((item: { interchangeId: string }) => item.interchangeId === '')
+    }
     loadingTable.value = false
   })
 }
@@ -61,10 +65,12 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string, isMultiParam = true) => {
+const initDialog = (orderIdParam: string, isMultiParam = true, specialOprate = '') => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
   isMulti.value = isMultiParam
+  needFilterByInterchangeId.value = specialOprate === 'needFilterByInterchangeId'
+  console.log('p-p--0-0--9', needFilterByInterchangeId.value, specialOprate)
   getList()
 }
 defineExpose({ initDialog })
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index 5f0c979..cb14f2b 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -15,7 +15,8 @@
 import selectTechFilesDialog from './dialog/selectTechFilesDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { UploadFile } from '@/api/measure/file'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { addMeasureData, downLoadTemplate, draftUpdateMeasureData, failUpdateMeasureData, getMeasureDataDetail, submit } from '@/api/business/lab/measureData'
 import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
@@ -38,8 +39,6 @@
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute()
 const query = $route.query
-console.log('opopopop', query)
-
 const approvalDialog = ref() // 审批对话ref
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // 列表id
@@ -236,8 +235,12 @@
       if (res.code === 200) {
         form.value.certificateReportFile = res.data[0]
         // 重置当前验证
-        ElMessage.success('文件上传成功')
+        // ElMessage.success('文件上传成功')
+
         loading.close()
+        ElMessageBox.alert('文件上传成功！请点击保存按钮！', '提示', {
+          confirmButtonText: '确定',
+        })
       }
       else {
         ElMessage.error(res.message)
@@ -422,7 +425,7 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       downLoadTemplate(params).then((res) => {
-        exportFile(res.data, `${form.value.certificateReportName}.xls`)
+        exportFile(res.data, `${form.value.certificateReportName}${form.value.templateName}.xls`)
         loading.close()
       }).catch(() => {
         loading.close()
@@ -614,14 +617,15 @@
         })
       })
   }
+
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', query.taskId)
+    approvalDialog.value.initDialog('agree', query.taskId, query.id, query.decisionItem)
   }
   else if (val === '驳回') {
-    approvalDialog.value.initDialog('reject', query.taskId)
+    approvalDialog.value.initDialog('reject', query.taskId, query.id, query.decisionItem)
   }
   else if (val === '拒绝') {
-    approvalDialog.value.initDialog('refuse', query.taskId)
+    approvalDialog.value.initDialog('refuse', query.taskId, query.id, query.decisionItem)
   }
 }
 // ------------------------------------事件-------------------------------------------------
@@ -676,7 +680,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
-        <el-button type="primary" @click="downloadCertTemplate">
+        <el-button v-if="(submitId !== '' && pageType === 'add') || pageType !== 'add'" type="primary" @click="downloadCertTemplate">
           下载证书模板
         </el-button>
         <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 96ffa13..07c62b0 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -9,7 +9,8 @@
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 import { cancelApproval } from '@/api/approval'
@@ -70,7 +71,7 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '检定员', value: 'measurePerson', align: 'center' },
   { text: '证书附件', value: 'certificateReportFile', align: 'center', isLink: true, width: '460' },
   { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
 ])
@@ -230,13 +231,16 @@
       })
   }
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+    approvalDialog.value.initDialog('agree', row.taskId, row.id, row.decisionItem)
+    // approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
   }
   else if (val === '驳回') {
-    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+    approvalDialog.value.initDialog('reject', row.taskId, row.id, row.decisionItem)
+    // approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
   }
   else if (val === '拒绝') {
-    approvalDialog.value.initDialog('refuse', row.taskId)
+    approvalDialog.value.initDialog('refuse', row.taskId, row.id)
+    // approvalDialog.value.initDialog('refuse', row.taskId)
   }
   else if (val === 'detail' || val === 'edit') { // 详情和编辑
     $router.push({
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 3529644..3f8d3d3 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -107,7 +107,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 const checkoutIdList = ref<string[]>([]) // 选中的内容id集合
-const checkoutList = ref<string[]>([]) // 选中的内容
+const checkoutList = ref<string[]>([]) as any // 选中的内容
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const sampleAttrMap = ref<dictType[]>([]) // 样品属性
 const sampleStatusMap = ref<dictType[]>([]) // 样品状态
@@ -464,6 +464,11 @@
 }
 // 点击批量检完
 const batchFinish = () => {
+  const index = checkoutList.value.findIndex((item: any) => item.sampleStatus === '4')
+  if (index !== -1) {
+    ElMessage.warning(`编号为【${checkoutList.value[index].sampleNo}】的样品【${checkoutList.value[index].sampleName}】已经检完，请取消选中`)
+    return false
+  }
   if (!checkoutList.value.length) {
     ElMessage.warning('请选中')
     return false
@@ -685,7 +690,7 @@
                 无需检测
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入' && row.sampleStatus !== '4'"
                 size="small"
                 link
                 type="primary"

diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
index 85b8c88..919203e 100644
--- a/src/components/MultiHeaderTable/index.vue
+++ b/src/components/MultiHeaderTable/index.vue
@@ -295,6 +295,7 @@
               v-model="scope.row[item.value]"
               :precision="item.precision"
               :min="min"
+              @change="handleInputNumberChange(scope)"
             />
 
             <template v-else-if="item.type === 'text'">
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index b004107..0ceeddf 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const needFilterByInterchangeId = ref(false) // 交接单中需要过滤掉已经绑定委托单的样品
 const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
@@ -33,6 +34,9 @@
   loadingTable.value = true
   getOrderDetail({ id: orderId.value }).then((res) => {
     list.value = res.data.customerSampleInfoList
+    if (needFilterByInterchangeId.value) {
+      list.value = list.value.filter((item: { interchangeId: string }) => item.interchangeId === '')
+    }
     loadingTable.value = false
   })
 }
@@ -61,10 +65,12 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string, isMultiParam = true) => {
+const initDialog = (orderIdParam: string, isMultiParam = true, specialOprate = '') => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
   isMulti.value = isMultiParam
+  needFilterByInterchangeId.value = specialOprate === 'needFilterByInterchangeId'
+  console.log('p-p--0-0--9', needFilterByInterchangeId.value, specialOprate)
   getList()
 }
 defineExpose({ initDialog })
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index 5f0c979..cb14f2b 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -15,7 +15,8 @@
 import selectTechFilesDialog from './dialog/selectTechFilesDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { UploadFile } from '@/api/measure/file'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { addMeasureData, downLoadTemplate, draftUpdateMeasureData, failUpdateMeasureData, getMeasureDataDetail, submit } from '@/api/business/lab/measureData'
 import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
@@ -38,8 +39,6 @@
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute()
 const query = $route.query
-console.log('opopopop', query)
-
 const approvalDialog = ref() // 审批对话ref
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // 列表id
@@ -236,8 +235,12 @@
       if (res.code === 200) {
         form.value.certificateReportFile = res.data[0]
         // 重置当前验证
-        ElMessage.success('文件上传成功')
+        // ElMessage.success('文件上传成功')
+
         loading.close()
+        ElMessageBox.alert('文件上传成功！请点击保存按钮！', '提示', {
+          confirmButtonText: '确定',
+        })
       }
       else {
         ElMessage.error(res.message)
@@ -422,7 +425,7 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       downLoadTemplate(params).then((res) => {
-        exportFile(res.data, `${form.value.certificateReportName}.xls`)
+        exportFile(res.data, `${form.value.certificateReportName}${form.value.templateName}.xls`)
         loading.close()
       }).catch(() => {
         loading.close()
@@ -614,14 +617,15 @@
         })
       })
   }
+
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', query.taskId)
+    approvalDialog.value.initDialog('agree', query.taskId, query.id, query.decisionItem)
   }
   else if (val === '驳回') {
-    approvalDialog.value.initDialog('reject', query.taskId)
+    approvalDialog.value.initDialog('reject', query.taskId, query.id, query.decisionItem)
   }
   else if (val === '拒绝') {
-    approvalDialog.value.initDialog('refuse', query.taskId)
+    approvalDialog.value.initDialog('refuse', query.taskId, query.id, query.decisionItem)
   }
 }
 // ------------------------------------事件-------------------------------------------------
@@ -676,7 +680,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
-        <el-button type="primary" @click="downloadCertTemplate">
+        <el-button v-if="(submitId !== '' && pageType === 'add') || pageType !== 'add'" type="primary" @click="downloadCertTemplate">
           下载证书模板
         </el-button>
         <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 96ffa13..07c62b0 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -9,7 +9,8 @@
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 import { cancelApproval } from '@/api/approval'
@@ -70,7 +71,7 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '检定员', value: 'measurePerson', align: 'center' },
   { text: '证书附件', value: 'certificateReportFile', align: 'center', isLink: true, width: '460' },
   { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
 ])
@@ -230,13 +231,16 @@
       })
   }
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+    approvalDialog.value.initDialog('agree', row.taskId, row.id, row.decisionItem)
+    // approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
   }
   else if (val === '驳回') {
-    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+    approvalDialog.value.initDialog('reject', row.taskId, row.id, row.decisionItem)
+    // approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
   }
   else if (val === '拒绝') {
-    approvalDialog.value.initDialog('refuse', row.taskId)
+    approvalDialog.value.initDialog('refuse', row.taskId, row.id)
+    // approvalDialog.value.initDialog('refuse', row.taskId)
   }
   else if (val === 'detail' || val === 'edit') { // 详情和编辑
     $router.push({
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 3529644..3f8d3d3 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -107,7 +107,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 const checkoutIdList = ref<string[]>([]) // 选中的内容id集合
-const checkoutList = ref<string[]>([]) // 选中的内容
+const checkoutList = ref<string[]>([]) as any // 选中的内容
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const sampleAttrMap = ref<dictType[]>([]) // 样品属性
 const sampleStatusMap = ref<dictType[]>([]) // 样品状态
@@ -464,6 +464,11 @@
 }
 // 点击批量检完
 const batchFinish = () => {
+  const index = checkoutList.value.findIndex((item: any) => item.sampleStatus === '4')
+  if (index !== -1) {
+    ElMessage.warning(`编号为【${checkoutList.value[index].sampleNo}】的样品【${checkoutList.value[index].sampleName}】已经检完，请取消选中`)
+    return false
+  }
   if (!checkoutList.value.length) {
     ElMessage.warning('请选中')
     return false
@@ -685,7 +690,7 @@
                 无需检测
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入' && row.sampleStatus !== '4'"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index a61a435..4751ca0 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -30,7 +30,6 @@
 const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
-const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
@@ -185,7 +184,11 @@
     ElMessage.warning('请先选择委托单')
     return
   }
-  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId, true, 'needFilterByInterchangeId')
 }
 // 选好样品
 const confirmSelectSample = (val: any) => {
@@ -227,6 +230,7 @@
     })
   })
 }
+
 // ----------------------------委托单----------------------------------------------------
 // 点击选择委托单编号
 const handleClickOrder = () => {
@@ -587,42 +591,6 @@
           </el-table-column>
         </el-table>
       </detail-block>
-      <!-- 签章部分 -->
-      <!-- <div class="receipt-signature">
-        <div class="content">
-          <span class="title">甲方</span>
-          <div class="deliverer-time">
-            <span class="text-title">送检人:</span>
-            <span class="time">时ㅤ间:</span>
-          </div>
-        </div>
-        <div class="content">
-          <span class="title">乙方</span>
-
-          <div class="deliverer-time">
-            <div style="display: flex;">
-              <span class="text-title">收发员:</span>
-              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
-            </div>
-            <div style="margin-top: 30px;">
-              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
-              <span class="text">{{ dataForm.deliverTime }}</span>
-              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
-            </div>
-          </div>
-        </div>
-      </div> -->
-      <!-- 公司信息 -->
-      <!-- <div class="customer-info">
-        <div v-for="item in customerInfoMap" :key="item.value" class="content">
-          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
-            {{ item.label }}:
-          </div>
-          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="value">
-            {{ item.name }}
-          </div>
-        </div>
-      </div> -->
     </div>
     <!-- 选择委托书下的样品清单 -->
     <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val)" />

diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
index 85b8c88..919203e 100644
--- a/src/components/MultiHeaderTable/index.vue
+++ b/src/components/MultiHeaderTable/index.vue
@@ -295,6 +295,7 @@
               v-model="scope.row[item.value]"
               :precision="item.precision"
               :min="min"
+              @change="handleInputNumberChange(scope)"
             />
 
             <template v-else-if="item.type === 'text'">
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index b004107..0ceeddf 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const needFilterByInterchangeId = ref(false) // 交接单中需要过滤掉已经绑定委托单的样品
 const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
@@ -33,6 +34,9 @@
   loadingTable.value = true
   getOrderDetail({ id: orderId.value }).then((res) => {
     list.value = res.data.customerSampleInfoList
+    if (needFilterByInterchangeId.value) {
+      list.value = list.value.filter((item: { interchangeId: string }) => item.interchangeId === '')
+    }
     loadingTable.value = false
   })
 }
@@ -61,10 +65,12 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string, isMultiParam = true) => {
+const initDialog = (orderIdParam: string, isMultiParam = true, specialOprate = '') => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
   isMulti.value = isMultiParam
+  needFilterByInterchangeId.value = specialOprate === 'needFilterByInterchangeId'
+  console.log('p-p--0-0--9', needFilterByInterchangeId.value, specialOprate)
   getList()
 }
 defineExpose({ initDialog })
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index 5f0c979..cb14f2b 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -15,7 +15,8 @@
 import selectTechFilesDialog from './dialog/selectTechFilesDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { UploadFile } from '@/api/measure/file'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { addMeasureData, downLoadTemplate, draftUpdateMeasureData, failUpdateMeasureData, getMeasureDataDetail, submit } from '@/api/business/lab/measureData'
 import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
@@ -38,8 +39,6 @@
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute()
 const query = $route.query
-console.log('opopopop', query)
-
 const approvalDialog = ref() // 审批对话ref
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // 列表id
@@ -236,8 +235,12 @@
       if (res.code === 200) {
         form.value.certificateReportFile = res.data[0]
         // 重置当前验证
-        ElMessage.success('文件上传成功')
+        // ElMessage.success('文件上传成功')
+
         loading.close()
+        ElMessageBox.alert('文件上传成功！请点击保存按钮！', '提示', {
+          confirmButtonText: '确定',
+        })
       }
       else {
         ElMessage.error(res.message)
@@ -422,7 +425,7 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       downLoadTemplate(params).then((res) => {
-        exportFile(res.data, `${form.value.certificateReportName}.xls`)
+        exportFile(res.data, `${form.value.certificateReportName}${form.value.templateName}.xls`)
         loading.close()
       }).catch(() => {
         loading.close()
@@ -614,14 +617,15 @@
         })
       })
   }
+
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', query.taskId)
+    approvalDialog.value.initDialog('agree', query.taskId, query.id, query.decisionItem)
   }
   else if (val === '驳回') {
-    approvalDialog.value.initDialog('reject', query.taskId)
+    approvalDialog.value.initDialog('reject', query.taskId, query.id, query.decisionItem)
   }
   else if (val === '拒绝') {
-    approvalDialog.value.initDialog('refuse', query.taskId)
+    approvalDialog.value.initDialog('refuse', query.taskId, query.id, query.decisionItem)
   }
 }
 // ------------------------------------事件-------------------------------------------------
@@ -676,7 +680,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
-        <el-button type="primary" @click="downloadCertTemplate">
+        <el-button v-if="(submitId !== '' && pageType === 'add') || pageType !== 'add'" type="primary" @click="downloadCertTemplate">
           下载证书模板
         </el-button>
         <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 96ffa13..07c62b0 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -9,7 +9,8 @@
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 import { cancelApproval } from '@/api/approval'
@@ -70,7 +71,7 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '检定员', value: 'measurePerson', align: 'center' },
   { text: '证书附件', value: 'certificateReportFile', align: 'center', isLink: true, width: '460' },
   { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
 ])
@@ -230,13 +231,16 @@
       })
   }
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+    approvalDialog.value.initDialog('agree', row.taskId, row.id, row.decisionItem)
+    // approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
   }
   else if (val === '驳回') {
-    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+    approvalDialog.value.initDialog('reject', row.taskId, row.id, row.decisionItem)
+    // approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
   }
   else if (val === '拒绝') {
-    approvalDialog.value.initDialog('refuse', row.taskId)
+    approvalDialog.value.initDialog('refuse', row.taskId, row.id)
+    // approvalDialog.value.initDialog('refuse', row.taskId)
   }
   else if (val === 'detail' || val === 'edit') { // 详情和编辑
     $router.push({
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 3529644..3f8d3d3 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -107,7 +107,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 const checkoutIdList = ref<string[]>([]) // 选中的内容id集合
-const checkoutList = ref<string[]>([]) // 选中的内容
+const checkoutList = ref<string[]>([]) as any // 选中的内容
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const sampleAttrMap = ref<dictType[]>([]) // 样品属性
 const sampleStatusMap = ref<dictType[]>([]) // 样品状态
@@ -464,6 +464,11 @@
 }
 // 点击批量检完
 const batchFinish = () => {
+  const index = checkoutList.value.findIndex((item: any) => item.sampleStatus === '4')
+  if (index !== -1) {
+    ElMessage.warning(`编号为【${checkoutList.value[index].sampleNo}】的样品【${checkoutList.value[index].sampleName}】已经检完，请取消选中`)
+    return false
+  }
   if (!checkoutList.value.length) {
     ElMessage.warning('请选中')
     return false
@@ -685,7 +690,7 @@
                 无需检测
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入' && row.sampleStatus !== '4'"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index a61a435..4751ca0 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -30,7 +30,6 @@
 const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
-const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
@@ -185,7 +184,11 @@
     ElMessage.warning('请先选择委托单')
     return
   }
-  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId, true, 'needFilterByInterchangeId')
 }
 // 选好样品
 const confirmSelectSample = (val: any) => {
@@ -227,6 +230,7 @@
     })
   })
 }
+
 // ----------------------------委托单----------------------------------------------------
 // 点击选择委托单编号
 const handleClickOrder = () => {
@@ -587,42 +591,6 @@
           </el-table-column>
         </el-table>
       </detail-block>
-      <!-- 签章部分 -->
-      <!-- <div class="receipt-signature">
-        <div class="content">
-          <span class="title">甲方</span>
-          <div class="deliverer-time">
-            <span class="text-title">送检人:</span>
-            <span class="time">时ㅤ间:</span>
-          </div>
-        </div>
-        <div class="content">
-          <span class="title">乙方</span>
-
-          <div class="deliverer-time">
-            <div style="display: flex;">
-              <span class="text-title">收发员:</span>
-              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
-            </div>
-            <div style="margin-top: 30px;">
-              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
-              <span class="text">{{ dataForm.deliverTime }}</span>
-              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
-            </div>
-          </div>
-        </div>
-      </div> -->
-      <!-- 公司信息 -->
-      <!-- <div class="customer-info">
-        <div v-for="item in customerInfoMap" :key="item.value" class="content">
-          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
-            {{ item.label }}:
-          </div>
-          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="value">
-            {{ item.name }}
-          </div>
-        </div>
-      </div> -->
     </div>
     <!-- 选择委托书下的样品清单 -->
     <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val)" />
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index a5a90f6..fa7f447 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -204,7 +204,7 @@
   )
     .then(() => {
       delInterchangeReceiptList({ id }).then((res) => {
-        ElMessage.warning('删除成功')
+        ElMessage.success('删除成功')
         fetchData(true)
       })
     })

diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
index 85b8c88..919203e 100644
--- a/src/components/MultiHeaderTable/index.vue
+++ b/src/components/MultiHeaderTable/index.vue
@@ -295,6 +295,7 @@
               v-model="scope.row[item.value]"
               :precision="item.precision"
               :min="min"
+              @change="handleInputNumberChange(scope)"
             />
 
             <template v-else-if="item.type === 'text'">
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index b004107..0ceeddf 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const needFilterByInterchangeId = ref(false) // 交接单中需要过滤掉已经绑定委托单的样品
 const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
@@ -33,6 +34,9 @@
   loadingTable.value = true
   getOrderDetail({ id: orderId.value }).then((res) => {
     list.value = res.data.customerSampleInfoList
+    if (needFilterByInterchangeId.value) {
+      list.value = list.value.filter((item: { interchangeId: string }) => item.interchangeId === '')
+    }
     loadingTable.value = false
   })
 }
@@ -61,10 +65,12 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string, isMultiParam = true) => {
+const initDialog = (orderIdParam: string, isMultiParam = true, specialOprate = '') => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
   isMulti.value = isMultiParam
+  needFilterByInterchangeId.value = specialOprate === 'needFilterByInterchangeId'
+  console.log('p-p--0-0--9', needFilterByInterchangeId.value, specialOprate)
   getList()
 }
 defineExpose({ initDialog })
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index 5f0c979..cb14f2b 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -15,7 +15,8 @@
 import selectTechFilesDialog from './dialog/selectTechFilesDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { UploadFile } from '@/api/measure/file'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { addMeasureData, downLoadTemplate, draftUpdateMeasureData, failUpdateMeasureData, getMeasureDataDetail, submit } from '@/api/business/lab/measureData'
 import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
@@ -38,8 +39,6 @@
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute()
 const query = $route.query
-console.log('opopopop', query)
-
 const approvalDialog = ref() // 审批对话ref
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // 列表id
@@ -236,8 +235,12 @@
       if (res.code === 200) {
         form.value.certificateReportFile = res.data[0]
         // 重置当前验证
-        ElMessage.success('文件上传成功')
+        // ElMessage.success('文件上传成功')
+
         loading.close()
+        ElMessageBox.alert('文件上传成功！请点击保存按钮！', '提示', {
+          confirmButtonText: '确定',
+        })
       }
       else {
         ElMessage.error(res.message)
@@ -422,7 +425,7 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       downLoadTemplate(params).then((res) => {
-        exportFile(res.data, `${form.value.certificateReportName}.xls`)
+        exportFile(res.data, `${form.value.certificateReportName}${form.value.templateName}.xls`)
         loading.close()
       }).catch(() => {
         loading.close()
@@ -614,14 +617,15 @@
         })
       })
   }
+
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', query.taskId)
+    approvalDialog.value.initDialog('agree', query.taskId, query.id, query.decisionItem)
   }
   else if (val === '驳回') {
-    approvalDialog.value.initDialog('reject', query.taskId)
+    approvalDialog.value.initDialog('reject', query.taskId, query.id, query.decisionItem)
   }
   else if (val === '拒绝') {
-    approvalDialog.value.initDialog('refuse', query.taskId)
+    approvalDialog.value.initDialog('refuse', query.taskId, query.id, query.decisionItem)
   }
 }
 // ------------------------------------事件-------------------------------------------------
@@ -676,7 +680,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
-        <el-button type="primary" @click="downloadCertTemplate">
+        <el-button v-if="(submitId !== '' && pageType === 'add') || pageType !== 'add'" type="primary" @click="downloadCertTemplate">
           下载证书模板
         </el-button>
         <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 96ffa13..07c62b0 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -9,7 +9,8 @@
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 import { cancelApproval } from '@/api/approval'
@@ -70,7 +71,7 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '检定员', value: 'measurePerson', align: 'center' },
   { text: '证书附件', value: 'certificateReportFile', align: 'center', isLink: true, width: '460' },
   { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
 ])
@@ -230,13 +231,16 @@
       })
   }
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+    approvalDialog.value.initDialog('agree', row.taskId, row.id, row.decisionItem)
+    // approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
   }
   else if (val === '驳回') {
-    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+    approvalDialog.value.initDialog('reject', row.taskId, row.id, row.decisionItem)
+    // approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
   }
   else if (val === '拒绝') {
-    approvalDialog.value.initDialog('refuse', row.taskId)
+    approvalDialog.value.initDialog('refuse', row.taskId, row.id)
+    // approvalDialog.value.initDialog('refuse', row.taskId)
   }
   else if (val === 'detail' || val === 'edit') { // 详情和编辑
     $router.push({
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 3529644..3f8d3d3 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -107,7 +107,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 const checkoutIdList = ref<string[]>([]) // 选中的内容id集合
-const checkoutList = ref<string[]>([]) // 选中的内容
+const checkoutList = ref<string[]>([]) as any // 选中的内容
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const sampleAttrMap = ref<dictType[]>([]) // 样品属性
 const sampleStatusMap = ref<dictType[]>([]) // 样品状态
@@ -464,6 +464,11 @@
 }
 // 点击批量检完
 const batchFinish = () => {
+  const index = checkoutList.value.findIndex((item: any) => item.sampleStatus === '4')
+  if (index !== -1) {
+    ElMessage.warning(`编号为【${checkoutList.value[index].sampleNo}】的样品【${checkoutList.value[index].sampleName}】已经检完，请取消选中`)
+    return false
+  }
   if (!checkoutList.value.length) {
     ElMessage.warning('请选中')
     return false
@@ -685,7 +690,7 @@
                 无需检测
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入' && row.sampleStatus !== '4'"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index a61a435..4751ca0 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -30,7 +30,6 @@
 const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
-const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
@@ -185,7 +184,11 @@
     ElMessage.warning('请先选择委托单')
     return
   }
-  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId, true, 'needFilterByInterchangeId')
 }
 // 选好样品
 const confirmSelectSample = (val: any) => {
@@ -227,6 +230,7 @@
     })
   })
 }
+
 // ----------------------------委托单----------------------------------------------------
 // 点击选择委托单编号
 const handleClickOrder = () => {
@@ -587,42 +591,6 @@
           </el-table-column>
         </el-table>
       </detail-block>
-      <!-- 签章部分 -->
-      <!-- <div class="receipt-signature">
-        <div class="content">
-          <span class="title">甲方</span>
-          <div class="deliverer-time">
-            <span class="text-title">送检人:</span>
-            <span class="time">时ㅤ间:</span>
-          </div>
-        </div>
-        <div class="content">
-          <span class="title">乙方</span>
-
-          <div class="deliverer-time">
-            <div style="display: flex;">
-              <span class="text-title">收发员:</span>
-              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
-            </div>
-            <div style="margin-top: 30px;">
-              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
-              <span class="text">{{ dataForm.deliverTime }}</span>
-              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
-            </div>
-          </div>
-        </div>
-      </div> -->
-      <!-- 公司信息 -->
-      <!-- <div class="customer-info">
-        <div v-for="item in customerInfoMap" :key="item.value" class="content">
-          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
-            {{ item.label }}:
-          </div>
-          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="value">
-            {{ item.name }}
-          </div>
-        </div>
-      </div> -->
     </div>
     <!-- 选择委托书下的样品清单 -->
     <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val)" />
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index a5a90f6..fa7f447 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -204,7 +204,7 @@
   )
     .then(() => {
       delInterchangeReceiptList({ id }).then((res) => {
-        ElMessage.warning('删除成功')
+        ElMessage.success('删除成功')
         fetchData(true)
       })
     })
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 1590cdc..168df1e 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -71,16 +71,25 @@
 })
 
 const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'orderCode', align: 'center', width: '160px', fixed: true },
+  // { text: '委托书编号', value: 'orderCode', align: 'center', width: '160px', fixed: true },
+  // { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  // { text: '委托方名称', value: 'customerName', align: 'center' },
+  // { text: '送样人', value: 'deliverer', align: 'center' },
+  // { text: '联系方式', value: 'customerPhone', align: 'center' },
+  // { text: '样品数量', value: 'sampleCount', align: 'center' },
+  // { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
+  // { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
+  // { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+  // // { text: '备注', value: 'remark', align: 'center' },
+
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '180px' },
+  { text: '委托单类型', value: 'orderTypeName', align: 'center', width: '180px' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '送样人', value: 'deliverer', align: 'center' },
-  { text: '联系方式', value: 'customerPhone', align: 'center' },
+  { text: '联系人', value: 'deliverer', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
-  { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
+  { text: '接收状态', value: 'statusName', align: 'center', width: '100px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
-  // { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<IOrderList[]>([])

diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
index 85b8c88..919203e 100644
--- a/src/components/MultiHeaderTable/index.vue
+++ b/src/components/MultiHeaderTable/index.vue
@@ -295,6 +295,7 @@
               v-model="scope.row[item.value]"
               :precision="item.precision"
               :min="min"
+              @change="handleInputNumberChange(scope)"
             />
 
             <template v-else-if="item.type === 'text'">
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index b004107..0ceeddf 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const needFilterByInterchangeId = ref(false) // 交接单中需要过滤掉已经绑定委托单的样品
 const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
@@ -33,6 +34,9 @@
   loadingTable.value = true
   getOrderDetail({ id: orderId.value }).then((res) => {
     list.value = res.data.customerSampleInfoList
+    if (needFilterByInterchangeId.value) {
+      list.value = list.value.filter((item: { interchangeId: string }) => item.interchangeId === '')
+    }
     loadingTable.value = false
   })
 }
@@ -61,10 +65,12 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string, isMultiParam = true) => {
+const initDialog = (orderIdParam: string, isMultiParam = true, specialOprate = '') => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
   isMulti.value = isMultiParam
+  needFilterByInterchangeId.value = specialOprate === 'needFilterByInterchangeId'
+  console.log('p-p--0-0--9', needFilterByInterchangeId.value, specialOprate)
   getList()
 }
 defineExpose({ initDialog })
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index 5f0c979..cb14f2b 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -15,7 +15,8 @@
 import selectTechFilesDialog from './dialog/selectTechFilesDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { UploadFile } from '@/api/measure/file'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { addMeasureData, downLoadTemplate, draftUpdateMeasureData, failUpdateMeasureData, getMeasureDataDetail, submit } from '@/api/business/lab/measureData'
 import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
@@ -38,8 +39,6 @@
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute()
 const query = $route.query
-console.log('opopopop', query)
-
 const approvalDialog = ref() // 审批对话ref
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // 列表id
@@ -236,8 +235,12 @@
       if (res.code === 200) {
         form.value.certificateReportFile = res.data[0]
         // 重置当前验证
-        ElMessage.success('文件上传成功')
+        // ElMessage.success('文件上传成功')
+
         loading.close()
+        ElMessageBox.alert('文件上传成功！请点击保存按钮！', '提示', {
+          confirmButtonText: '确定',
+        })
       }
       else {
         ElMessage.error(res.message)
@@ -422,7 +425,7 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       downLoadTemplate(params).then((res) => {
-        exportFile(res.data, `${form.value.certificateReportName}.xls`)
+        exportFile(res.data, `${form.value.certificateReportName}${form.value.templateName}.xls`)
         loading.close()
       }).catch(() => {
         loading.close()
@@ -614,14 +617,15 @@
         })
       })
   }
+
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', query.taskId)
+    approvalDialog.value.initDialog('agree', query.taskId, query.id, query.decisionItem)
   }
   else if (val === '驳回') {
-    approvalDialog.value.initDialog('reject', query.taskId)
+    approvalDialog.value.initDialog('reject', query.taskId, query.id, query.decisionItem)
   }
   else if (val === '拒绝') {
-    approvalDialog.value.initDialog('refuse', query.taskId)
+    approvalDialog.value.initDialog('refuse', query.taskId, query.id, query.decisionItem)
   }
 }
 // ------------------------------------事件-------------------------------------------------
@@ -676,7 +680,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
-        <el-button type="primary" @click="downloadCertTemplate">
+        <el-button v-if="(submitId !== '' && pageType === 'add') || pageType !== 'add'" type="primary" @click="downloadCertTemplate">
           下载证书模板
         </el-button>
         <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 96ffa13..07c62b0 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -9,7 +9,8 @@
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 import { cancelApproval } from '@/api/approval'
@@ -70,7 +71,7 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '检定员', value: 'measurePerson', align: 'center' },
   { text: '证书附件', value: 'certificateReportFile', align: 'center', isLink: true, width: '460' },
   { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
 ])
@@ -230,13 +231,16 @@
       })
   }
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+    approvalDialog.value.initDialog('agree', row.taskId, row.id, row.decisionItem)
+    // approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
   }
   else if (val === '驳回') {
-    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+    approvalDialog.value.initDialog('reject', row.taskId, row.id, row.decisionItem)
+    // approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
   }
   else if (val === '拒绝') {
-    approvalDialog.value.initDialog('refuse', row.taskId)
+    approvalDialog.value.initDialog('refuse', row.taskId, row.id)
+    // approvalDialog.value.initDialog('refuse', row.taskId)
   }
   else if (val === 'detail' || val === 'edit') { // 详情和编辑
     $router.push({
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 3529644..3f8d3d3 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -107,7 +107,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 const checkoutIdList = ref<string[]>([]) // 选中的内容id集合
-const checkoutList = ref<string[]>([]) // 选中的内容
+const checkoutList = ref<string[]>([]) as any // 选中的内容
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const sampleAttrMap = ref<dictType[]>([]) // 样品属性
 const sampleStatusMap = ref<dictType[]>([]) // 样品状态
@@ -464,6 +464,11 @@
 }
 // 点击批量检完
 const batchFinish = () => {
+  const index = checkoutList.value.findIndex((item: any) => item.sampleStatus === '4')
+  if (index !== -1) {
+    ElMessage.warning(`编号为【${checkoutList.value[index].sampleNo}】的样品【${checkoutList.value[index].sampleName}】已经检完，请取消选中`)
+    return false
+  }
   if (!checkoutList.value.length) {
     ElMessage.warning('请选中')
     return false
@@ -685,7 +690,7 @@
                 无需检测
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入' && row.sampleStatus !== '4'"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index a61a435..4751ca0 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -30,7 +30,6 @@
 const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
-const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
@@ -185,7 +184,11 @@
     ElMessage.warning('请先选择委托单')
     return
   }
-  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId, true, 'needFilterByInterchangeId')
 }
 // 选好样品
 const confirmSelectSample = (val: any) => {
@@ -227,6 +230,7 @@
     })
   })
 }
+
 // ----------------------------委托单----------------------------------------------------
 // 点击选择委托单编号
 const handleClickOrder = () => {
@@ -587,42 +591,6 @@
           </el-table-column>
         </el-table>
       </detail-block>
-      <!-- 签章部分 -->
-      <!-- <div class="receipt-signature">
-        <div class="content">
-          <span class="title">甲方</span>
-          <div class="deliverer-time">
-            <span class="text-title">送检人:</span>
-            <span class="time">时ㅤ间:</span>
-          </div>
-        </div>
-        <div class="content">
-          <span class="title">乙方</span>
-
-          <div class="deliverer-time">
-            <div style="display: flex;">
-              <span class="text-title">收发员:</span>
-              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
-            </div>
-            <div style="margin-top: 30px;">
-              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
-              <span class="text">{{ dataForm.deliverTime }}</span>
-              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
-            </div>
-          </div>
-        </div>
-      </div> -->
-      <!-- 公司信息 -->
-      <!-- <div class="customer-info">
-        <div v-for="item in customerInfoMap" :key="item.value" class="content">
-          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
-            {{ item.label }}:
-          </div>
-          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="value">
-            {{ item.name }}
-          </div>
-        </div>
-      </div> -->
     </div>
     <!-- 选择委托书下的样品清单 -->
     <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val)" />
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index a5a90f6..fa7f447 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -204,7 +204,7 @@
   )
     .then(() => {
       delInterchangeReceiptList({ id }).then((res) => {
-        ElMessage.warning('删除成功')
+        ElMessage.success('删除成功')
         fetchData(true)
       })
     })
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 1590cdc..168df1e 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -71,16 +71,25 @@
 })
 
 const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'orderCode', align: 'center', width: '160px', fixed: true },
+  // { text: '委托书编号', value: 'orderCode', align: 'center', width: '160px', fixed: true },
+  // { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  // { text: '委托方名称', value: 'customerName', align: 'center' },
+  // { text: '送样人', value: 'deliverer', align: 'center' },
+  // { text: '联系方式', value: 'customerPhone', align: 'center' },
+  // { text: '样品数量', value: 'sampleCount', align: 'center' },
+  // { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
+  // { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
+  // { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+  // // { text: '备注', value: 'remark', align: 'center' },
+
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '180px' },
+  { text: '委托单类型', value: 'orderTypeName', align: 'center', width: '180px' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '送样人', value: 'deliverer', align: 'center' },
-  { text: '联系方式', value: 'customerPhone', align: 'center' },
+  { text: '联系人', value: 'deliverer', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
-  { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
+  { text: '接收状态', value: 'statusName', align: 'center', width: '100px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
-  // { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<IOrderList[]>([])
diff --git a/src/views/finance/businessSettlement/businessSettlement-interface.ts b/src/views/finance/businessSettlement/businessSettlement-interface.ts
index 454788f..15f1386 100644
--- a/src/views/finance/businessSettlement/businessSettlement-interface.ts
+++ b/src/views/finance/businessSettlement/businessSettlement-interface.ts
@@ -27,6 +27,7 @@
   actualTotalFee: string // 实收合计(元)
   receivedAmount: string // 到账金额(元)
   invoiceAmount: string // 开票金额(元)
+  orderType: string // 业务结算单类型
 }
 
 // 字典
@@ -69,4 +70,5 @@
   receivedAmount: Number // 到账金额(元)
   invoiceAmount: Number // 开票金额(元)
   remark: string // 备注
+  orderType: string // 任务单类型
 }

diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
index 85b8c88..919203e 100644
--- a/src/components/MultiHeaderTable/index.vue
+++ b/src/components/MultiHeaderTable/index.vue
@@ -295,6 +295,7 @@
               v-model="scope.row[item.value]"
               :precision="item.precision"
               :min="min"
+              @change="handleInputNumberChange(scope)"
             />
 
             <template v-else-if="item.type === 'text'">
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index b004107..0ceeddf 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const needFilterByInterchangeId = ref(false) // 交接单中需要过滤掉已经绑定委托单的样品
 const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
@@ -33,6 +34,9 @@
   loadingTable.value = true
   getOrderDetail({ id: orderId.value }).then((res) => {
     list.value = res.data.customerSampleInfoList
+    if (needFilterByInterchangeId.value) {
+      list.value = list.value.filter((item: { interchangeId: string }) => item.interchangeId === '')
+    }
     loadingTable.value = false
   })
 }
@@ -61,10 +65,12 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string, isMultiParam = true) => {
+const initDialog = (orderIdParam: string, isMultiParam = true, specialOprate = '') => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
   isMulti.value = isMultiParam
+  needFilterByInterchangeId.value = specialOprate === 'needFilterByInterchangeId'
+  console.log('p-p--0-0--9', needFilterByInterchangeId.value, specialOprate)
   getList()
 }
 defineExpose({ initDialog })
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index 5f0c979..cb14f2b 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -15,7 +15,8 @@
 import selectTechFilesDialog from './dialog/selectTechFilesDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { UploadFile } from '@/api/measure/file'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { addMeasureData, downLoadTemplate, draftUpdateMeasureData, failUpdateMeasureData, getMeasureDataDetail, submit } from '@/api/business/lab/measureData'
 import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
@@ -38,8 +39,6 @@
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute()
 const query = $route.query
-console.log('opopopop', query)
-
 const approvalDialog = ref() // 审批对话ref
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // 列表id
@@ -236,8 +235,12 @@
       if (res.code === 200) {
         form.value.certificateReportFile = res.data[0]
         // 重置当前验证
-        ElMessage.success('文件上传成功')
+        // ElMessage.success('文件上传成功')
+
         loading.close()
+        ElMessageBox.alert('文件上传成功！请点击保存按钮！', '提示', {
+          confirmButtonText: '确定',
+        })
       }
       else {
         ElMessage.error(res.message)
@@ -422,7 +425,7 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       downLoadTemplate(params).then((res) => {
-        exportFile(res.data, `${form.value.certificateReportName}.xls`)
+        exportFile(res.data, `${form.value.certificateReportName}${form.value.templateName}.xls`)
         loading.close()
       }).catch(() => {
         loading.close()
@@ -614,14 +617,15 @@
         })
       })
   }
+
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', query.taskId)
+    approvalDialog.value.initDialog('agree', query.taskId, query.id, query.decisionItem)
   }
   else if (val === '驳回') {
-    approvalDialog.value.initDialog('reject', query.taskId)
+    approvalDialog.value.initDialog('reject', query.taskId, query.id, query.decisionItem)
   }
   else if (val === '拒绝') {
-    approvalDialog.value.initDialog('refuse', query.taskId)
+    approvalDialog.value.initDialog('refuse', query.taskId, query.id, query.decisionItem)
   }
 }
 // ------------------------------------事件-------------------------------------------------
@@ -676,7 +680,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
-        <el-button type="primary" @click="downloadCertTemplate">
+        <el-button v-if="(submitId !== '' && pageType === 'add') || pageType !== 'add'" type="primary" @click="downloadCertTemplate">
           下载证书模板
         </el-button>
         <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 96ffa13..07c62b0 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -9,7 +9,8 @@
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 import { cancelApproval } from '@/api/approval'
@@ -70,7 +71,7 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '检定员', value: 'measurePerson', align: 'center' },
   { text: '证书附件', value: 'certificateReportFile', align: 'center', isLink: true, width: '460' },
   { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
 ])
@@ -230,13 +231,16 @@
       })
   }
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+    approvalDialog.value.initDialog('agree', row.taskId, row.id, row.decisionItem)
+    // approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
   }
   else if (val === '驳回') {
-    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+    approvalDialog.value.initDialog('reject', row.taskId, row.id, row.decisionItem)
+    // approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
   }
   else if (val === '拒绝') {
-    approvalDialog.value.initDialog('refuse', row.taskId)
+    approvalDialog.value.initDialog('refuse', row.taskId, row.id)
+    // approvalDialog.value.initDialog('refuse', row.taskId)
   }
   else if (val === 'detail' || val === 'edit') { // 详情和编辑
     $router.push({
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 3529644..3f8d3d3 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -107,7 +107,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 const checkoutIdList = ref<string[]>([]) // 选中的内容id集合
-const checkoutList = ref<string[]>([]) // 选中的内容
+const checkoutList = ref<string[]>([]) as any // 选中的内容
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const sampleAttrMap = ref<dictType[]>([]) // 样品属性
 const sampleStatusMap = ref<dictType[]>([]) // 样品状态
@@ -464,6 +464,11 @@
 }
 // 点击批量检完
 const batchFinish = () => {
+  const index = checkoutList.value.findIndex((item: any) => item.sampleStatus === '4')
+  if (index !== -1) {
+    ElMessage.warning(`编号为【${checkoutList.value[index].sampleNo}】的样品【${checkoutList.value[index].sampleName}】已经检完，请取消选中`)
+    return false
+  }
   if (!checkoutList.value.length) {
     ElMessage.warning('请选中')
     return false
@@ -685,7 +690,7 @@
                 无需检测
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入' && row.sampleStatus !== '4'"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index a61a435..4751ca0 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -30,7 +30,6 @@
 const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
-const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
@@ -185,7 +184,11 @@
     ElMessage.warning('请先选择委托单')
     return
   }
-  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId, true, 'needFilterByInterchangeId')
 }
 // 选好样品
 const confirmSelectSample = (val: any) => {
@@ -227,6 +230,7 @@
     })
   })
 }
+
 // ----------------------------委托单----------------------------------------------------
 // 点击选择委托单编号
 const handleClickOrder = () => {
@@ -587,42 +591,6 @@
           </el-table-column>
         </el-table>
       </detail-block>
-      <!-- 签章部分 -->
-      <!-- <div class="receipt-signature">
-        <div class="content">
-          <span class="title">甲方</span>
-          <div class="deliverer-time">
-            <span class="text-title">送检人:</span>
-            <span class="time">时ㅤ间:</span>
-          </div>
-        </div>
-        <div class="content">
-          <span class="title">乙方</span>
-
-          <div class="deliverer-time">
-            <div style="display: flex;">
-              <span class="text-title">收发员:</span>
-              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
-            </div>
-            <div style="margin-top: 30px;">
-              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
-              <span class="text">{{ dataForm.deliverTime }}</span>
-              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
-            </div>
-          </div>
-        </div>
-      </div> -->
-      <!-- 公司信息 -->
-      <!-- <div class="customer-info">
-        <div v-for="item in customerInfoMap" :key="item.value" class="content">
-          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
-            {{ item.label }}:
-          </div>
-          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="value">
-            {{ item.name }}
-          </div>
-        </div>
-      </div> -->
     </div>
     <!-- 选择委托书下的样品清单 -->
     <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val)" />
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index a5a90f6..fa7f447 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -204,7 +204,7 @@
   )
     .then(() => {
       delInterchangeReceiptList({ id }).then((res) => {
-        ElMessage.warning('删除成功')
+        ElMessage.success('删除成功')
         fetchData(true)
       })
     })
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 1590cdc..168df1e 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -71,16 +71,25 @@
 })
 
 const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'orderCode', align: 'center', width: '160px', fixed: true },
+  // { text: '委托书编号', value: 'orderCode', align: 'center', width: '160px', fixed: true },
+  // { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  // { text: '委托方名称', value: 'customerName', align: 'center' },
+  // { text: '送样人', value: 'deliverer', align: 'center' },
+  // { text: '联系方式', value: 'customerPhone', align: 'center' },
+  // { text: '样品数量', value: 'sampleCount', align: 'center' },
+  // { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
+  // { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
+  // { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+  // // { text: '备注', value: 'remark', align: 'center' },
+
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '180px' },
+  { text: '委托单类型', value: 'orderTypeName', align: 'center', width: '180px' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '送样人', value: 'deliverer', align: 'center' },
-  { text: '联系方式', value: 'customerPhone', align: 'center' },
+  { text: '联系人', value: 'deliverer', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
-  { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
+  { text: '接收状态', value: 'statusName', align: 'center', width: '100px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
-  // { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<IOrderList[]>([])
diff --git a/src/views/finance/businessSettlement/businessSettlement-interface.ts b/src/views/finance/businessSettlement/businessSettlement-interface.ts
index 454788f..15f1386 100644
--- a/src/views/finance/businessSettlement/businessSettlement-interface.ts
+++ b/src/views/finance/businessSettlement/businessSettlement-interface.ts
@@ -27,6 +27,7 @@
   actualTotalFee: string // 实收合计(元)
   receivedAmount: string // 到账金额(元)
   invoiceAmount: string // 开票金额(元)
+  orderType: string // 业务结算单类型
 }
 
 // 字典
@@ -69,4 +70,5 @@
   receivedAmount: Number // 到账金额(元)
   invoiceAmount: Number // 开票金额(元)
   remark: string // 备注
+  orderType: string // 任务单类型
 }
diff --git a/src/views/finance/businessSettlement/edit.vue b/src/views/finance/businessSettlement/edit.vue
index ab4378b..9e921fd 100644
--- a/src/views/finance/businessSettlement/edit.vue
+++ b/src/views/finance/businessSettlement/edit.vue
@@ -51,6 +51,7 @@
   receivedAmount: 0, // 到账金额(元)
   invoiceAmount: 0, // 开票金额(元)
   remark: '', // 备注
+  orderType: '', // 任务单类型 1检测委托单、2检定或校准委托单
 })
 // 表单校验规则
 const rules = reactive<FormRules>({
@@ -253,6 +254,15 @@
   },
 ])
 
+// 表头
+const columns_measure = ref([
+  { text: '样品名称名称', value: 'sampleName', align: 'center', required: true, type: 'text' },
+  { text: '检测项目', value: 'measureContent', align: 'center', width: '180', required: true, type: 'input' },
+  { text: '测试规范', value: 'accordStandard', align: 'center', width: '180', required: true, type: 'input' },
+  { text: '检测单价（元）', value: 'shouldTestFee', align: 'center', required: false, type: 'inputNumber' },
+  { text: '备注', value: 'remark', align: 'center', required: false, width: '160', type: 'text' },
+])
+
 // ------------------------------------委托书---------------------------------------------
 // 点击选择委托书编号
 const handleClickOrder = () => {
@@ -265,6 +275,7 @@
 // 选好委托书
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
+    form.value.orderType = val[0].orderType
     getOrderDetail({ id: val[0].id }).then((res) => { // 样品清单
       form.value.orderCode = res.data.orderCode // 委托书编号
       form.value.orderId = res.data.id // 委托书id
@@ -296,23 +307,37 @@
 // --------------------------------------------计算----------------------------------------------
 // 计算
 const handleInputNumberChange = ({ row }: any) => {
-  // 计算小计
-  row.subtotal = calc(Number(calc(Number(calc(Number(calc(Number(row.shouldTestFee), Number(row.actualTestFee), '+')), row.extraFee, '+')), row.repairFee, '+')), row.otherFee, '+')
-  // 计算检测费(应)(元)
-  form.value.shouldTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.shouldTestFee, 0)
-  // 计算检测费(实)(元)
-  form.value.actualTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.actualTestFee, 0)
-  // 实收合计
-  form.value.actualTotalFee = list.value.reduce((accumulator, current: any) => accumulator + current.subtotal, 0)
-
-  if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee === 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
-    form.value.feeStatus = '未录费'
+  if (form.value.orderType === '2') {
+    // 计算小计
+    row.subtotal = calc(Number(calc(Number(calc(Number(calc(Number(row.shouldTestFee), Number(row.actualTestFee), '+')), row.extraFee, '+')), row.repairFee, '+')), row.otherFee, '+')
+    // 计算检测费(应)(元)
+    form.value.shouldTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.shouldTestFee, 0)
+    // 计算检测费(实)(元)
+    form.value.actualTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.actualTestFee, 0)
+    // 实收合计
+    form.value.actualTotalFee = list.value.reduce((accumulator, current: any) => accumulator + current.subtotal, 0)
+    if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee === 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
+      form.value.feeStatus = '未录费'
+    }
+    else if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee !== 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
+      form.value.feeStatus = '已录费'
+    }
+    else {
+      form.value.feeStatus = '部分录费'
+    }
   }
-  else if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee !== 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
-    form.value.feeStatus = '已录费'
-  }
-  else {
-    form.value.feeStatus = '部分录费'
+  else if (form.value.orderType === '1') {
+    // 计算检测单价的和
+    form.value.actualTotalFee = list.value.reduce((accumulator, current: any) => accumulator + current.shouldTestFee, 0)
+    if (list.value.every((item: { shouldTestFee: number }) => item.shouldTestFee === 0 || `${item.shouldTestFee}` === 'undefined' || `${item.shouldTestFee}` === 'null' || `${item.shouldTestFee}` === '')) {
+      form.value.feeStatus = '未录费'
+    }
+    else if (list.value.every((item: { shouldTestFee: number }) => item.shouldTestFee !== 0 || `${item.shouldTestFee}` === 'undefined' || `${item.shouldTestFee}` === 'null' || `${item.shouldTestFee}` === '')) {
+      form.value.feeStatus = '已录费'
+    }
+    else {
+      form.value.feeStatus = '部分录费'
+    }
   }
 }
 
@@ -606,7 +631,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="form.orderType === '2'" :span="6">
               <el-form-item label="检测费(实)(元)" prop="actualTestFee">
                 <el-input
                   v-model="form.actualTestFee"
@@ -616,7 +641,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="form.orderType === '2'" :span="6">
               <el-form-item label="检测费(应)(元)" prop="shouldTestFee">
                 <el-input
                   v-model="form.shouldTestFee"
@@ -627,7 +652,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="实收合计(元)" prop="actualTotalFee">
+              <el-form-item :label="form.orderType === '2' ? '实收合计(元) : ' : '报价合计(元) : '" prop="actualTotalFee">
                 <el-input
                   v-model="form.actualTotalFee"
                   :placeholder="pageType === 'detail' ? '' : '实收合计(元)'"
@@ -803,12 +828,22 @@
     </detail-block>
     <detail-block title="结算明细" style="margin-bottom: 32px;">
       <multi-table
+        v-if="form.orderType === '2'"
         :table-data="list"
         :table-header="columns"
         :need-index="true"
         :min="0"
         @handleInputNumberChange="handleInputNumberChange"
       />
+
+      <multi-table
+        v-if="form.orderType === '1'"
+        :table-data="list"
+        :table-header="columns_measure"
+        :need-index="true"
+        :min="0"
+        @handleInputNumberChange="handleInputNumberChange"
+      />
     </detail-block>
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />

diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
index 85b8c88..919203e 100644
--- a/src/components/MultiHeaderTable/index.vue
+++ b/src/components/MultiHeaderTable/index.vue
@@ -295,6 +295,7 @@
               v-model="scope.row[item.value]"
               :precision="item.precision"
               :min="min"
+              @change="handleInputNumberChange(scope)"
             />
 
             <template v-else-if="item.type === 'text'">
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index b004107..0ceeddf 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const needFilterByInterchangeId = ref(false) // 交接单中需要过滤掉已经绑定委托单的样品
 const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
@@ -33,6 +34,9 @@
   loadingTable.value = true
   getOrderDetail({ id: orderId.value }).then((res) => {
     list.value = res.data.customerSampleInfoList
+    if (needFilterByInterchangeId.value) {
+      list.value = list.value.filter((item: { interchangeId: string }) => item.interchangeId === '')
+    }
     loadingTable.value = false
   })
 }
@@ -61,10 +65,12 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string, isMultiParam = true) => {
+const initDialog = (orderIdParam: string, isMultiParam = true, specialOprate = '') => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
   isMulti.value = isMultiParam
+  needFilterByInterchangeId.value = specialOprate === 'needFilterByInterchangeId'
+  console.log('p-p--0-0--9', needFilterByInterchangeId.value, specialOprate)
   getList()
 }
 defineExpose({ initDialog })
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index 5f0c979..cb14f2b 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -15,7 +15,8 @@
 import selectTechFilesDialog from './dialog/selectTechFilesDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { UploadFile } from '@/api/measure/file'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { addMeasureData, downLoadTemplate, draftUpdateMeasureData, failUpdateMeasureData, getMeasureDataDetail, submit } from '@/api/business/lab/measureData'
 import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
@@ -38,8 +39,6 @@
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute()
 const query = $route.query
-console.log('opopopop', query)
-
 const approvalDialog = ref() // 审批对话ref
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // 列表id
@@ -236,8 +235,12 @@
       if (res.code === 200) {
         form.value.certificateReportFile = res.data[0]
         // 重置当前验证
-        ElMessage.success('文件上传成功')
+        // ElMessage.success('文件上传成功')
+
         loading.close()
+        ElMessageBox.alert('文件上传成功！请点击保存按钮！', '提示', {
+          confirmButtonText: '确定',
+        })
       }
       else {
         ElMessage.error(res.message)
@@ -422,7 +425,7 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       downLoadTemplate(params).then((res) => {
-        exportFile(res.data, `${form.value.certificateReportName}.xls`)
+        exportFile(res.data, `${form.value.certificateReportName}${form.value.templateName}.xls`)
         loading.close()
       }).catch(() => {
         loading.close()
@@ -614,14 +617,15 @@
         })
       })
   }
+
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', query.taskId)
+    approvalDialog.value.initDialog('agree', query.taskId, query.id, query.decisionItem)
   }
   else if (val === '驳回') {
-    approvalDialog.value.initDialog('reject', query.taskId)
+    approvalDialog.value.initDialog('reject', query.taskId, query.id, query.decisionItem)
   }
   else if (val === '拒绝') {
-    approvalDialog.value.initDialog('refuse', query.taskId)
+    approvalDialog.value.initDialog('refuse', query.taskId, query.id, query.decisionItem)
   }
 }
 // ------------------------------------事件-------------------------------------------------
@@ -676,7 +680,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
-        <el-button type="primary" @click="downloadCertTemplate">
+        <el-button v-if="(submitId !== '' && pageType === 'add') || pageType !== 'add'" type="primary" @click="downloadCertTemplate">
           下载证书模板
         </el-button>
         <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 96ffa13..07c62b0 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -9,7 +9,8 @@
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 import { cancelApproval } from '@/api/approval'
@@ -70,7 +71,7 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '检定员', value: 'measurePerson', align: 'center' },
   { text: '证书附件', value: 'certificateReportFile', align: 'center', isLink: true, width: '460' },
   { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
 ])
@@ -230,13 +231,16 @@
       })
   }
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+    approvalDialog.value.initDialog('agree', row.taskId, row.id, row.decisionItem)
+    // approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
   }
   else if (val === '驳回') {
-    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+    approvalDialog.value.initDialog('reject', row.taskId, row.id, row.decisionItem)
+    // approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
   }
   else if (val === '拒绝') {
-    approvalDialog.value.initDialog('refuse', row.taskId)
+    approvalDialog.value.initDialog('refuse', row.taskId, row.id)
+    // approvalDialog.value.initDialog('refuse', row.taskId)
   }
   else if (val === 'detail' || val === 'edit') { // 详情和编辑
     $router.push({
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 3529644..3f8d3d3 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -107,7 +107,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 const checkoutIdList = ref<string[]>([]) // 选中的内容id集合
-const checkoutList = ref<string[]>([]) // 选中的内容
+const checkoutList = ref<string[]>([]) as any // 选中的内容
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const sampleAttrMap = ref<dictType[]>([]) // 样品属性
 const sampleStatusMap = ref<dictType[]>([]) // 样品状态
@@ -464,6 +464,11 @@
 }
 // 点击批量检完
 const batchFinish = () => {
+  const index = checkoutList.value.findIndex((item: any) => item.sampleStatus === '4')
+  if (index !== -1) {
+    ElMessage.warning(`编号为【${checkoutList.value[index].sampleNo}】的样品【${checkoutList.value[index].sampleName}】已经检完，请取消选中`)
+    return false
+  }
   if (!checkoutList.value.length) {
     ElMessage.warning('请选中')
     return false
@@ -685,7 +690,7 @@
                 无需检测
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入' && row.sampleStatus !== '4'"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index a61a435..4751ca0 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -30,7 +30,6 @@
 const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
-const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
@@ -185,7 +184,11 @@
     ElMessage.warning('请先选择委托单')
     return
   }
-  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId, true, 'needFilterByInterchangeId')
 }
 // 选好样品
 const confirmSelectSample = (val: any) => {
@@ -227,6 +230,7 @@
     })
   })
 }
+
 // ----------------------------委托单----------------------------------------------------
 // 点击选择委托单编号
 const handleClickOrder = () => {
@@ -587,42 +591,6 @@
           </el-table-column>
         </el-table>
       </detail-block>
-      <!-- 签章部分 -->
-      <!-- <div class="receipt-signature">
-        <div class="content">
-          <span class="title">甲方</span>
-          <div class="deliverer-time">
-            <span class="text-title">送检人:</span>
-            <span class="time">时ㅤ间:</span>
-          </div>
-        </div>
-        <div class="content">
-          <span class="title">乙方</span>
-
-          <div class="deliverer-time">
-            <div style="display: flex;">
-              <span class="text-title">收发员:</span>
-              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
-            </div>
-            <div style="margin-top: 30px;">
-              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
-              <span class="text">{{ dataForm.deliverTime }}</span>
-              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
-            </div>
-          </div>
-        </div>
-      </div> -->
-      <!-- 公司信息 -->
-      <!-- <div class="customer-info">
-        <div v-for="item in customerInfoMap" :key="item.value" class="content">
-          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
-            {{ item.label }}:
-          </div>
-          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="value">
-            {{ item.name }}
-          </div>
-        </div>
-      </div> -->
     </div>
     <!-- 选择委托书下的样品清单 -->
     <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val)" />
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index a5a90f6..fa7f447 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -204,7 +204,7 @@
   )
     .then(() => {
       delInterchangeReceiptList({ id }).then((res) => {
-        ElMessage.warning('删除成功')
+        ElMessage.success('删除成功')
         fetchData(true)
       })
     })
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 1590cdc..168df1e 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -71,16 +71,25 @@
 })
 
 const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'orderCode', align: 'center', width: '160px', fixed: true },
+  // { text: '委托书编号', value: 'orderCode', align: 'center', width: '160px', fixed: true },
+  // { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  // { text: '委托方名称', value: 'customerName', align: 'center' },
+  // { text: '送样人', value: 'deliverer', align: 'center' },
+  // { text: '联系方式', value: 'customerPhone', align: 'center' },
+  // { text: '样品数量', value: 'sampleCount', align: 'center' },
+  // { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
+  // { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
+  // { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+  // // { text: '备注', value: 'remark', align: 'center' },
+
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '180px' },
+  { text: '委托单类型', value: 'orderTypeName', align: 'center', width: '180px' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '送样人', value: 'deliverer', align: 'center' },
-  { text: '联系方式', value: 'customerPhone', align: 'center' },
+  { text: '联系人', value: 'deliverer', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
-  { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
+  { text: '接收状态', value: 'statusName', align: 'center', width: '100px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
-  // { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<IOrderList[]>([])
diff --git a/src/views/finance/businessSettlement/businessSettlement-interface.ts b/src/views/finance/businessSettlement/businessSettlement-interface.ts
index 454788f..15f1386 100644
--- a/src/views/finance/businessSettlement/businessSettlement-interface.ts
+++ b/src/views/finance/businessSettlement/businessSettlement-interface.ts
@@ -27,6 +27,7 @@
   actualTotalFee: string // 实收合计(元)
   receivedAmount: string // 到账金额(元)
   invoiceAmount: string // 开票金额(元)
+  orderType: string // 业务结算单类型
 }
 
 // 字典
@@ -69,4 +70,5 @@
   receivedAmount: Number // 到账金额(元)
   invoiceAmount: Number // 开票金额(元)
   remark: string // 备注
+  orderType: string // 任务单类型
 }
diff --git a/src/views/finance/businessSettlement/edit.vue b/src/views/finance/businessSettlement/edit.vue
index ab4378b..9e921fd 100644
--- a/src/views/finance/businessSettlement/edit.vue
+++ b/src/views/finance/businessSettlement/edit.vue
@@ -51,6 +51,7 @@
   receivedAmount: 0, // 到账金额(元)
   invoiceAmount: 0, // 开票金额(元)
   remark: '', // 备注
+  orderType: '', // 任务单类型 1检测委托单、2检定或校准委托单
 })
 // 表单校验规则
 const rules = reactive<FormRules>({
@@ -253,6 +254,15 @@
   },
 ])
 
+// 表头
+const columns_measure = ref([
+  { text: '样品名称名称', value: 'sampleName', align: 'center', required: true, type: 'text' },
+  { text: '检测项目', value: 'measureContent', align: 'center', width: '180', required: true, type: 'input' },
+  { text: '测试规范', value: 'accordStandard', align: 'center', width: '180', required: true, type: 'input' },
+  { text: '检测单价（元）', value: 'shouldTestFee', align: 'center', required: false, type: 'inputNumber' },
+  { text: '备注', value: 'remark', align: 'center', required: false, width: '160', type: 'text' },
+])
+
 // ------------------------------------委托书---------------------------------------------
 // 点击选择委托书编号
 const handleClickOrder = () => {
@@ -265,6 +275,7 @@
 // 选好委托书
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
+    form.value.orderType = val[0].orderType
     getOrderDetail({ id: val[0].id }).then((res) => { // 样品清单
       form.value.orderCode = res.data.orderCode // 委托书编号
       form.value.orderId = res.data.id // 委托书id
@@ -296,23 +307,37 @@
 // --------------------------------------------计算----------------------------------------------
 // 计算
 const handleInputNumberChange = ({ row }: any) => {
-  // 计算小计
-  row.subtotal = calc(Number(calc(Number(calc(Number(calc(Number(row.shouldTestFee), Number(row.actualTestFee), '+')), row.extraFee, '+')), row.repairFee, '+')), row.otherFee, '+')
-  // 计算检测费(应)(元)
-  form.value.shouldTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.shouldTestFee, 0)
-  // 计算检测费(实)(元)
-  form.value.actualTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.actualTestFee, 0)
-  // 实收合计
-  form.value.actualTotalFee = list.value.reduce((accumulator, current: any) => accumulator + current.subtotal, 0)
-
-  if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee === 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
-    form.value.feeStatus = '未录费'
+  if (form.value.orderType === '2') {
+    // 计算小计
+    row.subtotal = calc(Number(calc(Number(calc(Number(calc(Number(row.shouldTestFee), Number(row.actualTestFee), '+')), row.extraFee, '+')), row.repairFee, '+')), row.otherFee, '+')
+    // 计算检测费(应)(元)
+    form.value.shouldTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.shouldTestFee, 0)
+    // 计算检测费(实)(元)
+    form.value.actualTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.actualTestFee, 0)
+    // 实收合计
+    form.value.actualTotalFee = list.value.reduce((accumulator, current: any) => accumulator + current.subtotal, 0)
+    if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee === 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
+      form.value.feeStatus = '未录费'
+    }
+    else if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee !== 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
+      form.value.feeStatus = '已录费'
+    }
+    else {
+      form.value.feeStatus = '部分录费'
+    }
   }
-  else if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee !== 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
-    form.value.feeStatus = '已录费'
-  }
-  else {
-    form.value.feeStatus = '部分录费'
+  else if (form.value.orderType === '1') {
+    // 计算检测单价的和
+    form.value.actualTotalFee = list.value.reduce((accumulator, current: any) => accumulator + current.shouldTestFee, 0)
+    if (list.value.every((item: { shouldTestFee: number }) => item.shouldTestFee === 0 || `${item.shouldTestFee}` === 'undefined' || `${item.shouldTestFee}` === 'null' || `${item.shouldTestFee}` === '')) {
+      form.value.feeStatus = '未录费'
+    }
+    else if (list.value.every((item: { shouldTestFee: number }) => item.shouldTestFee !== 0 || `${item.shouldTestFee}` === 'undefined' || `${item.shouldTestFee}` === 'null' || `${item.shouldTestFee}` === '')) {
+      form.value.feeStatus = '已录费'
+    }
+    else {
+      form.value.feeStatus = '部分录费'
+    }
   }
 }
 
@@ -606,7 +631,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="form.orderType === '2'" :span="6">
               <el-form-item label="检测费(实)(元)" prop="actualTestFee">
                 <el-input
                   v-model="form.actualTestFee"
@@ -616,7 +641,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="form.orderType === '2'" :span="6">
               <el-form-item label="检测费(应)(元)" prop="shouldTestFee">
                 <el-input
                   v-model="form.shouldTestFee"
@@ -627,7 +652,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="实收合计(元)" prop="actualTotalFee">
+              <el-form-item :label="form.orderType === '2' ? '实收合计(元) : ' : '报价合计(元) : '" prop="actualTotalFee">
                 <el-input
                   v-model="form.actualTotalFee"
                   :placeholder="pageType === 'detail' ? '' : '实收合计(元)'"
@@ -803,12 +828,22 @@
     </detail-block>
     <detail-block title="结算明细" style="margin-bottom: 32px;">
       <multi-table
+        v-if="form.orderType === '2'"
         :table-data="list"
         :table-header="columns"
         :need-index="true"
         :min="0"
         @handleInputNumberChange="handleInputNumberChange"
       />
+
+      <multi-table
+        v-if="form.orderType === '1'"
+        :table-data="list"
+        :table-header="columns_measure"
+        :need-index="true"
+        :min="0"
+        @handleInputNumberChange="handleInputNumberChange"
+      />
     </detail-block>
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index 651fbf9..90ffb4d 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -46,9 +46,10 @@
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
+  { text: '业务结算单类型', value: 'orderTypeName', align: 'center', width: '160' },
   { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '委托日期', value: 'orderTime', align: 'center' },
+  { text: '委托日期', value: 'orderTime', align: 'center', width: '120' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
   { text: '样品库房', value: 'sampleWarehouse', align: 'center', width: '100' },
   { text: '证书库房', value: 'certWarehouse', align: 'center', width: '100' },
@@ -56,14 +57,14 @@
   { text: '是否到账', value: 'received', align: 'center', width: '100' },
   { text: '检测费(实)(元)', value: 'actualTestFee', align: 'center' },
   { text: '检测费(应)(元)', value: 'shouldTestFee', align: 'center' },
-  { text: '实收合计(元)', value: 'actualTotalFee', align: 'center' },
+  { text: '实收合计/报价合计(元)', value: 'actualTotalFee', align: 'center' },
   { text: '到账金额(元)', value: 'receivedAmount', align: 'center' },
   { text: '开票金额(元)', value: 'invoiceAmount', align: 'center' },
 ])
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
 const checkoutIdList = ref<string[]>([])
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<string[]>([]) as any
 
 // 数据查询
 function fetchData(isNowPage = false) {
@@ -77,6 +78,7 @@
       return {
         ...item,
         orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : item.orderTime,
+        orderTypeName: item.orderType === '1' ? '检测项目结算单' : '合作机构结算单/校准费用结算单',
       }
     })
     total.value = parseInt(response.data.total)
@@ -251,6 +253,10 @@
     ElMessage.warning('最多可导出一条')
     return false
   }
+  if ((checkoutList.value[0].orderType === '1' && exportSettlementDocType.value !== '1') || (checkoutList.value[0].orderType === '2' && exportSettlementDocType.value !== '2' && exportSettlementDocType.value !== '3')) {
+    ElMessage.warning('请导出对应类型的业务结算单')
+    return false
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '加载中...',

diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
index 85b8c88..919203e 100644
--- a/src/components/MultiHeaderTable/index.vue
+++ b/src/components/MultiHeaderTable/index.vue
@@ -295,6 +295,7 @@
               v-model="scope.row[item.value]"
               :precision="item.precision"
               :min="min"
+              @change="handleInputNumberChange(scope)"
             />
 
             <template v-else-if="item.type === 'text'">
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
index b004107..0ceeddf 100644
--- a/src/views/business/lab/components/selectOrderSamplesDialog.vue
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -14,6 +14,7 @@
 const loadingTable = ref(false) // loading
 const list = ref([]) // 表格参数
 const tableRef = ref()
+const needFilterByInterchangeId = ref(false) // 交接单中需要过滤掉已经绑定委托单的样品
 const isMulti = ref(true) // 是否多选默认为多选
 const columns = ref<TableColumn[]>([
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
@@ -33,6 +34,9 @@
   loadingTable.value = true
   getOrderDetail({ id: orderId.value }).then((res) => {
     list.value = res.data.customerSampleInfoList
+    if (needFilterByInterchangeId.value) {
+      list.value = list.value.filter((item: { interchangeId: string }) => item.interchangeId === '')
+    }
     loadingTable.value = false
   })
 }
@@ -61,10 +65,12 @@
 }
 
 // 初始化
-const initDialog = (orderIdParam: string, isMultiParam = true) => {
+const initDialog = (orderIdParam: string, isMultiParam = true, specialOprate = '') => {
   dialogFormVisible.value = true
   orderId.value = orderIdParam
   isMulti.value = isMultiParam
+  needFilterByInterchangeId.value = specialOprate === 'needFilterByInterchangeId'
+  console.log('p-p--0-0--9', needFilterByInterchangeId.value, specialOprate)
   getList()
 }
 defineExpose({ initDialog })
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index 5f0c979..cb14f2b 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -15,7 +15,8 @@
 import selectTechFilesDialog from './dialog/selectTechFilesDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { UploadFile } from '@/api/measure/file'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { addMeasureData, downLoadTemplate, draftUpdateMeasureData, failUpdateMeasureData, getMeasureDataDetail, submit } from '@/api/business/lab/measureData'
 import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
@@ -38,8 +39,6 @@
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute()
 const query = $route.query
-console.log('opopopop', query)
-
 const approvalDialog = ref() // 审批对话ref
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // 列表id
@@ -236,8 +235,12 @@
       if (res.code === 200) {
         form.value.certificateReportFile = res.data[0]
         // 重置当前验证
-        ElMessage.success('文件上传成功')
+        // ElMessage.success('文件上传成功')
+
         loading.close()
+        ElMessageBox.alert('文件上传成功！请点击保存按钮！', '提示', {
+          confirmButtonText: '确定',
+        })
       }
       else {
         ElMessage.error(res.message)
@@ -422,7 +425,7 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       downLoadTemplate(params).then((res) => {
-        exportFile(res.data, `${form.value.certificateReportName}.xls`)
+        exportFile(res.data, `${form.value.certificateReportName}${form.value.templateName}.xls`)
         loading.close()
       }).catch(() => {
         loading.close()
@@ -614,14 +617,15 @@
         })
       })
   }
+
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', query.taskId)
+    approvalDialog.value.initDialog('agree', query.taskId, query.id, query.decisionItem)
   }
   else if (val === '驳回') {
-    approvalDialog.value.initDialog('reject', query.taskId)
+    approvalDialog.value.initDialog('reject', query.taskId, query.id, query.decisionItem)
   }
   else if (val === '拒绝') {
-    approvalDialog.value.initDialog('refuse', query.taskId)
+    approvalDialog.value.initDialog('refuse', query.taskId, query.id, query.decisionItem)
   }
 }
 // ------------------------------------事件-------------------------------------------------
@@ -676,7 +680,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
-        <el-button type="primary" @click="downloadCertTemplate">
+        <el-button v-if="(submitId !== '' && pageType === 'add') || pageType !== 'add'" type="primary" @click="downloadCertTemplate">
           下载证书模板
         </el-button>
         <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 96ffa13..07c62b0 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -9,7 +9,8 @@
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 import { cancelApproval } from '@/api/approval'
@@ -70,7 +71,7 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '检定员', value: 'measurePerson', align: 'center' },
   { text: '证书附件', value: 'certificateReportFile', align: 'center', isLink: true, width: '460' },
   { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
 ])
@@ -230,13 +231,16 @@
       })
   }
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+    approvalDialog.value.initDialog('agree', row.taskId, row.id, row.decisionItem)
+    // approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
   }
   else if (val === '驳回') {
-    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+    approvalDialog.value.initDialog('reject', row.taskId, row.id, row.decisionItem)
+    // approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
   }
   else if (val === '拒绝') {
-    approvalDialog.value.initDialog('refuse', row.taskId)
+    approvalDialog.value.initDialog('refuse', row.taskId, row.id)
+    // approvalDialog.value.initDialog('refuse', row.taskId)
   }
   else if (val === 'detail' || val === 'edit') { // 详情和编辑
     $router.push({
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 3529644..3f8d3d3 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -107,7 +107,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 const checkoutIdList = ref<string[]>([]) // 选中的内容id集合
-const checkoutList = ref<string[]>([]) // 选中的内容
+const checkoutList = ref<string[]>([]) as any // 选中的内容
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const sampleAttrMap = ref<dictType[]>([]) // 样品属性
 const sampleStatusMap = ref<dictType[]>([]) // 样品状态
@@ -464,6 +464,11 @@
 }
 // 点击批量检完
 const batchFinish = () => {
+  const index = checkoutList.value.findIndex((item: any) => item.sampleStatus === '4')
+  if (index !== -1) {
+    ElMessage.warning(`编号为【${checkoutList.value[index].sampleNo}】的样品【${checkoutList.value[index].sampleName}】已经检完，请取消选中`)
+    return false
+  }
   if (!checkoutList.value.length) {
     ElMessage.warning('请选中')
     return false
@@ -685,7 +690,7 @@
                 无需检测
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入' && row.sampleStatus !== '4'"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index a61a435..4751ca0 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -30,7 +30,6 @@
 const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
-const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
@@ -185,7 +184,11 @@
     ElMessage.warning('请先选择委托单')
     return
   }
-  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId, true, 'needFilterByInterchangeId')
 }
 // 选好样品
 const confirmSelectSample = (val: any) => {
@@ -227,6 +230,7 @@
     })
   })
 }
+
 // ----------------------------委托单----------------------------------------------------
 // 点击选择委托单编号
 const handleClickOrder = () => {
@@ -587,42 +591,6 @@
           </el-table-column>
         </el-table>
       </detail-block>
-      <!-- 签章部分 -->
-      <!-- <div class="receipt-signature">
-        <div class="content">
-          <span class="title">甲方</span>
-          <div class="deliverer-time">
-            <span class="text-title">送检人:</span>
-            <span class="time">时ㅤ间:</span>
-          </div>
-        </div>
-        <div class="content">
-          <span class="title">乙方</span>
-
-          <div class="deliverer-time">
-            <div style="display: flex;">
-              <span class="text-title">收发员:</span>
-              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
-            </div>
-            <div style="margin-top: 30px;">
-              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
-              <span class="text">{{ dataForm.deliverTime }}</span>
-              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
-            </div>
-          </div>
-        </div>
-      </div> -->
-      <!-- 公司信息 -->
-      <!-- <div class="customer-info">
-        <div v-for="item in customerInfoMap" :key="item.value" class="content">
-          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
-            {{ item.label }}:
-          </div>
-          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="value">
-            {{ item.name }}
-          </div>
-        </div>
-      </div> -->
     </div>
     <!-- 选择委托书下的样品清单 -->
     <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val)" />
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index a5a90f6..fa7f447 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -204,7 +204,7 @@
   )
     .then(() => {
       delInterchangeReceiptList({ id }).then((res) => {
-        ElMessage.warning('删除成功')
+        ElMessage.success('删除成功')
         fetchData(true)
       })
     })
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 1590cdc..168df1e 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -71,16 +71,25 @@
 })
 
 const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'orderCode', align: 'center', width: '160px', fixed: true },
+  // { text: '委托书编号', value: 'orderCode', align: 'center', width: '160px', fixed: true },
+  // { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  // { text: '委托方名称', value: 'customerName', align: 'center' },
+  // { text: '送样人', value: 'deliverer', align: 'center' },
+  // { text: '联系方式', value: 'customerPhone', align: 'center' },
+  // { text: '样品数量', value: 'sampleCount', align: 'center' },
+  // { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
+  // { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
+  // { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+  // // { text: '备注', value: 'remark', align: 'center' },
+
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '180px' },
+  { text: '委托单类型', value: 'orderTypeName', align: 'center', width: '180px' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '送样人', value: 'deliverer', align: 'center' },
-  { text: '联系方式', value: 'customerPhone', align: 'center' },
+  { text: '联系人', value: 'deliverer', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
-  { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
+  { text: '接收状态', value: 'statusName', align: 'center', width: '100px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
-  // { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<IOrderList[]>([])
diff --git a/src/views/finance/businessSettlement/businessSettlement-interface.ts b/src/views/finance/businessSettlement/businessSettlement-interface.ts
index 454788f..15f1386 100644
--- a/src/views/finance/businessSettlement/businessSettlement-interface.ts
+++ b/src/views/finance/businessSettlement/businessSettlement-interface.ts
@@ -27,6 +27,7 @@
   actualTotalFee: string // 实收合计(元)
   receivedAmount: string // 到账金额(元)
   invoiceAmount: string // 开票金额(元)
+  orderType: string // 业务结算单类型
 }
 
 // 字典
@@ -69,4 +70,5 @@
   receivedAmount: Number // 到账金额(元)
   invoiceAmount: Number // 开票金额(元)
   remark: string // 备注
+  orderType: string // 任务单类型
 }
diff --git a/src/views/finance/businessSettlement/edit.vue b/src/views/finance/businessSettlement/edit.vue
index ab4378b..9e921fd 100644
--- a/src/views/finance/businessSettlement/edit.vue
+++ b/src/views/finance/businessSettlement/edit.vue
@@ -51,6 +51,7 @@
   receivedAmount: 0, // 到账金额(元)
   invoiceAmount: 0, // 开票金额(元)
   remark: '', // 备注
+  orderType: '', // 任务单类型 1检测委托单、2检定或校准委托单
 })
 // 表单校验规则
 const rules = reactive<FormRules>({
@@ -253,6 +254,15 @@
   },
 ])
 
+// 表头
+const columns_measure = ref([
+  { text: '样品名称名称', value: 'sampleName', align: 'center', required: true, type: 'text' },
+  { text: '检测项目', value: 'measureContent', align: 'center', width: '180', required: true, type: 'input' },
+  { text: '测试规范', value: 'accordStandard', align: 'center', width: '180', required: true, type: 'input' },
+  { text: '检测单价（元）', value: 'shouldTestFee', align: 'center', required: false, type: 'inputNumber' },
+  { text: '备注', value: 'remark', align: 'center', required: false, width: '160', type: 'text' },
+])
+
 // ------------------------------------委托书---------------------------------------------
 // 点击选择委托书编号
 const handleClickOrder = () => {
@@ -265,6 +275,7 @@
 // 选好委托书
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
+    form.value.orderType = val[0].orderType
     getOrderDetail({ id: val[0].id }).then((res) => { // 样品清单
       form.value.orderCode = res.data.orderCode // 委托书编号
       form.value.orderId = res.data.id // 委托书id
@@ -296,23 +307,37 @@
 // --------------------------------------------计算----------------------------------------------
 // 计算
 const handleInputNumberChange = ({ row }: any) => {
-  // 计算小计
-  row.subtotal = calc(Number(calc(Number(calc(Number(calc(Number(row.shouldTestFee), Number(row.actualTestFee), '+')), row.extraFee, '+')), row.repairFee, '+')), row.otherFee, '+')
-  // 计算检测费(应)(元)
-  form.value.shouldTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.shouldTestFee, 0)
-  // 计算检测费(实)(元)
-  form.value.actualTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.actualTestFee, 0)
-  // 实收合计
-  form.value.actualTotalFee = list.value.reduce((accumulator, current: any) => accumulator + current.subtotal, 0)
-
-  if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee === 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
-    form.value.feeStatus = '未录费'
+  if (form.value.orderType === '2') {
+    // 计算小计
+    row.subtotal = calc(Number(calc(Number(calc(Number(calc(Number(row.shouldTestFee), Number(row.actualTestFee), '+')), row.extraFee, '+')), row.repairFee, '+')), row.otherFee, '+')
+    // 计算检测费(应)(元)
+    form.value.shouldTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.shouldTestFee, 0)
+    // 计算检测费(实)(元)
+    form.value.actualTestFee = list.value.reduce((accumulator, current: any) => accumulator + current.actualTestFee, 0)
+    // 实收合计
+    form.value.actualTotalFee = list.value.reduce((accumulator, current: any) => accumulator + current.subtotal, 0)
+    if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee === 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
+      form.value.feeStatus = '未录费'
+    }
+    else if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee !== 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
+      form.value.feeStatus = '已录费'
+    }
+    else {
+      form.value.feeStatus = '部分录费'
+    }
   }
-  else if (list.value.every((item: { actualTestFee: number }) => item.actualTestFee !== 0 || `${item.actualTestFee}` === 'undefined' || `${item.actualTestFee}` === 'null' || `${item.actualTestFee}` === '')) {
-    form.value.feeStatus = '已录费'
-  }
-  else {
-    form.value.feeStatus = '部分录费'
+  else if (form.value.orderType === '1') {
+    // 计算检测单价的和
+    form.value.actualTotalFee = list.value.reduce((accumulator, current: any) => accumulator + current.shouldTestFee, 0)
+    if (list.value.every((item: { shouldTestFee: number }) => item.shouldTestFee === 0 || `${item.shouldTestFee}` === 'undefined' || `${item.shouldTestFee}` === 'null' || `${item.shouldTestFee}` === '')) {
+      form.value.feeStatus = '未录费'
+    }
+    else if (list.value.every((item: { shouldTestFee: number }) => item.shouldTestFee !== 0 || `${item.shouldTestFee}` === 'undefined' || `${item.shouldTestFee}` === 'null' || `${item.shouldTestFee}` === '')) {
+      form.value.feeStatus = '已录费'
+    }
+    else {
+      form.value.feeStatus = '部分录费'
+    }
   }
 }
 
@@ -606,7 +631,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="form.orderType === '2'" :span="6">
               <el-form-item label="检测费(实)(元)" prop="actualTestFee">
                 <el-input
                   v-model="form.actualTestFee"
@@ -616,7 +641,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="form.orderType === '2'" :span="6">
               <el-form-item label="检测费(应)(元)" prop="shouldTestFee">
                 <el-input
                   v-model="form.shouldTestFee"
@@ -627,7 +652,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="实收合计(元)" prop="actualTotalFee">
+              <el-form-item :label="form.orderType === '2' ? '实收合计(元) : ' : '报价合计(元) : '" prop="actualTotalFee">
                 <el-input
                   v-model="form.actualTotalFee"
                   :placeholder="pageType === 'detail' ? '' : '实收合计(元)'"
@@ -803,12 +828,22 @@
     </detail-block>
     <detail-block title="结算明细" style="margin-bottom: 32px;">
       <multi-table
+        v-if="form.orderType === '2'"
         :table-data="list"
         :table-header="columns"
         :need-index="true"
         :min="0"
         @handleInputNumberChange="handleInputNumberChange"
       />
+
+      <multi-table
+        v-if="form.orderType === '1'"
+        :table-data="list"
+        :table-header="columns_measure"
+        :need-index="true"
+        :min="0"
+        @handleInputNumberChange="handleInputNumberChange"
+      />
     </detail-block>
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index 651fbf9..90ffb4d 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -46,9 +46,10 @@
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
+  { text: '业务结算单类型', value: 'orderTypeName', align: 'center', width: '160' },
   { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '委托日期', value: 'orderTime', align: 'center' },
+  { text: '委托日期', value: 'orderTime', align: 'center', width: '120' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
   { text: '样品库房', value: 'sampleWarehouse', align: 'center', width: '100' },
   { text: '证书库房', value: 'certWarehouse', align: 'center', width: '100' },
@@ -56,14 +57,14 @@
   { text: '是否到账', value: 'received', align: 'center', width: '100' },
   { text: '检测费(实)(元)', value: 'actualTestFee', align: 'center' },
   { text: '检测费(应)(元)', value: 'shouldTestFee', align: 'center' },
-  { text: '实收合计(元)', value: 'actualTotalFee', align: 'center' },
+  { text: '实收合计/报价合计(元)', value: 'actualTotalFee', align: 'center' },
   { text: '到账金额(元)', value: 'receivedAmount', align: 'center' },
   { text: '开票金额(元)', value: 'invoiceAmount', align: 'center' },
 ])
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
 const checkoutIdList = ref<string[]>([])
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<string[]>([]) as any
 
 // 数据查询
 function fetchData(isNowPage = false) {
@@ -77,6 +78,7 @@
       return {
         ...item,
         orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : item.orderTime,
+        orderTypeName: item.orderType === '1' ? '检测项目结算单' : '合作机构结算单/校准费用结算单',
       }
     })
     total.value = parseInt(response.data.total)
@@ -251,6 +253,10 @@
     ElMessage.warning('最多可导出一条')
     return false
   }
+  if ((checkoutList.value[0].orderType === '1' && exportSettlementDocType.value !== '1') || (checkoutList.value[0].orderType === '2' && exportSettlementDocType.value !== '2' && exportSettlementDocType.value !== '3')) {
+    ElMessage.warning('请导出对应类型的业务结算单')
+    return false
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '加载中...',
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 358856f..415ff5a 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -337,6 +337,8 @@
 }
 
 onMounted(() => {
+  console.log('909090909-0', proxy.hasPerm(`/file/${props.authority}/abolish`))
+
   getDict().then(() => { // 获取字典
     getList() // 获取表格列表
   })