diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index ef3dad9..4301f6f 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../../index'
-import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -88,7 +88,7 @@
 }
 
 // 我的检测-列表
-export function getMyMeasureList(data: ITaskQuery) {
+export function getMyMeasureList(data: ILabQuery) {
   return request({
     url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -97,7 +97,7 @@
 }
 
 // 部门检测-列表
-export function getDeptMeasureList(data: ITaskQuery) {
+export function getDeptMeasureList(data: ILabQuery) {
   return request({
     url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index ef3dad9..4301f6f 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../../index'
-import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -88,7 +88,7 @@
 }
 
 // 我的检测-列表
-export function getMyMeasureList(data: ITaskQuery) {
+export function getMyMeasureList(data: ILabQuery) {
   return request({
     url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -97,7 +97,7 @@
 }
 
 // 部门检测-列表
-export function getDeptMeasureList(data: ITaskQuery) {
+export function getDeptMeasureList(data: ILabQuery) {
   return request({
     url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index adc461d..89fd82d 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -13,15 +13,13 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
-const menus = [
-  { name: '待检测', value: '2' },
-  { name: '检测中', value: '3' },
-  { name: '检测完', value: '4' },
-]
-const currentMenu = ref('2') // 当前选中状态
+const menu = ref<IMenu[]>([]) // 右上角审批状态按钮组合
+const active = ref('') // 选中的按钮
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 const listQuery: Ref<ILabQuery> = ref({
@@ -34,7 +32,7 @@
   sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  measureStatus: '2', // 检测状态
+  measureStatus: active.value, // 检测状态
   offset: 1,
   limit: 20,
 })
@@ -45,8 +43,18 @@
   getDictByCode('sampleBelong').then((response) => {
     sampleBelongList.value = response.data
   })
+  // 获取菜单字典
+  getDictByCode('measureStatus').then((response) => {
+    response.data.forEach((item: dictType) => {
+      if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+        menu.value.push({
+          name: item.name,
+          id: `${item.value}`,
+        })
+      }
+    })
+  })
 }
-getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
@@ -109,10 +117,12 @@
     sampleBelong: '', // 样品属性
     startTime: '', // 应检完时间-开始
     endTime: '', // 应检完时间-结束
-    measureStatus: listQuery.value.measureStatus, // 检测状态
+    measureStatus: active.value, // 检测状态
     offset: 1,
     limit: 20,
   }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
@@ -221,24 +231,40 @@
 }
 
 // 选择按钮变更
-watch(currentMenu, (val: string) => {
-  listQuery.value.measureStatus = val
-  fetchData(false)
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem('deptMeasureActive', val)
+  clearList()
+}
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
 })
-
-fetchData(false)
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem('deptMeasureActive') != null) {
+    active.value = window.sessionStorage.getItem('deptMeasureActive') as string
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '待检测')!.id // 待分发
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+  })
+})
 </script>
 
 <template>
   <app-container>
-    <div class="float-radio-buttons">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="currentMenu">
-        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
+    <!-- 三级菜单 -->
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -253,7 +279,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
+          v-model.trim="listQuery.sampleName"
           placeholder="样品名称"
           clearable
           class="short-input"
@@ -261,7 +287,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
+          v-model.trim="listQuery.orderNo"
           placeholder="委托书编号"
           clearable
           class="short-input"
@@ -269,7 +295,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           class="short-input"
           clearable

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index ef3dad9..4301f6f 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../../index'
-import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -88,7 +88,7 @@
 }
 
 // 我的检测-列表
-export function getMyMeasureList(data: ITaskQuery) {
+export function getMyMeasureList(data: ILabQuery) {
   return request({
     url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -97,7 +97,7 @@
 }
 
 // 部门检测-列表
-export function getDeptMeasureList(data: ITaskQuery) {
+export function getDeptMeasureList(data: ILabQuery) {
   return request({
     url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index adc461d..89fd82d 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -13,15 +13,13 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
-const menus = [
-  { name: '待检测', value: '2' },
-  { name: '检测中', value: '3' },
-  { name: '检测完', value: '4' },
-]
-const currentMenu = ref('2') // 当前选中状态
+const menu = ref<IMenu[]>([]) // 右上角审批状态按钮组合
+const active = ref('') // 选中的按钮
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 const listQuery: Ref<ILabQuery> = ref({
@@ -34,7 +32,7 @@
   sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  measureStatus: '2', // 检测状态
+  measureStatus: active.value, // 检测状态
   offset: 1,
   limit: 20,
 })
@@ -45,8 +43,18 @@
   getDictByCode('sampleBelong').then((response) => {
     sampleBelongList.value = response.data
   })
+  // 获取菜单字典
+  getDictByCode('measureStatus').then((response) => {
+    response.data.forEach((item: dictType) => {
+      if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+        menu.value.push({
+          name: item.name,
+          id: `${item.value}`,
+        })
+      }
+    })
+  })
 }
-getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
@@ -109,10 +117,12 @@
     sampleBelong: '', // 样品属性
     startTime: '', // 应检完时间-开始
     endTime: '', // 应检完时间-结束
-    measureStatus: listQuery.value.measureStatus, // 检测状态
+    measureStatus: active.value, // 检测状态
     offset: 1,
     limit: 20,
   }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
@@ -221,24 +231,40 @@
 }
 
 // 选择按钮变更
-watch(currentMenu, (val: string) => {
-  listQuery.value.measureStatus = val
-  fetchData(false)
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem('deptMeasureActive', val)
+  clearList()
+}
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
 })
-
-fetchData(false)
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem('deptMeasureActive') != null) {
+    active.value = window.sessionStorage.getItem('deptMeasureActive') as string
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '待检测')!.id // 待分发
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+  })
+})
 </script>
 
 <template>
   <app-container>
