diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 641a585..1036a91 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -246,7 +246,7 @@
 // 点击批量捡完
 const scanOverRef = ref()
 const batchOverScan = () => {
-  scanOverRef.value.initDialog(false, '3', '2')
+  scanOverRef.value.initDialog(false, '4', '1')
 }
 // 对列表中样品批量捡完
 const scanMeasureOver = function (list: any) {
@@ -275,6 +275,8 @@
 })
 onMounted(async () => {
   getDict().then(() => {
+    console.log(window.sessionStorage.getItem('deptMeasureActive'), 'ppppp000')
+
     if (window.sessionStorage.getItem('deptMeasureActive') != null) {
       active.value = window.sessionStorage.getItem('deptMeasureActive') as string
     }
@@ -282,6 +284,8 @@
       active.value = menu.value.find(item => item.name === '待检测')!.id as string
       console.log('active.value', active.value)
     }
+    listQuery.value.measureStatus = active.value
+
     fetchData(true)
   })
   // nextTick(() => {
@@ -355,7 +359,7 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <!-- <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" /> -->
         <!-- <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>

diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 641a585..1036a91 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -246,7 +246,7 @@
 // 点击批量捡完
 const scanOverRef = ref()
 const batchOverScan = () => {
-  scanOverRef.value.initDialog(false, '3', '2')
+  scanOverRef.value.initDialog(false, '4', '1')
 }
 // 对列表中样品批量捡完
 const scanMeasureOver = function (list: any) {
@@ -275,6 +275,8 @@
 })
 onMounted(async () => {
   getDict().then(() => {
+    console.log(window.sessionStorage.getItem('deptMeasureActive'), 'ppppp000')
+
     if (window.sessionStorage.getItem('deptMeasureActive') != null) {
       active.value = window.sessionStorage.getItem('deptMeasureActive') as string
     }
@@ -282,6 +284,8 @@
       active.value = menu.value.find(item => item.name === '待检测')!.id as string
       console.log('active.value', active.value)
     }
+    listQuery.value.measureStatus = active.value
+
     fetchData(true)
   })
   // nextTick(() => {
@@ -355,7 +359,7 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <!-- <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" /> -->
         <!-- <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 237de56..0b3cc2f 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -308,6 +308,7 @@
     else {
       active.value = menu.value.find(item => item.name === '待检测')!.id as string // 待检测
     }
+    listQuery.value.measureStatus = active.value
     fetchData(true)
   })
   // nextTick(() => {

diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 641a585..1036a91 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -246,7 +246,7 @@
 // 点击批量捡完
 const scanOverRef = ref()
 const batchOverScan = () => {
-  scanOverRef.value.initDialog(false, '3', '2')
+  scanOverRef.value.initDialog(false, '4', '1')
 }
 // 对列表中样品批量捡完
 const scanMeasureOver = function (list: any) {
@@ -275,6 +275,8 @@
 })
 onMounted(async () => {
   getDict().then(() => {
+    console.log(window.sessionStorage.getItem('deptMeasureActive'), 'ppppp000')
+
     if (window.sessionStorage.getItem('deptMeasureActive') != null) {
       active.value = window.sessionStorage.getItem('deptMeasureActive') as string
     }
@@ -282,6 +284,8 @@
       active.value = menu.value.find(item => item.name === '待检测')!.id as string
       console.log('active.value', active.value)
     }
+    listQuery.value.measureStatus = active.value
+
     fetchData(true)
   })
   // nextTick(() => {
@@ -355,7 +359,7 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <!-- <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" /> -->
         <!-- <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 237de56..0b3cc2f 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -308,6 +308,7 @@
     else {
       active.value = menu.value.find(item => item.name === '待检测')!.id as string // 待检测
     }
+    listQuery.value.measureStatus = active.value
     fetchData(true)
   })
   // nextTick(() => {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index ea214bf..32ceb5a 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -406,10 +406,10 @@
   else { // 扫描收入或扫描捡完
     console.log(value)
     if (!value.length) { return }
-    const getData = value.map((item: { id: string; orderId: string }) => {
+    const getData = value.map((item: { sampleId: string; orderId: string }) => {
       return {
         ...item,
-        sampleId: item.id,
+        sampleId: item.sampleId,
         orderId: item.orderId,
         reason: '',
       }

diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 641a585..1036a91 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -246,7 +246,7 @@
 // 点击批量捡完
 const scanOverRef = ref()
 const batchOverScan = () => {
-  scanOverRef.value.initDialog(false, '3', '2')
+  scanOverRef.value.initDialog(false, '4', '1')
 }
 // 对列表中样品批量捡完
 const scanMeasureOver = function (list: any) {
@@ -275,6 +275,8 @@
 })
 onMounted(async () => {
   getDict().then(() => {
+    console.log(window.sessionStorage.getItem('deptMeasureActive'), 'ppppp000')
+
     if (window.sessionStorage.getItem('deptMeasureActive') != null) {
       active.value = window.sessionStorage.getItem('deptMeasureActive') as string
     }
@@ -282,6 +284,8 @@
       active.value = menu.value.find(item => item.name === '待检测')!.id as string
       console.log('active.value', active.value)
     }
+    listQuery.value.measureStatus = active.value
+
     fetchData(true)
   })
   // nextTick(() => {
@@ -355,7 +359,7 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
+        <!-- <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" /> -->
         <!-- <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 237de56..0b3cc2f 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -308,6 +308,7 @@
     else {
       active.value = menu.value.find(item => item.name === '待检测')!.id as string // 待检测
     }
+    listQuery.value.measureStatus = active.value
     fetchData(true)
   })
   // nextTick(() => {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index ea214bf..32ceb5a 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -406,10 +406,10 @@
   else { // 扫描收入或扫描捡完
     console.log(value)
     if (!value.length) { return }
-    const getData = value.map((item: { id: string; orderId: string }) => {
+    const getData = value.map((item: { sampleId: string; orderId: string }) => {
       return {
         ...item,
-        sampleId: item.id,
+        sampleId: item.sampleId,
         orderId: item.orderId,
         reason: '',
       }
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 58bf048..60436a6 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -303,9 +303,6 @@
   else {
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
   }
-  console.log('pppp=================================ppp')
-
-  console.log($router.options.history.state.back)
 
   if ($router.options.history.state.back === '/comprehensive/approve') {
     active.value = menu.value.find(item => item.name === '待审批')!.id as string // 全部