-    <div class="float-radio-buttons">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="currentMenu">
-        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
+    <!-- 三级菜单 -->
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -253,7 +279,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
+          v-model.trim="listQuery.sampleName"
           placeholder="样品名称"
           clearable
           class="short-input"
@@ -261,7 +287,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
+          v-model.trim="listQuery.orderNo"
           placeholder="委托书编号"
           clearable
           class="short-input"
@@ -269,7 +295,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           class="short-input"
           clearable
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 60d840b..d5afb9d 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -3,6 +3,7 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { Watch } from '@element-plus/icons-vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -11,15 +12,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getMyMeasureList } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
-const menus = [
-  { name: '待检测', value: '2' },
-  { name: '检测中', value: '3' },
-  { name: '检测完', value: '4' },
-]
-const currentMenu = ref('2') // 当前选中状态
+const menu = ref<IMenu[]>([]) // 右上角审批状态按钮组合
+const active = ref('') // 选中的按钮
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 const listQuery: Ref<ILabQuery> = ref({
@@ -32,7 +30,7 @@
   sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  measureStatus: '2', // 检测状态
+  measureStatus: active.value, // 检测状态
   offset: 1,
   limit: 20,
 })
@@ -43,8 +41,18 @@
   getDictByCode('sampleBelong').then((response) => {
     sampleBelongList.value = response.data
   })
+  // 获取菜单字典
+  getDictByCode('measureStatus').then((response) => {
+    response.data.forEach((item: dictType) => {
+      if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+        menu.value.push({
+          name: item.name,
+          id: `${item.value}`,
+        })
+      }
+    })
+  })
 }
-getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
@@ -107,10 +115,12 @@
     sampleBelong: '', // 样品属性
     startTime: '', // 应检完时间-开始
     endTime: '', // 应检完时间-结束
-    measureStatus: listQuery.value.measureStatus, // 检测状态
+    measureStatus: active.value, // 检测状态
     offset: 1,
     limit: 20,
   }
+  timeRange.value = ['', '']
+  fetchData(false)
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
@@ -242,24 +252,40 @@
 }
 
 // 选择按钮变更
-watch(currentMenu, (val: string) => {
-  listQuery.value.measureStatus = val
-  fetchData(false)
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem('myMeasureActive', val)
+  clearList()
+}
+
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
 })
 
-fetchData(false)
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem('myMeasureActive') != null) {
+    active.value = window.sessionStorage.getItem('myMeasureActive') as string
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '待检测')!.id // 待分发
+  }
+  nextTick(() => {
+    fetchData(true)
+  })
+})
 </script>
 
 <template>
   <app-container>
-    <div class="float-radio-buttons">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="currentMenu">
-        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -274,7 +300,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
+          v-model.trim="listQuery.sampleName"
           placeholder="样品名称"
           clearable
           class="short-input"
@@ -282,7 +308,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
+          v-model.trim="listQuery.orderNo"
           placeholder="委托书编号"
           clearable
           class="short-input"
@@ -290,7 +316,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           class="short-input"
           clearable

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index ef3dad9..4301f6f 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../../index'
-import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -88,7 +88,7 @@
 }
 
 // 我的检测-列表
-export function getMyMeasureList(data: ITaskQuery) {
+export function getMyMeasureList(data: ILabQuery) {
   return request({
     url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -97,7 +97,7 @@
 }
 
 // 部门检测-列表
-export function getDeptMeasureList(data: ITaskQuery) {
+export function getDeptMeasureList(data: ILabQuery) {
   return request({
     url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index adc461d..89fd82d 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -13,15 +13,13 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
-const menus = [
-  { name: '待检测', value: '2' },
-  { name: '检测中', value: '3' },
-  { name: '检测完', value: '4' },
-]
-const currentMenu = ref('2') // 当前选中状态
+const menu = ref<IMenu[]>([]) // 右上角审批状态按钮组合
+const active = ref('') // 选中的按钮
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 const listQuery: Ref<ILabQuery> = ref({
@@ -34,7 +32,7 @@
   sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  measureStatus: '2', // 检测状态
+  measureStatus: active.value, // 检测状态
   offset: 1,
   limit: 20,
 })
@@ -45,8 +43,18 @@
   getDictByCode('sampleBelong').then((response) => {
     sampleBelongList.value = response.data
   })
+  // 获取菜单字典
+  getDictByCode('measureStatus').then((response) => {
+    response.data.forEach((item: dictType) => {
+      if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+        menu.value.push({
+          name: item.name,
+          id: `${item.value}`,
+        })
+      }
+    })
+  })
 }
-getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
@@ -109,10 +117,12 @@
     sampleBelong: '', // 样品属性
     startTime: '', // 应检完时间-开始
     endTime: '', // 应检完时间-结束
-    measureStatus: listQuery.value.measureStatus, // 检测状态
+    measureStatus: active.value, // 检测状态
     offset: 1,
     limit: 20,
   }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
@@ -221,24 +231,40 @@
 }
 
 // 选择按钮变更
-watch(currentMenu, (val: string) => {
-  listQuery.value.measureStatus = val
-  fetchData(false)
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem('deptMeasureActive', val)
+  clearList()
+}
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
 })
-
-fetchData(false)
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem('deptMeasureActive') != null) {
+    active.value = window.sessionStorage.getItem('deptMeasureActive') as string
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '待检测')!.id // 待分发
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+  })
+})
 </script>
 
 <template>
   <app-container>
-    <div class="float-radio-buttons">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="currentMenu">
-        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
+    <!-- 三级菜单 -->
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -253,7 +279,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
+          v-model.trim="listQuery.sampleName"
           placeholder="样品名称"
           clearable
           class="short-input"
@@ -261,7 +287,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
+          v-model.trim="listQuery.orderNo"
           placeholder="委托书编号"
           clearable
           class="short-input"
@@ -269,7 +295,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           class="short-input"
           clearable
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 60d840b..d5afb9d 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -3,6 +3,7 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { Watch } from '@element-plus/icons-vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -11,15 +12,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getMyMeasureList } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
-const menus = [
-  { name: '待检测', value: '2' },
-  { name: '检测中', value: '3' },
-  { name: '检测完', value: '4' },
-]
-const currentMenu = ref('2') // 当前选中状态
+const menu = ref<IMenu[]>([]) // 右上角审批状态按钮组合
+const active = ref('') // 选中的按钮
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 const listQuery: Ref<ILabQuery> = ref({
@@ -32,7 +30,7 @@
   sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  measureStatus: '2', // 检测状态
+  measureStatus: active.value, // 检测状态
   offset: 1,
   limit: 20,
 })
@@ -43,8 +41,18 @@
   getDictByCode('sampleBelong').then((response) => {
     sampleBelongList.value = response.data
   })
+  // 获取菜单字典
+  getDictByCode('measureStatus').then((response) => {
+    response.data.forEach((item: dictType) => {
+      if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+        menu.value.push({
+          name: item.name,
+          id: `${item.value}`,
+        })
+      }
+    })
+  })
 }
-getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
@@ -107,10 +115,12 @@
     sampleBelong: '', // 样品属性
     startTime: '', // 应检完时间-开始
     endTime: '', // 应检完时间-结束
-    measureStatus: listQuery.value.measureStatus, // 检测状态
+    measureStatus: active.value, // 检测状态
     offset: 1,
     limit: 20,
   }
+  timeRange.value = ['', '']
+  fetchData(false)
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
@@ -242,24 +252,40 @@
 }
 
 // 选择按钮变更
-watch(currentMenu, (val: string) => {
-  listQuery.value.measureStatus = val
-  fetchData(false)
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem('myMeasureActive', val)
+  clearList()
+}
+
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
 })
 
-fetchData(false)
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem('myMeasureActive') != null) {
+    active.value = window.sessionStorage.getItem('myMeasureActive') as string
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '待检测')!.id // 待分发
+  }
+  nextTick(() => {
+    fetchData(true)
+  })
+})
 </script>
 
 <template>
   <app-container>
-    <div class="float-radio-buttons">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="currentMenu">
-        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -274,7 +300,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
+          v-model.trim="listQuery.sampleName"
           placeholder="样品名称"
           clearable
           class="short-input"
@@ -282,7 +308,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
+          v-model.trim="listQuery.orderNo"
           placeholder="委托书编号"
           clearable
           class="short-input"
@@ -290,7 +316,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           class="short-input"
           clearable
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index e26b603..d69d275 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -26,7 +26,6 @@
   certificateNo: '', // 证书编号
   createUserId: 0,
   printStatus: 0, // 可打印(证书可打印传0,全部传null)
-  certificationReportCode: '', // 证书编号
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
   sampleNo: '', // 样品编号
@@ -83,20 +82,18 @@
         }
       }
     })
-    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-      active.value = window.sessionStorage.getItem('buttonBoxActive')!
-      activeTitle.value === '未通过'
+    if (window.sessionStorage.getItem('certPrintActive') != null) {
+      active.value = window.sessionStorage.getItem('certPrintActive') as string
     }
     else {
       active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
-      activeTitle.value === '可打印'
     }
   })
 }
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificateNo', width: '110', align: 'center' },
+  { text: '证书编号', value: 'certificateNo', width: '140', align: 'center' },
   { text: '证书名称', value: 'certificateName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
@@ -148,7 +145,6 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  console.log(listQuery)
   filterQuery()
   loadingTable.value = true
   if (!isNowPage) {
@@ -179,14 +175,13 @@
     certificateNo: '', // 证书编号
     createUserId: 0,
     printStatus: 0, // 可打印(证书可打印传0,全部传null)
-    certificationReportCode: '', // 证书编号
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
-    approvalStatus: '', // 审批状态-审批查询用
+    approvalStatus: active.value, // 审批状态-审批查询用
     orderId: '', // 委托书id
     reason: '', // 操作原因
     sampleId: '', // 样品id
@@ -331,7 +326,7 @@
   }
   active.value = val
   activeTitle.value = menu.value.find(item => item.id === val)!.name
-  window.sessionStorage.setItem('buttonBoxActive', val)
+  window.sessionStorage.setItem('certPrintActive', val)
   clearList()
 }
 
@@ -339,7 +334,7 @@
   await getDict() // 获取字典-审批状态
   setTimeout(() => {
     fetchData(true)
-  }, 800)
+  }, 500)
 })
 </script>
 

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index ef3dad9..4301f6f 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../../index'
-import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -88,7 +88,7 @@
 }
 
 // 我的检测-列表
-export function getMyMeasureList(data: ITaskQuery) {
+export function getMyMeasureList(data: ILabQuery) {
   return request({
     url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -97,7 +97,7 @@
 }
 
 // 部门检测-列表
-export function getDeptMeasureList(data: ITaskQuery) {
+export function getDeptMeasureList(data: ILabQuery) {
   return request({
     url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index adc461d..89fd82d 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -13,15 +13,13 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
-const menus = [
-  { name: '待检测', value: '2' },
-  { name: '检测中', value: '3' },
-  { name: '检测完', value: '4' },
-]
-const currentMenu = ref('2') // 当前选中状态
+const menu = ref<IMenu[]>([]) // 右上角审批状态按钮组合
+const active = ref('') // 选中的按钮
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 const listQuery: Ref<ILabQuery> = ref({
@@ -34,7 +32,7 @@
   sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  measureStatus: '2', // 检测状态
+  measureStatus: active.value, // 检测状态
   offset: 1,
   limit: 20,
 })
@@ -45,8 +43,18 @@
   getDictByCode('sampleBelong').then((response) => {
     sampleBelongList.value = response.data
   })
+  // 获取菜单字典
+  getDictByCode('measureStatus').then((response) => {
+    response.data.forEach((item: dictType) => {
+      if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+        menu.value.push({
+          name: item.name,
+          id: `${item.value}`,
+        })
+      }
+    })
+  })
 }
-getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
@@ -109,10 +117,12 @@
     sampleBelong: '', // 样品属性
     startTime: '', // 应检完时间-开始
     endTime: '', // 应检完时间-结束
-    measureStatus: listQuery.value.measureStatus, // 检测状态
+    measureStatus: active.value, // 检测状态
     offset: 1,
     limit: 20,
   }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
@@ -221,24 +231,40 @@
 }
 
 // 选择按钮变更
-watch(currentMenu, (val: string) => {
-  listQuery.value.measureStatus = val
-  fetchData(false)
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem('deptMeasureActive', val)
+  clearList()
+}
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
 })
-
-fetchData(false)
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem('deptMeasureActive') != null) {
+    active.value = window.sessionStorage.getItem('deptMeasureActive') as string
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '待检测')!.id // 待分发
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+  })
+})
 </script>
 
 <template>
   <app-container>
-    <div class="float-radio-buttons">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="currentMenu">
-        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
+    <!-- 三级菜单 -->
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -253,7 +279,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
+          v-model.trim="listQuery.sampleName"
           placeholder="样品名称"
           clearable
           class="short-input"
@@ -261,7 +287,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
+          v-model.trim="listQuery.orderNo"
           placeholder="委托书编号"
           clearable
           class="short-input"
@@ -269,7 +295,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           class="short-input"
           clearable
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 60d840b..d5afb9d 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -3,6 +3,7 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { Watch } from '@element-plus/icons-vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -11,15 +12,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getMyMeasureList } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
-const menus = [
-  { name: '待检测', value: '2' },
-  { name: '检测中', value: '3' },
-  { name: '检测完', value: '4' },
-]
-const currentMenu = ref('2') // 当前选中状态
+const menu = ref<IMenu[]>([]) // 右上角审批状态按钮组合
+const active = ref('') // 选中的按钮
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 const listQuery: Ref<ILabQuery> = ref({
@@ -32,7 +30,7 @@
   sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  measureStatus: '2', // 检测状态
+  measureStatus: active.value, // 检测状态
   offset: 1,
   limit: 20,
 })
@@ -43,8 +41,18 @@
   getDictByCode('sampleBelong').then((response) => {
     sampleBelongList.value = response.data
   })
+  // 获取菜单字典
+  getDictByCode('measureStatus').then((response) => {
+    response.data.forEach((item: dictType) => {
+      if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+        menu.value.push({
+          name: item.name,
+          id: `${item.value}`,
+        })
+      }
+    })
+  })
 }
-getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
@@ -107,10 +115,12 @@
     sampleBelong: '', // 样品属性
     startTime: '', // 应检完时间-开始
     endTime: '', // 应检完时间-结束
-    measureStatus: listQuery.value.measureStatus, // 检测状态
+    measureStatus: active.value, // 检测状态
     offset: 1,
     limit: 20,
   }
+  timeRange.value = ['', '']
+  fetchData(false)
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
@@ -242,24 +252,40 @@
 }
 
 // 选择按钮变更
-watch(currentMenu, (val: string) => {
-  listQuery.value.measureStatus = val
-  fetchData(false)
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem('myMeasureActive', val)
+  clearList()
+}
+
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
 })
 
-fetchData(false)
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem('myMeasureActive') != null) {
+    active.value = window.sessionStorage.getItem('myMeasureActive') as string
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '待检测')!.id // 待分发
+  }
+  nextTick(() => {
+    fetchData(true)
+  })
+})
 </script>
 
 <template>
   <app-container>
-    <div class="float-radio-buttons">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="currentMenu">
-        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -274,7 +300,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
+          v-model.trim="listQuery.sampleName"
           placeholder="样品名称"
           clearable
           class="short-input"
@@ -282,7 +308,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
+          v-model.trim="listQuery.orderNo"
           placeholder="委托书编号"
           clearable
           class="short-input"
@@ -290,7 +316,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           class="short-input"
           clearable
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index e26b603..d69d275 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -26,7 +26,6 @@
   certificateNo: '', // 证书编号
   createUserId: 0,
   printStatus: 0, // 可打印(证书可打印传0,全部传null)
-  certificationReportCode: '', // 证书编号
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
   sampleNo: '', // 样品编号
@@ -83,20 +82,18 @@
         }
       }
     })
-    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-      active.value = window.sessionStorage.getItem('buttonBoxActive')!
-      activeTitle.value === '未通过'
+    if (window.sessionStorage.getItem('certPrintActive') != null) {
+      active.value = window.sessionStorage.getItem('certPrintActive') as string
     }
     else {
       active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
-      activeTitle.value === '可打印'
     }
   })
 }
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificateNo', width: '110', align: 'center' },
+  { text: '证书编号', value: 'certificateNo', width: '140', align: 'center' },
   { text: '证书名称', value: 'certificateName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
@@ -148,7 +145,6 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  console.log(listQuery)
   filterQuery()
   loadingTable.value = true
   if (!isNowPage) {
@@ -179,14 +175,13 @@
     certificateNo: '', // 证书编号
     createUserId: 0,
     printStatus: 0, // 可打印(证书可打印传0,全部传null)
-    certificationReportCode: '', // 证书编号
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
-    approvalStatus: '', // 审批状态-审批查询用
+    approvalStatus: active.value, // 审批状态-审批查询用
     orderId: '', // 委托书id
     reason: '', // 操作原因
     sampleId: '', // 样品id
@@ -331,7 +326,7 @@
   }
   active.value = val
   activeTitle.value = menu.value.find(item => item.id === val)!.name
-  window.sessionStorage.setItem('buttonBoxActive', val)
+  window.sessionStorage.setItem('certPrintActive', val)
   clearList()
 }
 
@@ -339,7 +334,7 @@
   await getDict() // 获取字典-审批状态
   setTimeout(() => {
     fetchData(true)
-  }, 800)
+  }, 500)
 })
 </script>
 
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 4998c5a..aa481ea 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -24,8 +24,8 @@
   isUrgent: string // 是否加急
   sampleBelong: string // 样品属性
   measureStatus: string // 分发状态
-  startTime: string //	应检定开始时间
-  endTime: string //	应检定结束时间
+  startTime: string | number //	应检定开始时间
+  endTime: string | number //	应检定结束时间
   limit: number
   offset: number
 }

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index ef3dad9..4301f6f 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -2,7 +2,7 @@
  * 任务分发,实验室检测
 */
 import request from '../../index'
-import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
+import type { ILabQuery, ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
 // 任务分发列表查询
@@ -88,7 +88,7 @@
 }
 
 // 我的检测-列表
-export function getMyMeasureList(data: ITaskQuery) {
+export function getMyMeasureList(data: ILabQuery) {
   return request({
     url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -97,7 +97,7 @@
 }
 
 // 部门检测-列表
-export function getDeptMeasureList(data: ITaskQuery) {
+export function getDeptMeasureList(data: ILabQuery) {
   return request({
     url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index adc461d..89fd82d 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -13,15 +13,13 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
-const menus = [
-  { name: '待检测', value: '2' },
-  { name: '检测中', value: '3' },
-  { name: '检测完', value: '4' },
-]
-const currentMenu = ref('2') // 当前选中状态
+const menu = ref<IMenu[]>([]) // 右上角审批状态按钮组合
+const active = ref('') // 选中的按钮
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 const listQuery: Ref<ILabQuery> = ref({
@@ -34,7 +32,7 @@
   sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  measureStatus: '2', // 检测状态
+  measureStatus: active.value, // 检测状态
   offset: 1,
   limit: 20,
 })
@@ -45,8 +43,18 @@
   getDictByCode('sampleBelong').then((response) => {
     sampleBelongList.value = response.data
   })
+  // 获取菜单字典
+  getDictByCode('measureStatus').then((response) => {
+    response.data.forEach((item: dictType) => {
+      if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+        menu.value.push({
+          name: item.name,
+          id: `${item.value}`,
+        })
+      }
+    })
+  })
 }
-getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
@@ -109,10 +117,12 @@
     sampleBelong: '', // 样品属性
     startTime: '', // 应检完时间-开始
     endTime: '', // 应检完时间-结束
-    measureStatus: listQuery.value.measureStatus, // 检测状态
+    measureStatus: active.value, // 检测状态
     offset: 1,
     limit: 20,
   }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
@@ -221,24 +231,40 @@
 }
 
 // 选择按钮变更
-watch(currentMenu, (val: string) => {
-  listQuery.value.measureStatus = val
-  fetchData(false)
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem('deptMeasureActive', val)
+  clearList()
+}
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
 })
-
-fetchData(false)
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem('deptMeasureActive') != null) {
+    active.value = window.sessionStorage.getItem('deptMeasureActive') as string
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '待检测')!.id // 待分发
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+  })
+})
 </script>
 
 <template>
   <app-container>
-    <div class="float-radio-buttons">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="currentMenu">
-        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
+    <!-- 三级菜单 -->
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -253,7 +279,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
+          v-model.trim="listQuery.sampleName"
           placeholder="样品名称"
           clearable
           class="short-input"
@@ -261,7 +287,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
+          v-model.trim="listQuery.orderNo"
           placeholder="委托书编号"
           clearable
           class="short-input"
@@ -269,7 +295,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           class="short-input"
           clearable
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 60d840b..d5afb9d 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -3,6 +3,7 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { Watch } from '@element-plus/icons-vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -11,15 +12,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getMyMeasureList } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
-const menus = [
-  { name: '待检测', value: '2' },
-  { name: '检测中', value: '3' },
-  { name: '检测完', value: '4' },
-]
-const currentMenu = ref('2') // 当前选中状态
+const menu = ref<IMenu[]>([]) // 右上角审批状态按钮组合
+const active = ref('') // 选中的按钮
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 const listQuery: Ref<ILabQuery> = ref({
@@ -32,7 +30,7 @@
   sampleBelong: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  measureStatus: '2', // 检测状态
+  measureStatus: active.value, // 检测状态
   offset: 1,
   limit: 20,
 })
@@ -43,8 +41,18 @@
   getDictByCode('sampleBelong').then((response) => {
     sampleBelongList.value = response.data
   })
+  // 获取菜单字典
+  getDictByCode('measureStatus').then((response) => {
+    response.data.forEach((item: dictType) => {
+      if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+        menu.value.push({
+          name: item.name,
+          id: `${item.value}`,
+        })
+      }
+    })
+  })
 }
-getDict()
 
 // 表头
 const columns = ref<TableColumn[]>([
@@ -107,10 +115,12 @@
     sampleBelong: '', // 样品属性
     startTime: '', // 应检完时间-开始
     endTime: '', // 应检完时间-结束
-    measureStatus: listQuery.value.measureStatus, // 检测状态
+    measureStatus: active.value, // 检测状态
     offset: 1,
     limit: 20,
   }
+  timeRange.value = ['', '']
+  fetchData(false)
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
@@ -242,24 +252,40 @@
 }
 
 // 选择按钮变更
-watch(currentMenu, (val: string) => {
-  listQuery.value.measureStatus = val
-  fetchData(false)
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  window.sessionStorage.setItem('myMeasureActive', val)
+  clearList()
+}
+
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
 })
 
-fetchData(false)
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem('myMeasureActive') != null) {
+    active.value = window.sessionStorage.getItem('myMeasureActive') as string
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '待检测')!.id // 待分发
+  }
+  nextTick(() => {
+    fetchData(true)
+  })
+})
 </script>
 
 <template>
   <app-container>
-    <div class="float-radio-buttons">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="currentMenu">
-        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -274,7 +300,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
+          v-model.trim="listQuery.sampleName"
           placeholder="样品名称"
           clearable
           class="short-input"
@@ -282,7 +308,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
+          v-model.trim="listQuery.orderNo"
           placeholder="委托书编号"
           clearable
           class="short-input"
@@ -290,7 +316,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           class="short-input"
           clearable
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index e26b603..d69d275 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -26,7 +26,6 @@
   certificateNo: '', // 证书编号
   createUserId: 0,
   printStatus: 0, // 可打印(证书可打印传0,全部传null)
-  certificationReportCode: '', // 证书编号
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
   sampleNo: '', // 样品编号
@@ -83,20 +82,18 @@
         }
       }
     })
-    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-      active.value = window.sessionStorage.getItem('buttonBoxActive')!
-      activeTitle.value === '未通过'
+    if (window.sessionStorage.getItem('certPrintActive') != null) {
+      active.value = window.sessionStorage.getItem('certPrintActive') as string
     }
     else {
       active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
-      activeTitle.value === '可打印'
     }
   })
 }
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificateNo', width: '110', align: 'center' },
+  { text: '证书编号', value: 'certificateNo', width: '140', align: 'center' },
   { text: '证书名称', value: 'certificateName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
@@ -148,7 +145,6 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  console.log(listQuery)
   filterQuery()
   loadingTable.value = true
   if (!isNowPage) {
@@ -179,14 +175,13 @@
     certificateNo: '', // 证书编号
     createUserId: 0,
     printStatus: 0, // 可打印(证书可打印传0,全部传null)
-    certificationReportCode: '', // 证书编号
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
-    approvalStatus: '', // 审批状态-审批查询用
+    approvalStatus: active.value, // 审批状态-审批查询用
     orderId: '', // 委托书id
     reason: '', // 操作原因
     sampleId: '', // 样品id
@@ -331,7 +326,7 @@
   }
   active.value = val
   activeTitle.value = menu.value.find(item => item.id === val)!.name
-  window.sessionStorage.setItem('buttonBoxActive', val)
+  window.sessionStorage.setItem('certPrintActive', val)
   clearList()
 }
 
@@ -339,7 +334,7 @@
   await getDict() // 获取字典-审批状态
   setTimeout(() => {
     fetchData(true)
-  }, 800)
+  }, 500)
 })
 </script>
 
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 4998c5a..aa481ea 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -24,8 +24,8 @@
   isUrgent: string // 是否加急
   sampleBelong: string // 样品属性
   measureStatus: string // 分发状态
-  startTime: string //	应检定开始时间
-  endTime: string //	应检定结束时间
+  startTime: string | number //	应检定开始时间
+  endTime: string | number //	应检定结束时间
   limit: number
   offset: number
 }
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 7497590..89323a3 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -45,7 +45,6 @@
   })
   getDictByCode('sampleStatus').then((response) => {
     // 制作右上角的菜单
-    const menuIds: string[] = []
     response.data.forEach((item: dictType) => {
       if (['待分发', '检测中', '检测完成', '已超期(查询使用)'].includes(item.name)) {
         if (item.name === '待分发') {
@@ -53,20 +52,15 @@
           activeTitle.value = item.name
         }
 
-        menuIds.push(item.value)
         menu.value.push({
           name: item.name,
           id: `${item.value}`,
         })
       }
     })
-    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-      if (menuIds.includes(window.sessionStorage.getItem('buttonBoxActive')!)) {
-        active.value = window.sessionStorage.getItem('buttonBoxActive')!
-      }
-      else {
-        active.value = menu.value.find(item => item.name === '待分发')!.id // 待分发
-      }
+
+    if (window.sessionStorage.getItem('taskActive') != null) {
+      active.value = window.sessionStorage.getItem('taskActive') as string
     }
     else {
       active.value = menu.value.find(item => item.name === '待分发')!.id // 待分发
@@ -84,7 +78,7 @@
   { text: '委托方名称', value: 'customerName', width: '120', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
-  { text: '样品属性', value: 'sampleBelongName', width: '80', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
   { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return row.alreadyCertifications ? `${row.alreadyCertifications}/${row.requireCertifications}` : '0/0' } },
   { text: '分发性质', value: 'handOutProperty', align: 'center', width: '90px' },
@@ -230,14 +224,11 @@
 // 选择按钮变更
 watch(active, (val: string) => {
   if (val === null) {
-    activeTitle.value = '可打印'
     active.value = '2'
-    listQuery.value.sampleStatus = '2'
     return
   }
   active.value = val
-  listQuery.value.sampleStatus = val
-  window.sessionStorage.setItem('buttonBoxActive', val)
+  window.sessionStorage.setItem('taskActive', val)
   fetchData(false)
 })
 watch(timeRange, (val: any) => {