diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index 724da6e..3a258c8 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -86,14 +86,14 @@
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { id: string; offset: number; limit: number }) {
+export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
   return request({
-    url: `/customer/contractRecords?offset=${data.offset}&limit=${data.limit}`,
+    url: '/customer/fake/interface',
     method: 'post',
     data,
   })
 }
-// 根据客户查检定记录
+//
 export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) {
   return request({
     url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index 724da6e..3a258c8 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -86,14 +86,14 @@
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { id: string; offset: number; limit: number }) {
+export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
   return request({
-    url: `/customer/contractRecords?offset=${data.offset}&limit=${data.limit}`,
+    url: '/customer/fake/interface',
     method: 'post',
     data,
   })
 }
-// 根据客户查检定记录
+//
 export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) {
   return request({
     url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 7f9431b..8bce535 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
+import type { ISearchQuery } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -29,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: Iapprove) {
+export function deleteStatus(data: { id: string | number }) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -37,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: Iapprove) {
+export function cancelStatus(data: { processInstanceId: string }) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -45,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: Iapprove) {
+export function submitStatus(data: { id: string | number; formId: string }) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index 724da6e..3a258c8 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -86,14 +86,14 @@
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { id: string; offset: number; limit: number }) {
+export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
   return request({
-    url: `/customer/contractRecords?offset=${data.offset}&limit=${data.limit}`,
+    url: '/customer/fake/interface',
     method: 'post',
     data,
   })
 }
-// 根据客户查检定记录
+//
 export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) {
   return request({
     url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 7f9431b..8bce535 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
+import type { ISearchQuery } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -29,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: Iapprove) {
+export function deleteStatus(data: { id: string | number }) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -37,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: Iapprove) {
+export function cancelStatus(data: { processInstanceId: string }) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -45,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: Iapprove) {
+export function submitStatus(data: { id: string | number; formId: string }) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 89fd82d..eb4b260 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -43,15 +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}`,
-        })
-      }
+  return new Promise((resolve, reject) => {
+    // 获取菜单字典
+    getDictByCode('measureStatus').then((response) => {
+      response.data.forEach((item: dictType) => {
+        if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+          menu.value.push({
+            name: item.name,
+            id: `${item.value}`,
+          })
+        }
+      })
+      resolve(menu.value)
     })
   })
 }

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index 724da6e..3a258c8 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -86,14 +86,14 @@
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { id: string; offset: number; limit: number }) {
+export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
   return request({
-    url: `/customer/contractRecords?offset=${data.offset}&limit=${data.limit}`,
+    url: '/customer/fake/interface',
     method: 'post',
     data,
   })
 }
-// 根据客户查检定记录
+//
 export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) {
   return request({
     url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 7f9431b..8bce535 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
+import type { ISearchQuery } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -29,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: Iapprove) {
+export function deleteStatus(data: { id: string | number }) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -37,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: Iapprove) {
+export function cancelStatus(data: { processInstanceId: string }) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -45,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: Iapprove) {
+export function submitStatus(data: { id: string | number; formId: string }) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 89fd82d..eb4b260 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -43,15 +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}`,
-        })
-      }
+  return new Promise((resolve, reject) => {
+    // 获取菜单字典
+    getDictByCode('measureStatus').then((response) => {
+      response.data.forEach((item: dictType) => {
+        if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+          menu.value.push({
+            name: item.name,
+            id: `${item.value}`,
+          })
+        }
+      })
+      resolve(menu.value)
     })
   })
 }
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index d5afb9d..c604d3e 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -41,15 +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}`,
-        })
-      }
+  return new Promise((resolve, reject) => {
+    // 获取菜单字典
+    getDictByCode('measureStatus').then((response) => {
+      response.data.forEach((item: dictType) => {
+        if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+          menu.value.push({
+            name: item.name,
+            id: `${item.value}`,
+          })
+          resolve(menu.value)
+        }
+      })
     })
   })
 }
@@ -275,7 +278,7 @@
     active.value = window.sessionStorage.getItem('myMeasureActive') as string
   }
   else {
-    active.value = menu.value.find(item => item.name === '待检测')!.id // 待分发
+    active.value = menu.value.find(item => item.name === '待检测')!.id // 待检测
   }
   nextTick(() => {
     fetchData(true)

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index 724da6e..3a258c8 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -86,14 +86,14 @@
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { id: string; offset: number; limit: number }) {
+export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
   return request({
-    url: `/customer/contractRecords?offset=${data.offset}&limit=${data.limit}`,
+    url: '/customer/fake/interface',
     method: 'post',
     data,
   })
 }
-// 根据客户查检定记录
+//
 export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) {
   return request({
     url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 7f9431b..8bce535 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
+import type { ISearchQuery } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -29,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: Iapprove) {
+export function deleteStatus(data: { id: string | number }) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -37,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: Iapprove) {
+export function cancelStatus(data: { processInstanceId: string }) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -45,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: Iapprove) {
+export function submitStatus(data: { id: string | number; formId: string }) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 89fd82d..eb4b260 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -43,15 +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}`,
-        })
-      }
+  return new Promise((resolve, reject) => {
+    // 获取菜单字典
+    getDictByCode('measureStatus').then((response) => {
+      response.data.forEach((item: dictType) => {
+        if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+          menu.value.push({
+            name: item.name,
+            id: `${item.value}`,
+          })
+        }
+      })
+      resolve(menu.value)
     })
   })
 }
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index d5afb9d..c604d3e 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -41,15 +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}`,
-        })
-      }
+  return new Promise((resolve, reject) => {
+    // 获取菜单字典
+    getDictByCode('measureStatus').then((response) => {
+      response.data.forEach((item: dictType) => {
+        if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+          menu.value.push({
+            name: item.name,
+            id: `${item.value}`,
+          })
+          resolve(menu.value)
+        }
+      })
     })
   })
 }
@@ -275,7 +278,7 @@
     active.value = window.sessionStorage.getItem('myMeasureActive') as string
   }
   else {
-    active.value = menu.value.find(item => item.name === '待检测')!.id // 待分发
+    active.value = menu.value.find(item => item.name === '待检测')!.id // 待检测
   }
   nextTick(() => {
     fetchData(true)
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 20ecc23..6409759 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -3,7 +3,7 @@
   certificateClass: string // 证书类型
   certificateNo: string // 证书编号
   createUserId: number // 创建人id
-  printStatus: number | null
+  printStatus: number | null | string
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
   sampleNo: string // 样品编号

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index 724da6e..3a258c8 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -86,14 +86,14 @@
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { id: string; offset: number; limit: number }) {
+export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
   return request({
-    url: `/customer/contractRecords?offset=${data.offset}&limit=${data.limit}`,
+    url: '/customer/fake/interface',
     method: 'post',
     data,
   })
 }
-// 根据客户查检定记录
+//
 export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) {
   return request({
     url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 7f9431b..8bce535 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
+import type { ISearchQuery } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -29,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: Iapprove) {
+export function deleteStatus(data: { id: string | number }) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -37,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: Iapprove) {
+export function cancelStatus(data: { processInstanceId: string }) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -45,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: Iapprove) {
+export function submitStatus(data: { id: string | number; formId: string }) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 89fd82d..eb4b260 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -43,15 +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}`,
-        })
-      }
+  return new Promise((resolve, reject) => {
+    // 获取菜单字典
+    getDictByCode('measureStatus').then((response) => {
+      response.data.forEach((item: dictType) => {
+        if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+          menu.value.push({
+            name: item.name,
+            id: `${item.value}`,
+          })
+        }
+      })
+      resolve(menu.value)
     })
   })
 }
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index d5afb9d..c604d3e 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -41,15 +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}`,
-        })
-      }
+  return new Promise((resolve, reject) => {
+    // 获取菜单字典
+    getDictByCode('measureStatus').then((response) => {
+      response.data.forEach((item: dictType) => {
+        if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+          menu.value.push({
+            name: item.name,
+            id: `${item.value}`,
+          })
+          resolve(menu.value)
+        }
+      })
     })
   })
 }
@@ -275,7 +278,7 @@
     active.value = window.sessionStorage.getItem('myMeasureActive') as string
   }
   else {
-    active.value = menu.value.find(item => item.name === '待检测')!.id // 待分发
+    active.value = menu.value.find(item => item.name === '待检测')!.id // 待检测
   }
   nextTick(() => {
     fetchData(true)
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 20ecc23..6409759 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -3,7 +3,7 @@
   certificateClass: string // 证书类型
   certificateNo: string // 证书编号
   createUserId: number // 创建人id
-  printStatus: number | null
+  printStatus: number | null | string
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
   sampleNo: string // 样品编号
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index d69d275..6b6f026 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -25,7 +25,7 @@
 const listQuery = ref<ICertPrintSearch>({
   certificateNo: '', // 证书编号
   createUserId: 0,
-  printStatus: 0, // 可打印(证书可打印传0,全部传null)
+  printStatus: '', // 可打印(证书可打印传0,全部传null)
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
   sampleNo: '', // 样品编号
@@ -50,21 +50,20 @@
   getDictByCode('certificationClass').then((response) => {
     certificationClassList.value = response.data
   })
-  getDictByCode('approvalStatus').then((response) => {
-    // 审批状态字典 {1：草稿箱}
-    // response.data.forEach((item: any) => {
-    //   approvalStatusMap.value[`${item.value}`] = item.name
-    // })
 
-    // 审批状态字典 {草稿箱: 1}
-    // response.data.forEach((item: any) => {
-    //   approvalStatusReserveMap.value[item.name] = `${item.value}`
-    // })
-    // 制作右上角的菜单
-    response.data.forEach((item: dictType) => {
+  // 制作右上角的菜单
+  // eslint-disable-next-line no-async-promise-executor
+  return new Promise(async (resolve, reject) => {
+    const data1 = await getDictByCode('printStatus').then((response) => {
+      return response.data
+    })
+    const data2 = await getDictByCode('approvalStatus').then((response) => {
+      return response.data.filter((item: dictType) => item.name != '可打印')
+    })
+    const _data = [...data1, ...data2]
+    _data.forEach((item: dictType) => {
       if (item.name === '可打印' || item.name === '全部'
-      || item.name === '待审批' || item.name === '审批中'
-      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '待审批' || item.name === '已通过' || item.name === '未通过'
       ) {
         if (item.name === '可打印') {
           active.value = item.value
@@ -82,12 +81,6 @@
         }
       }
     })
-    if (window.sessionStorage.getItem('certPrintActive') != null) {
-      active.value = window.sessionStorage.getItem('certPrintActive') as string
-    }
-    else {
-      active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
-    }
   })
 }
 
@@ -117,29 +110,15 @@
 
 // 根据过滤查询条件
 function filterQuery() {
-  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
-  listQuery.value.approvalStatus = approvalStatus
-  switch (activeTitle.value) {
-    case '可打印':
-      listQuery.value.printStatus = 0
-      listQuery.value.approvalStatus = ''
-      break
-    case '全部':
-      listQuery.value.printStatus = 2
-      listQuery.value.approvalStatus = ''
-      break
-    case '待审批':
-      listQuery.value.printStatus = 2
-      break
-    case '审批中':
-      listQuery.value.printStatus = 2
-      break
-    case '已通过':
-      listQuery.value.printStatus = 2
-      break
-    case '未通过':
-      listQuery.value.printStatus = 2
-      break
+  const StatuFlag = activeTitle.value == '可打印'
+  const value = menu.value.find(item => item.name === activeTitle.value)!.id
+  if (StatuFlag) {
+    listQuery.value.printStatus = value
+    listQuery.value.approvalStatus = ''
+  }
+  else {
+    listQuery.value.printStatus = ''
+    listQuery.value.approvalStatus = value == '0' ? 'null' : value
   }
 }
 
@@ -170,18 +149,17 @@
 }
 // 点击重置
 const clearList = () => {
-  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
     certificateNo: '', // 证书编号
     createUserId: 0,
-    printStatus: 0, // 可打印(证书可打印传0,全部传null)
+    printStatus: '', // 可打印(证书可打印传0,全部传null)
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
-    approvalStatus: active.value, // 审批状态-审批查询用
+    approvalStatus: '', // 审批状态-审批查询用
     orderId: '', // 委托书id
     reason: '', // 操作原因
     sampleId: '', // 样品id
@@ -190,10 +168,7 @@
     offset: 1,
     limit: 20,
   }
-  listQuery.value.approvalStatus = approvalStatus
-  if (activeTitle.value === '可打印' || activeTitle.value === '全部') {
-    listQuery.value.approvalStatus = ''
-  }
+  filterQuery()
   fetchData(true)
 }
 // 点击详情
@@ -206,9 +181,11 @@
 const handleDistribute = (row: ICerPrintList, status: string) => {
   if (status === 'agree') {
     approvalDialogPart.value.initDialog('agree', row.taskId)
+    fetchData(true)
   }
   else {
     approvalDialogPart.value.initDialog('refuse', row.taskId, row.id)
+    fetchData(true)
   }
 }
 
@@ -253,7 +230,6 @@
 
 // 打印
 const bindLabel = (row: ICerPrintList) => {
-  console.log(row)
   // 判断状态第一次可以直接打印,之后的打印需要审批
   if (row.printNum == 0) {
     ElMessageBox.confirm(
@@ -332,9 +308,13 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  setTimeout(() => {
-    fetchData(true)
-  }, 500)
+  if (window.sessionStorage.getItem('certPrintActive') != null) {
+    active.value = window.sessionStorage.getItem('certPrintActive') as string
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
+  }
+  fetchData(true)
 })
 </script>
 

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index 724da6e..3a258c8 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -86,14 +86,14 @@
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { id: string; offset: number; limit: number }) {
+export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
   return request({
-    url: `/customer/contractRecords?offset=${data.offset}&limit=${data.limit}`,
+    url: '/customer/fake/interface',
     method: 'post',
     data,
   })
 }
-// 根据客户查检定记录
+//
 export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) {
   return request({
     url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 7f9431b..8bce535 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
+import type { ISearchQuery } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -29,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: Iapprove) {
+export function deleteStatus(data: { id: string | number }) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -37,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: Iapprove) {
+export function cancelStatus(data: { processInstanceId: string }) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -45,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: Iapprove) {
+export function submitStatus(data: { id: string | number; formId: string }) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 89fd82d..eb4b260 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -43,15 +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}`,
-        })
-      }
+  return new Promise((resolve, reject) => {
+    // 获取菜单字典
+    getDictByCode('measureStatus').then((response) => {
+      response.data.forEach((item: dictType) => {
+        if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+          menu.value.push({
+            name: item.name,
+            id: `${item.value}`,
+          })
+        }
+      })
+      resolve(menu.value)
     })
   })
 }
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index d5afb9d..c604d3e 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -41,15 +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}`,
-        })
-      }
+  return new Promise((resolve, reject) => {
+    // 获取菜单字典
+    getDictByCode('measureStatus').then((response) => {
+      response.data.forEach((item: dictType) => {
+        if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+          menu.value.push({
+            name: item.name,
+            id: `${item.value}`,
+          })
+          resolve(menu.value)
+        }
+      })
     })
   })
 }
@@ -275,7 +278,7 @@
     active.value = window.sessionStorage.getItem('myMeasureActive') as string
   }
   else {
-    active.value = menu.value.find(item => item.name === '待检测')!.id // 待分发
+    active.value = menu.value.find(item => item.name === '待检测')!.id // 待检测
   }
   nextTick(() => {
     fetchData(true)
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 20ecc23..6409759 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -3,7 +3,7 @@
   certificateClass: string // 证书类型
   certificateNo: string // 证书编号
   createUserId: number // 创建人id
-  printStatus: number | null
+  printStatus: number | null | string
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
   sampleNo: string // 样品编号
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index d69d275..6b6f026 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -25,7 +25,7 @@
 const listQuery = ref<ICertPrintSearch>({
   certificateNo: '', // 证书编号
   createUserId: 0,
-  printStatus: 0, // 可打印(证书可打印传0,全部传null)
+  printStatus: '', // 可打印(证书可打印传0,全部传null)
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
   sampleNo: '', // 样品编号
@@ -50,21 +50,20 @@
   getDictByCode('certificationClass').then((response) => {
     certificationClassList.value = response.data
   })
-  getDictByCode('approvalStatus').then((response) => {
-    // 审批状态字典 {1：草稿箱}
-    // response.data.forEach((item: any) => {
-    //   approvalStatusMap.value[`${item.value}`] = item.name
-    // })
 
-    // 审批状态字典 {草稿箱: 1}
-    // response.data.forEach((item: any) => {
-    //   approvalStatusReserveMap.value[item.name] = `${item.value}`
-    // })
-    // 制作右上角的菜单
-    response.data.forEach((item: dictType) => {
+  // 制作右上角的菜单
+  // eslint-disable-next-line no-async-promise-executor
+  return new Promise(async (resolve, reject) => {
+    const data1 = await getDictByCode('printStatus').then((response) => {
+      return response.data
+    })
+    const data2 = await getDictByCode('approvalStatus').then((response) => {
+      return response.data.filter((item: dictType) => item.name != '可打印')
+    })
+    const _data = [...data1, ...data2]
+    _data.forEach((item: dictType) => {
       if (item.name === '可打印' || item.name === '全部'
-      || item.name === '待审批' || item.name === '审批中'
-      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '待审批' || item.name === '已通过' || item.name === '未通过'
       ) {
         if (item.name === '可打印') {
           active.value = item.value
@@ -82,12 +81,6 @@
         }
       }
     })
-    if (window.sessionStorage.getItem('certPrintActive') != null) {
-      active.value = window.sessionStorage.getItem('certPrintActive') as string
-    }
-    else {
-      active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
-    }
   })
 }
 
@@ -117,29 +110,15 @@
 
 // 根据过滤查询条件
 function filterQuery() {
-  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
-  listQuery.value.approvalStatus = approvalStatus
-  switch (activeTitle.value) {
-    case '可打印':
-      listQuery.value.printStatus = 0
-      listQuery.value.approvalStatus = ''
-      break
-    case '全部':
-      listQuery.value.printStatus = 2
-      listQuery.value.approvalStatus = ''
-      break
-    case '待审批':
-      listQuery.value.printStatus = 2
-      break
-    case '审批中':
-      listQuery.value.printStatus = 2
-      break
-    case '已通过':
-      listQuery.value.printStatus = 2
-      break
-    case '未通过':
-      listQuery.value.printStatus = 2
-      break
+  const StatuFlag = activeTitle.value == '可打印'
+  const value = menu.value.find(item => item.name === activeTitle.value)!.id
+  if (StatuFlag) {
+    listQuery.value.printStatus = value
+    listQuery.value.approvalStatus = ''
+  }
+  else {
+    listQuery.value.printStatus = ''
+    listQuery.value.approvalStatus = value == '0' ? 'null' : value
   }
 }
 
@@ -170,18 +149,17 @@
 }
 // 点击重置
 const clearList = () => {
-  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
     certificateNo: '', // 证书编号
     createUserId: 0,
-    printStatus: 0, // 可打印(证书可打印传0,全部传null)
+    printStatus: '', // 可打印(证书可打印传0,全部传null)
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
-    approvalStatus: active.value, // 审批状态-审批查询用
+    approvalStatus: '', // 审批状态-审批查询用
     orderId: '', // 委托书id
     reason: '', // 操作原因
     sampleId: '', // 样品id
@@ -190,10 +168,7 @@
     offset: 1,
     limit: 20,
   }
-  listQuery.value.approvalStatus = approvalStatus
-  if (activeTitle.value === '可打印' || activeTitle.value === '全部') {
-    listQuery.value.approvalStatus = ''
-  }
+  filterQuery()
   fetchData(true)
 }
 // 点击详情
@@ -206,9 +181,11 @@
 const handleDistribute = (row: ICerPrintList, status: string) => {
   if (status === 'agree') {
     approvalDialogPart.value.initDialog('agree', row.taskId)
+    fetchData(true)
   }
   else {
     approvalDialogPart.value.initDialog('refuse', row.taskId, row.id)
+    fetchData(true)
   }
 }
 
@@ -253,7 +230,6 @@
 
 // 打印
 const bindLabel = (row: ICerPrintList) => {
-  console.log(row)
   // 判断状态第一次可以直接打印,之后的打印需要审批
   if (row.printNum == 0) {
     ElMessageBox.confirm(
@@ -332,9 +308,13 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  setTimeout(() => {
-    fetchData(true)
-  }, 500)
+  if (window.sessionStorage.getItem('certPrintActive') != null) {
+    active.value = window.sessionStorage.getItem('certPrintActive') as string
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
+  }
+  fetchData(true)
 })
 </script>
 
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index 74b9dad..6474dce 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -2,7 +2,7 @@
 import processConfig from './processConfig.vue'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
-import { getTaskDetail } from '@/api/business/schedule/task'
+import { getTaskDetail, init } from '@/api/business/schedule/task'
 // 任务分发弹窗
 
 // 自定义方法：close关闭弹窗
@@ -31,6 +31,13 @@
   measureSendBackList: [],
 })
 
+// 分发接口初始化
+const getInfoNext = (measureContent: string) => {
+  init({ measureContent, orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    console.log(res)
+  })
+}
+
 // 获取分发详情
 const getInfo = () => {
   // 获取任务详情
@@ -41,8 +48,10 @@
     sampleDetail.value.certifications = res.data.certifications
     sampleDetail.value.measureProcessList = res.data.measureProcessList
     sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+    getInfoNext(res.data.measureContent)
   })
 }
+
 // 初始化弹窗
 const initDialog = (orderid: string, sampleid: string) => {
   dialogVisible.value = true

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index 724da6e..3a258c8 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -86,14 +86,14 @@
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { id: string; offset: number; limit: number }) {
+export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
   return request({
-    url: `/customer/contractRecords?offset=${data.offset}&limit=${data.limit}`,
+    url: '/customer/fake/interface',
     method: 'post',
     data,
   })
 }
-// 根据客户查检定记录
+//
 export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) {
   return request({
     url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 7f9431b..8bce535 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
+import type { ISearchQuery } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -29,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: Iapprove) {
+export function deleteStatus(data: { id: string | number }) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -37,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: Iapprove) {
+export function cancelStatus(data: { processInstanceId: string }) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -45,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: Iapprove) {
+export function submitStatus(data: { id: string | number; formId: string }) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 89fd82d..eb4b260 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -43,15 +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}`,
-        })
-      }
+  return new Promise((resolve, reject) => {
+    // 获取菜单字典
+    getDictByCode('measureStatus').then((response) => {
+      response.data.forEach((item: dictType) => {
+        if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+          menu.value.push({
+            name: item.name,
+            id: `${item.value}`,
+          })
+        }
+      })
+      resolve(menu.value)
     })
   })
 }
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index d5afb9d..c604d3e 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -41,15 +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}`,
-        })
-      }
+  return new Promise((resolve, reject) => {
+    // 获取菜单字典
+    getDictByCode('measureStatus').then((response) => {
+      response.data.forEach((item: dictType) => {
+        if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+          menu.value.push({
+            name: item.name,
+            id: `${item.value}`,
+          })
+          resolve(menu.value)
+        }
+      })
     })
   })
 }
@@ -275,7 +278,7 @@
     active.value = window.sessionStorage.getItem('myMeasureActive') as string
   }
   else {
-    active.value = menu.value.find(item => item.name === '待检测')!.id // 待分发
+    active.value = menu.value.find(item => item.name === '待检测')!.id // 待检测
   }
   nextTick(() => {
     fetchData(true)
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 20ecc23..6409759 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -3,7 +3,7 @@
   certificateClass: string // 证书类型
   certificateNo: string // 证书编号
   createUserId: number // 创建人id
-  printStatus: number | null
+  printStatus: number | null | string
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
   sampleNo: string // 样品编号
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index d69d275..6b6f026 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -25,7 +25,7 @@
 const listQuery = ref<ICertPrintSearch>({
   certificateNo: '', // 证书编号
   createUserId: 0,
-  printStatus: 0, // 可打印(证书可打印传0,全部传null)
+  printStatus: '', // 可打印(证书可打印传0,全部传null)
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
   sampleNo: '', // 样品编号
@@ -50,21 +50,20 @@
   getDictByCode('certificationClass').then((response) => {
     certificationClassList.value = response.data
   })
-  getDictByCode('approvalStatus').then((response) => {
-    // 审批状态字典 {1：草稿箱}
-    // response.data.forEach((item: any) => {
-    //   approvalStatusMap.value[`${item.value}`] = item.name
-    // })
 
-    // 审批状态字典 {草稿箱: 1}
-    // response.data.forEach((item: any) => {
-    //   approvalStatusReserveMap.value[item.name] = `${item.value}`
-    // })
-    // 制作右上角的菜单
-    response.data.forEach((item: dictType) => {
+  // 制作右上角的菜单
+  // eslint-disable-next-line no-async-promise-executor
+  return new Promise(async (resolve, reject) => {
+    const data1 = await getDictByCode('printStatus').then((response) => {
+      return response.data
+    })
+    const data2 = await getDictByCode('approvalStatus').then((response) => {
+      return response.data.filter((item: dictType) => item.name != '可打印')
+    })
+    const _data = [...data1, ...data2]
+    _data.forEach((item: dictType) => {
       if (item.name === '可打印' || item.name === '全部'
-      || item.name === '待审批' || item.name === '审批中'
-      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '待审批' || item.name === '已通过' || item.name === '未通过'
       ) {
         if (item.name === '可打印') {
           active.value = item.value
@@ -82,12 +81,6 @@
         }
       }
     })
-    if (window.sessionStorage.getItem('certPrintActive') != null) {
-      active.value = window.sessionStorage.getItem('certPrintActive') as string
-    }
-    else {
-      active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
-    }
   })
 }
 
@@ -117,29 +110,15 @@
 
 // 根据过滤查询条件
 function filterQuery() {
-  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
-  listQuery.value.approvalStatus = approvalStatus
-  switch (activeTitle.value) {
-    case '可打印':
-      listQuery.value.printStatus = 0
-      listQuery.value.approvalStatus = ''
-      break
-    case '全部':
-      listQuery.value.printStatus = 2
-      listQuery.value.approvalStatus = ''
-      break
-    case '待审批':
-      listQuery.value.printStatus = 2
-      break
-    case '审批中':
-      listQuery.value.printStatus = 2
-      break
-    case '已通过':
-      listQuery.value.printStatus = 2
-      break
-    case '未通过':
-      listQuery.value.printStatus = 2
-      break
+  const StatuFlag = activeTitle.value == '可打印'
+  const value = menu.value.find(item => item.name === activeTitle.value)!.id
+  if (StatuFlag) {
+    listQuery.value.printStatus = value
+    listQuery.value.approvalStatus = ''
+  }
+  else {
+    listQuery.value.printStatus = ''
+    listQuery.value.approvalStatus = value == '0' ? 'null' : value
   }
 }
 
@@ -170,18 +149,17 @@
 }
 // 点击重置
 const clearList = () => {
-  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
     certificateNo: '', // 证书编号
     createUserId: 0,
-    printStatus: 0, // 可打印(证书可打印传0,全部传null)
+    printStatus: '', // 可打印(证书可打印传0,全部传null)
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
-    approvalStatus: active.value, // 审批状态-审批查询用
+    approvalStatus: '', // 审批状态-审批查询用
     orderId: '', // 委托书id
     reason: '', // 操作原因
     sampleId: '', // 样品id
@@ -190,10 +168,7 @@
     offset: 1,
     limit: 20,
   }
-  listQuery.value.approvalStatus = approvalStatus
-  if (activeTitle.value === '可打印' || activeTitle.value === '全部') {
-    listQuery.value.approvalStatus = ''
-  }
+  filterQuery()
   fetchData(true)
 }
 // 点击详情
@@ -206,9 +181,11 @@
 const handleDistribute = (row: ICerPrintList, status: string) => {
   if (status === 'agree') {
     approvalDialogPart.value.initDialog('agree', row.taskId)
+    fetchData(true)
   }
   else {
     approvalDialogPart.value.initDialog('refuse', row.taskId, row.id)
+    fetchData(true)
   }
 }
 
@@ -253,7 +230,6 @@
 
 // 打印
 const bindLabel = (row: ICerPrintList) => {
-  console.log(row)
   // 判断状态第一次可以直接打印,之后的打印需要审批
   if (row.printNum == 0) {
     ElMessageBox.confirm(
@@ -332,9 +308,13 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  setTimeout(() => {
-    fetchData(true)
-  }, 500)
+  if (window.sessionStorage.getItem('certPrintActive') != null) {
+    active.value = window.sessionStorage.getItem('certPrintActive') as string
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
+  }
+  fetchData(true)
 })
 </script>
 
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index 74b9dad..6474dce 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -2,7 +2,7 @@
 import processConfig from './processConfig.vue'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
-import { getTaskDetail } from '@/api/business/schedule/task'
+import { getTaskDetail, init } from '@/api/business/schedule/task'
 // 任务分发弹窗
 
 // 自定义方法：close关闭弹窗
@@ -31,6 +31,13 @@
   measureSendBackList: [],
 })
 
+// 分发接口初始化
+const getInfoNext = (measureContent: string) => {
+  init({ measureContent, orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    console.log(res)
+  })
+}
+
 // 获取分发详情
 const getInfo = () => {
   // 获取任务详情
@@ -41,8 +48,10 @@
     sampleDetail.value.certifications = res.data.certifications
     sampleDetail.value.measureProcessList = res.data.measureProcessList
     sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+    getInfoNext(res.data.measureContent)
   })
 }
+
 // 初始化弹窗
 const initDialog = (orderid: string, sampleid: string) => {
   dialogVisible.value = true
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index c7ed51c..7c4a4b4 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -217,6 +217,8 @@
     taskForm.value.measureContent = res.data.measureContent // 检定项目
     taskForm.value.measureProcessList = res.data.measureProcessList
     taskForm.value.measureSendBackList = res.data.measureSendBackList
+    // 改用一个接口获取
+    sampleForm.value = res.data
   })
 }
 
@@ -271,7 +273,7 @@
     orderId.value = $route.query.order as string
     // 获取分发详情
     getInfo()
-    getSampleInfo()
+    // getSampleInfo() // 取消
   }
 }
 </script>
@@ -283,9 +285,9 @@
         <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <!-- <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
-        </el-button>
+        </el-button> -->
         <el-button type="info" @click="close">
           关闭
         </el-button>
@@ -548,14 +550,14 @@
       </div>
     </detail-page>
     <detail-block title="检定流程">
-      <template #btns>
+      <!-- <template #btns>
         <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
           批量添加
         </el-button>
         <el-button type="primary" style="margin-bottom: 10px;" @click="saveProcess">
           保存
         </el-button>
-      </template>
+      </template> -->
       <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index 724da6e..3a258c8 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -86,14 +86,14 @@
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { id: string; offset: number; limit: number }) {
+export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
   return request({
-    url: `/customer/contractRecords?offset=${data.offset}&limit=${data.limit}`,
+    url: '/customer/fake/interface',
     method: 'post',
     data,
   })
 }
-// 根据客户查检定记录
+//
 export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) {
   return request({
     url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 7f9431b..8bce535 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
+import type { ISearchQuery } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -29,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: Iapprove) {
+export function deleteStatus(data: { id: string | number }) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -37,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: Iapprove) {
+export function cancelStatus(data: { processInstanceId: string }) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -45,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: Iapprove) {
+export function submitStatus(data: { id: string | number; formId: string }) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 89fd82d..eb4b260 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -43,15 +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}`,
-        })
-      }
+  return new Promise((resolve, reject) => {
+    // 获取菜单字典
+    getDictByCode('measureStatus').then((response) => {
+      response.data.forEach((item: dictType) => {
+        if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+          menu.value.push({
+            name: item.name,
+            id: `${item.value}`,
+          })
+        }
+      })
+      resolve(menu.value)
     })
   })
 }
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index d5afb9d..c604d3e 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -41,15 +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}`,
-        })
-      }
+  return new Promise((resolve, reject) => {
+    // 获取菜单字典
+    getDictByCode('measureStatus').then((response) => {
+      response.data.forEach((item: dictType) => {
+        if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+          menu.value.push({
+            name: item.name,
+            id: `${item.value}`,
+          })
+          resolve(menu.value)
+        }
+      })
     })
   })
 }
@@ -275,7 +278,7 @@
     active.value = window.sessionStorage.getItem('myMeasureActive') as string
   }
   else {
-    active.value = menu.value.find(item => item.name === '待检测')!.id // 待分发
+    active.value = menu.value.find(item => item.name === '待检测')!.id // 待检测
   }
   nextTick(() => {
     fetchData(true)
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 20ecc23..6409759 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -3,7 +3,7 @@
   certificateClass: string // 证书类型
   certificateNo: string // 证书编号
   createUserId: number // 创建人id
-  printStatus: number | null
+  printStatus: number | null | string
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
   sampleNo: string // 样品编号
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index d69d275..6b6f026 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -25,7 +25,7 @@
 const listQuery = ref<ICertPrintSearch>({
   certificateNo: '', // 证书编号
   createUserId: 0,
-  printStatus: 0, // 可打印(证书可打印传0,全部传null)
+  printStatus: '', // 可打印(证书可打印传0,全部传null)
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
   sampleNo: '', // 样品编号
@@ -50,21 +50,20 @@
   getDictByCode('certificationClass').then((response) => {
     certificationClassList.value = response.data
   })
-  getDictByCode('approvalStatus').then((response) => {
-    // 审批状态字典 {1：草稿箱}
-    // response.data.forEach((item: any) => {
-    //   approvalStatusMap.value[`${item.value}`] = item.name
-    // })
 
-    // 审批状态字典 {草稿箱: 1}
-    // response.data.forEach((item: any) => {
-    //   approvalStatusReserveMap.value[item.name] = `${item.value}`
-    // })
-    // 制作右上角的菜单
-    response.data.forEach((item: dictType) => {
+  // 制作右上角的菜单
+  // eslint-disable-next-line no-async-promise-executor
+  return new Promise(async (resolve, reject) => {
+    const data1 = await getDictByCode('printStatus').then((response) => {
+      return response.data
+    })
+    const data2 = await getDictByCode('approvalStatus').then((response) => {
+      return response.data.filter((item: dictType) => item.name != '可打印')
+    })
+    const _data = [...data1, ...data2]
+    _data.forEach((item: dictType) => {
       if (item.name === '可打印' || item.name === '全部'
-      || item.name === '待审批' || item.name === '审批中'
-      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '待审批' || item.name === '已通过' || item.name === '未通过'
       ) {
         if (item.name === '可打印') {
           active.value = item.value
@@ -82,12 +81,6 @@
         }
       }
     })
-    if (window.sessionStorage.getItem('certPrintActive') != null) {
-      active.value = window.sessionStorage.getItem('certPrintActive') as string
-    }
-    else {
-      active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
-    }
   })
 }
 
@@ -117,29 +110,15 @@
 
 // 根据过滤查询条件
 function filterQuery() {
-  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
-  listQuery.value.approvalStatus = approvalStatus
-  switch (activeTitle.value) {
-    case '可打印':
-      listQuery.value.printStatus = 0
-      listQuery.value.approvalStatus = ''
-      break
-    case '全部':
-      listQuery.value.printStatus = 2
-      listQuery.value.approvalStatus = ''
-      break
-    case '待审批':
-      listQuery.value.printStatus = 2
-      break
-    case '审批中':
-      listQuery.value.printStatus = 2
-      break
-    case '已通过':
-      listQuery.value.printStatus = 2
-      break
-    case '未通过':
-      listQuery.value.printStatus = 2
-      break
+  const StatuFlag = activeTitle.value == '可打印'
+  const value = menu.value.find(item => item.name === activeTitle.value)!.id
+  if (StatuFlag) {
+    listQuery.value.printStatus = value
+    listQuery.value.approvalStatus = ''
+  }
+  else {
+    listQuery.value.printStatus = ''
+    listQuery.value.approvalStatus = value == '0' ? 'null' : value
   }
 }
 
@@ -170,18 +149,17 @@
 }
 // 点击重置
 const clearList = () => {
-  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
     certificateNo: '', // 证书编号
     createUserId: 0,
-    printStatus: 0, // 可打印(证书可打印传0,全部传null)
+    printStatus: '', // 可打印(证书可打印传0,全部传null)
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
-    approvalStatus: active.value, // 审批状态-审批查询用
+    approvalStatus: '', // 审批状态-审批查询用
     orderId: '', // 委托书id
     reason: '', // 操作原因
     sampleId: '', // 样品id
@@ -190,10 +168,7 @@
     offset: 1,
     limit: 20,
   }
-  listQuery.value.approvalStatus = approvalStatus
-  if (activeTitle.value === '可打印' || activeTitle.value === '全部') {
-    listQuery.value.approvalStatus = ''
-  }
+  filterQuery()
   fetchData(true)
 }
 // 点击详情
@@ -206,9 +181,11 @@
 const handleDistribute = (row: ICerPrintList, status: string) => {
   if (status === 'agree') {
     approvalDialogPart.value.initDialog('agree', row.taskId)
+    fetchData(true)
   }
   else {
     approvalDialogPart.value.initDialog('refuse', row.taskId, row.id)
+    fetchData(true)
   }
 }
 
@@ -253,7 +230,6 @@
 
 // 打印
 const bindLabel = (row: ICerPrintList) => {
-  console.log(row)
   // 判断状态第一次可以直接打印,之后的打印需要审批
   if (row.printNum == 0) {
     ElMessageBox.confirm(
@@ -332,9 +308,13 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  setTimeout(() => {
-    fetchData(true)
-  }, 500)
+  if (window.sessionStorage.getItem('certPrintActive') != null) {
+    active.value = window.sessionStorage.getItem('certPrintActive') as string
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
+  }
+  fetchData(true)
 })
 </script>
 
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index 74b9dad..6474dce 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -2,7 +2,7 @@
 import processConfig from './processConfig.vue'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
-import { getTaskDetail } from '@/api/business/schedule/task'
+import { getTaskDetail, init } from '@/api/business/schedule/task'
 // 任务分发弹窗
 
 // 自定义方法：close关闭弹窗
@@ -31,6 +31,13 @@
   measureSendBackList: [],
 })
 
+// 分发接口初始化
+const getInfoNext = (measureContent: string) => {
+  init({ measureContent, orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    console.log(res)
+  })
+}
+
 // 获取分发详情
 const getInfo = () => {
   // 获取任务详情
@@ -41,8 +48,10 @@
     sampleDetail.value.certifications = res.data.certifications
     sampleDetail.value.measureProcessList = res.data.measureProcessList
     sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+    getInfoNext(res.data.measureContent)
   })
 }
+
 // 初始化弹窗
 const initDialog = (orderid: string, sampleid: string) => {
   dialogVisible.value = true
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index c7ed51c..7c4a4b4 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -217,6 +217,8 @@
     taskForm.value.measureContent = res.data.measureContent // 检定项目
     taskForm.value.measureProcessList = res.data.measureProcessList
     taskForm.value.measureSendBackList = res.data.measureSendBackList
+    // 改用一个接口获取
+    sampleForm.value = res.data
   })
 }
 
@@ -271,7 +273,7 @@
     orderId.value = $route.query.order as string
     // 获取分发详情
     getInfo()
-    getSampleInfo()
+    // getSampleInfo() // 取消
   }
 }
 </script>
@@ -283,9 +285,9 @@
         <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <!-- <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
-        </el-button>
+        </el-button> -->
         <el-button type="info" @click="close">
           关闭
         </el-button>
@@ -548,14 +550,14 @@
       </div>
     </detail-page>
     <detail-block title="检定流程">
-      <template #btns>
+      <!-- <template #btns>
         <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
           批量添加
         </el-button>
         <el-button type="primary" style="margin-bottom: 10px;" @click="saveProcess">
           保存
         </el-button>
-      </template>
+      </template> -->
       <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 89323a3..068de3a 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -133,6 +133,7 @@
     offset: 1,
     limit: 20,
   }
+  timeRange.value = ['', '']
   fetchData(true)
 }
 // 点击详情

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index 724da6e..3a258c8 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -86,14 +86,14 @@
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { id: string; offset: number; limit: number }) {
+export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
   return request({
-    url: `/customer/contractRecords?offset=${data.offset}&limit=${data.limit}`,
+    url: '/customer/fake/interface',
     method: 'post',
     data,
   })
 }
-// 根据客户查检定记录
+//
 export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) {
   return request({
     url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 7f9431b..8bce535 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
+import type { ISearchQuery } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -29,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: Iapprove) {
+export function deleteStatus(data: { id: string | number }) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -37,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: Iapprove) {
+export function cancelStatus(data: { processInstanceId: string }) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -45,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: Iapprove) {
+export function submitStatus(data: { id: string | number; formId: string }) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 89fd82d..eb4b260 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -43,15 +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}`,
-        })
-      }
+  return new Promise((resolve, reject) => {
+    // 获取菜单字典
+    getDictByCode('measureStatus').then((response) => {
+      response.data.forEach((item: dictType) => {
+        if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+          menu.value.push({
+            name: item.name,
+            id: `${item.value}`,
+          })
+        }
+      })
+      resolve(menu.value)
     })
   })
 }
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index d5afb9d..c604d3e 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -41,15 +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}`,
-        })
-      }
+  return new Promise((resolve, reject) => {
+    // 获取菜单字典
+    getDictByCode('measureStatus').then((response) => {
+      response.data.forEach((item: dictType) => {
+        if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+          menu.value.push({
+            name: item.name,
+            id: `${item.value}`,
+          })
+          resolve(menu.value)
+        }
+      })
     })
   })
 }
@@ -275,7 +278,7 @@
     active.value = window.sessionStorage.getItem('myMeasureActive') as string
   }
   else {
-    active.value = menu.value.find(item => item.name === '待检测')!.id // 待分发
+    active.value = menu.value.find(item => item.name === '待检测')!.id // 待检测
   }
   nextTick(() => {
     fetchData(true)
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 20ecc23..6409759 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -3,7 +3,7 @@
   certificateClass: string // 证书类型
   certificateNo: string // 证书编号
   createUserId: number // 创建人id
-  printStatus: number | null
+  printStatus: number | null | string
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
   sampleNo: string // 样品编号
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index d69d275..6b6f026 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -25,7 +25,7 @@
 const listQuery = ref<ICertPrintSearch>({
   certificateNo: '', // 证书编号
   createUserId: 0,
-  printStatus: 0, // 可打印(证书可打印传0,全部传null)
+  printStatus: '', // 可打印(证书可打印传0,全部传null)
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
   sampleNo: '', // 样品编号
@@ -50,21 +50,20 @@
   getDictByCode('certificationClass').then((response) => {
     certificationClassList.value = response.data
   })
-  getDictByCode('approvalStatus').then((response) => {
-    // 审批状态字典 {1：草稿箱}
-    // response.data.forEach((item: any) => {
-    //   approvalStatusMap.value[`${item.value}`] = item.name
-    // })
 
-    // 审批状态字典 {草稿箱: 1}
-    // response.data.forEach((item: any) => {
-    //   approvalStatusReserveMap.value[item.name] = `${item.value}`
-    // })
-    // 制作右上角的菜单
-    response.data.forEach((item: dictType) => {
+  // 制作右上角的菜单
+  // eslint-disable-next-line no-async-promise-executor
+  return new Promise(async (resolve, reject) => {
+    const data1 = await getDictByCode('printStatus').then((response) => {
+      return response.data
+    })
+    const data2 = await getDictByCode('approvalStatus').then((response) => {
+      return response.data.filter((item: dictType) => item.name != '可打印')
+    })
+    const _data = [...data1, ...data2]
+    _data.forEach((item: dictType) => {
       if (item.name === '可打印' || item.name === '全部'
-      || item.name === '待审批' || item.name === '审批中'
-      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '待审批' || item.name === '已通过' || item.name === '未通过'
       ) {
         if (item.name === '可打印') {
           active.value = item.value
@@ -82,12 +81,6 @@
         }
       }
     })
-    if (window.sessionStorage.getItem('certPrintActive') != null) {
-      active.value = window.sessionStorage.getItem('certPrintActive') as string
-    }
-    else {
-      active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
-    }
   })
 }
 
@@ -117,29 +110,15 @@
 
 // 根据过滤查询条件
 function filterQuery() {
-  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
-  listQuery.value.approvalStatus = approvalStatus
-  switch (activeTitle.value) {
-    case '可打印':
-      listQuery.value.printStatus = 0
-      listQuery.value.approvalStatus = ''
-      break
-    case '全部':
-      listQuery.value.printStatus = 2
-      listQuery.value.approvalStatus = ''
-      break
-    case '待审批':
-      listQuery.value.printStatus = 2
-      break
-    case '审批中':
-      listQuery.value.printStatus = 2
-      break
-    case '已通过':
-      listQuery.value.printStatus = 2
-      break
-    case '未通过':
-      listQuery.value.printStatus = 2
-      break
+  const StatuFlag = activeTitle.value == '可打印'
+  const value = menu.value.find(item => item.name === activeTitle.value)!.id
+  if (StatuFlag) {
+    listQuery.value.printStatus = value
+    listQuery.value.approvalStatus = ''
+  }
+  else {
+    listQuery.value.printStatus = ''
+    listQuery.value.approvalStatus = value == '0' ? 'null' : value
   }
 }
 
@@ -170,18 +149,17 @@
 }
 // 点击重置
 const clearList = () => {
-  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
     certificateNo: '', // 证书编号
     createUserId: 0,
-    printStatus: 0, // 可打印(证书可打印传0,全部传null)
+    printStatus: '', // 可打印(证书可打印传0,全部传null)
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
-    approvalStatus: active.value, // 审批状态-审批查询用
+    approvalStatus: '', // 审批状态-审批查询用
     orderId: '', // 委托书id
     reason: '', // 操作原因
     sampleId: '', // 样品id
@@ -190,10 +168,7 @@
     offset: 1,
     limit: 20,
   }
-  listQuery.value.approvalStatus = approvalStatus
-  if (activeTitle.value === '可打印' || activeTitle.value === '全部') {
-    listQuery.value.approvalStatus = ''
-  }
+  filterQuery()
   fetchData(true)
 }
 // 点击详情
@@ -206,9 +181,11 @@
 const handleDistribute = (row: ICerPrintList, status: string) => {
   if (status === 'agree') {
     approvalDialogPart.value.initDialog('agree', row.taskId)
+    fetchData(true)
   }
   else {
     approvalDialogPart.value.initDialog('refuse', row.taskId, row.id)
+    fetchData(true)
   }
 }
 
@@ -253,7 +230,6 @@
 
 // 打印
 const bindLabel = (row: ICerPrintList) => {
-  console.log(row)
   // 判断状态第一次可以直接打印,之后的打印需要审批
   if (row.printNum == 0) {
     ElMessageBox.confirm(
@@ -332,9 +308,13 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  setTimeout(() => {
-    fetchData(true)
-  }, 500)
+  if (window.sessionStorage.getItem('certPrintActive') != null) {
+    active.value = window.sessionStorage.getItem('certPrintActive') as string
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
+  }
+  fetchData(true)
 })
 </script>
 
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index 74b9dad..6474dce 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -2,7 +2,7 @@
 import processConfig from './processConfig.vue'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
-import { getTaskDetail } from '@/api/business/schedule/task'
+import { getTaskDetail, init } from '@/api/business/schedule/task'
 // 任务分发弹窗
 
 // 自定义方法：close关闭弹窗
@@ -31,6 +31,13 @@
   measureSendBackList: [],
 })
 
+// 分发接口初始化
+const getInfoNext = (measureContent: string) => {
+  init({ measureContent, orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    console.log(res)
+  })
+}
+
 // 获取分发详情
 const getInfo = () => {
   // 获取任务详情
@@ -41,8 +48,10 @@
     sampleDetail.value.certifications = res.data.certifications
     sampleDetail.value.measureProcessList = res.data.measureProcessList
     sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+    getInfoNext(res.data.measureContent)
   })
 }
+
 // 初始化弹窗
 const initDialog = (orderid: string, sampleid: string) => {
   dialogVisible.value = true
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index c7ed51c..7c4a4b4 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -217,6 +217,8 @@
     taskForm.value.measureContent = res.data.measureContent // 检定项目
     taskForm.value.measureProcessList = res.data.measureProcessList
     taskForm.value.measureSendBackList = res.data.measureSendBackList
+    // 改用一个接口获取
+    sampleForm.value = res.data
   })
 }
 
@@ -271,7 +273,7 @@
     orderId.value = $route.query.order as string
     // 获取分发详情
     getInfo()
-    getSampleInfo()
+    // getSampleInfo() // 取消
   }
 }
 </script>
@@ -283,9 +285,9 @@
         <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <!-- <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
-        </el-button>
+        </el-button> -->
         <el-button type="info" @click="close">
           关闭
         </el-button>
@@ -548,14 +550,14 @@
       </div>
     </detail-page>
     <detail-block title="检定流程">
-      <template #btns>
+      <!-- <template #btns>
         <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
           批量添加
         </el-button>
         <el-button type="primary" style="margin-bottom: 10px;" @click="saveProcess">
           保存
         </el-button>
-      </template>
+      </template> -->
       <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 89323a3..068de3a 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -133,6 +133,7 @@
     offset: 1,
     limit: 20,
   }
+  timeRange.value = ['', '']
   fetchData(true)
 }
 // 点击详情
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index d5093d7..f212125 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -114,8 +114,11 @@
 }
 // 获取检定记录
 const fetchMeasureRecords = function (query: { id: string; limit: number; offset: number }) {
-  query.id = dataForm.value.id
-  getOrderByCustomer(query).then((res) => {
+  const postData = {
+    sampleId: '',
+    customeId: dataForm.value.id,
+  }
+  getOrderByCustomer(postData).then((res) => {
     dataList.value.measureRecords = res.data.rows
   })
 }
@@ -275,7 +278,6 @@
     evaluationList.value = response.data
   })
 }
-getDict()
 
 const getInfo = () => {
   loading.value = true
@@ -466,10 +468,14 @@
     item.editable = false
   }
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
-}
+
+onMounted(() => {
+  // 非添加页面获取详情
+  if (pageType.value !== 'add') {
+    getInfo()
+  }
+  getDict()
+})
 </script>
 
 <template>
@@ -477,7 +483,7 @@
     <detail-page v-loading="loading" :title="`客户-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印
+          打印1
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index 724da6e..3a258c8 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -86,14 +86,14 @@
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { id: string; offset: number; limit: number }) {
+export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
   return request({
-    url: `/customer/contractRecords?offset=${data.offset}&limit=${data.limit}`,
+    url: '/customer/fake/interface',
     method: 'post',
     data,
   })
 }
-// 根据客户查检定记录
+//
 export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) {
   return request({
     url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 7f9431b..8bce535 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
+import type { ISearchQuery } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -29,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: Iapprove) {
+export function deleteStatus(data: { id: string | number }) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -37,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: Iapprove) {
+export function cancelStatus(data: { processInstanceId: string }) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -45,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: Iapprove) {
+export function submitStatus(data: { id: string | number; formId: string }) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 89fd82d..eb4b260 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -43,15 +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}`,
-        })
-      }
+  return new Promise((resolve, reject) => {
+    // 获取菜单字典
+    getDictByCode('measureStatus').then((response) => {
+      response.data.forEach((item: dictType) => {
+        if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+          menu.value.push({
+            name: item.name,
+            id: `${item.value}`,
+          })
+        }
+      })
+      resolve(menu.value)
     })
   })
 }
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index d5afb9d..c604d3e 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -41,15 +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}`,
-        })
-      }
+  return new Promise((resolve, reject) => {
+    // 获取菜单字典
+    getDictByCode('measureStatus').then((response) => {
+      response.data.forEach((item: dictType) => {
+        if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+          menu.value.push({
+            name: item.name,
+            id: `${item.value}`,
+          })
+          resolve(menu.value)
+        }
+      })
     })
   })
 }
@@ -275,7 +278,7 @@
     active.value = window.sessionStorage.getItem('myMeasureActive') as string
   }
   else {
-    active.value = menu.value.find(item => item.name === '待检测')!.id // 待分发
+    active.value = menu.value.find(item => item.name === '待检测')!.id // 待检测
   }
   nextTick(() => {
     fetchData(true)
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 20ecc23..6409759 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -3,7 +3,7 @@
   certificateClass: string // 证书类型
   certificateNo: string // 证书编号
   createUserId: number // 创建人id
-  printStatus: number | null
+  printStatus: number | null | string
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
   sampleNo: string // 样品编号
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index d69d275..6b6f026 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -25,7 +25,7 @@
 const listQuery = ref<ICertPrintSearch>({
   certificateNo: '', // 证书编号
   createUserId: 0,
-  printStatus: 0, // 可打印(证书可打印传0,全部传null)
+  printStatus: '', // 可打印(证书可打印传0,全部传null)
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
   sampleNo: '', // 样品编号
@@ -50,21 +50,20 @@
   getDictByCode('certificationClass').then((response) => {
     certificationClassList.value = response.data
   })
-  getDictByCode('approvalStatus').then((response) => {
-    // 审批状态字典 {1：草稿箱}
-    // response.data.forEach((item: any) => {
-    //   approvalStatusMap.value[`${item.value}`] = item.name
-    // })
 
-    // 审批状态字典 {草稿箱: 1}
-    // response.data.forEach((item: any) => {
-    //   approvalStatusReserveMap.value[item.name] = `${item.value}`
-    // })
-    // 制作右上角的菜单
-    response.data.forEach((item: dictType) => {
+  // 制作右上角的菜单
+  // eslint-disable-next-line no-async-promise-executor
+  return new Promise(async (resolve, reject) => {
+    const data1 = await getDictByCode('printStatus').then((response) => {
+      return response.data
+    })
+    const data2 = await getDictByCode('approvalStatus').then((response) => {
+      return response.data.filter((item: dictType) => item.name != '可打印')
+    })
+    const _data = [...data1, ...data2]
+    _data.forEach((item: dictType) => {
       if (item.name === '可打印' || item.name === '全部'
-      || item.name === '待审批' || item.name === '审批中'
-      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '待审批' || item.name === '已通过' || item.name === '未通过'
       ) {
         if (item.name === '可打印') {
           active.value = item.value
@@ -82,12 +81,6 @@
         }
       }
     })
-    if (window.sessionStorage.getItem('certPrintActive') != null) {
-      active.value = window.sessionStorage.getItem('certPrintActive') as string
-    }
-    else {
-      active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
-    }
   })
 }
 
@@ -117,29 +110,15 @@
 
 // 根据过滤查询条件
 function filterQuery() {
-  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
-  listQuery.value.approvalStatus = approvalStatus
-  switch (activeTitle.value) {
-    case '可打印':
-      listQuery.value.printStatus = 0
-      listQuery.value.approvalStatus = ''
-      break
-    case '全部':
-      listQuery.value.printStatus = 2
-      listQuery.value.approvalStatus = ''
-      break
-    case '待审批':
-      listQuery.value.printStatus = 2
-      break
-    case '审批中':
-      listQuery.value.printStatus = 2
-      break
-    case '已通过':
-      listQuery.value.printStatus = 2
-      break
-    case '未通过':
-      listQuery.value.printStatus = 2
-      break
+  const StatuFlag = activeTitle.value == '可打印'
+  const value = menu.value.find(item => item.name === activeTitle.value)!.id
+  if (StatuFlag) {
+    listQuery.value.printStatus = value
+    listQuery.value.approvalStatus = ''
+  }
+  else {
+    listQuery.value.printStatus = ''
+    listQuery.value.approvalStatus = value == '0' ? 'null' : value
   }
 }
 
@@ -170,18 +149,17 @@
 }
 // 点击重置
 const clearList = () => {
-  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
     certificateNo: '', // 证书编号
     createUserId: 0,
-    printStatus: 0, // 可打印(证书可打印传0,全部传null)
+    printStatus: '', // 可打印(证书可打印传0,全部传null)
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
-    approvalStatus: active.value, // 审批状态-审批查询用
+    approvalStatus: '', // 审批状态-审批查询用
     orderId: '', // 委托书id
     reason: '', // 操作原因
     sampleId: '', // 样品id
@@ -190,10 +168,7 @@
     offset: 1,
     limit: 20,
   }
-  listQuery.value.approvalStatus = approvalStatus
-  if (activeTitle.value === '可打印' || activeTitle.value === '全部') {
-    listQuery.value.approvalStatus = ''
-  }
+  filterQuery()
   fetchData(true)
 }
 // 点击详情
@@ -206,9 +181,11 @@
 const handleDistribute = (row: ICerPrintList, status: string) => {
   if (status === 'agree') {
     approvalDialogPart.value.initDialog('agree', row.taskId)
+    fetchData(true)
   }
   else {
     approvalDialogPart.value.initDialog('refuse', row.taskId, row.id)
+    fetchData(true)
   }
 }
 
@@ -253,7 +230,6 @@
 
 // 打印
 const bindLabel = (row: ICerPrintList) => {
-  console.log(row)
   // 判断状态第一次可以直接打印,之后的打印需要审批
   if (row.printNum == 0) {
     ElMessageBox.confirm(
@@ -332,9 +308,13 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  setTimeout(() => {
-    fetchData(true)
-  }, 500)
+  if (window.sessionStorage.getItem('certPrintActive') != null) {
+    active.value = window.sessionStorage.getItem('certPrintActive') as string
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
+  }
+  fetchData(true)
 })
 </script>
 
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index 74b9dad..6474dce 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -2,7 +2,7 @@
 import processConfig from './processConfig.vue'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
-import { getTaskDetail } from '@/api/business/schedule/task'
+import { getTaskDetail, init } from '@/api/business/schedule/task'
 // 任务分发弹窗
 
 // 自定义方法：close关闭弹窗
@@ -31,6 +31,13 @@
   measureSendBackList: [],
 })
 
+// 分发接口初始化
+const getInfoNext = (measureContent: string) => {
+  init({ measureContent, orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    console.log(res)
+  })
+}
+
 // 获取分发详情
 const getInfo = () => {
   // 获取任务详情
@@ -41,8 +48,10 @@
     sampleDetail.value.certifications = res.data.certifications
     sampleDetail.value.measureProcessList = res.data.measureProcessList
     sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+    getInfoNext(res.data.measureContent)
   })
 }
+
 // 初始化弹窗
 const initDialog = (orderid: string, sampleid: string) => {
   dialogVisible.value = true
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index c7ed51c..7c4a4b4 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -217,6 +217,8 @@
     taskForm.value.measureContent = res.data.measureContent // 检定项目
     taskForm.value.measureProcessList = res.data.measureProcessList
     taskForm.value.measureSendBackList = res.data.measureSendBackList
+    // 改用一个接口获取
+    sampleForm.value = res.data
   })
 }
 
@@ -271,7 +273,7 @@
     orderId.value = $route.query.order as string
     // 获取分发详情
     getInfo()
-    getSampleInfo()
+    // getSampleInfo() // 取消
   }
 }
 </script>
@@ -283,9 +285,9 @@
         <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <!-- <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
-        </el-button>
+        </el-button> -->
         <el-button type="info" @click="close">
           关闭
         </el-button>
@@ -548,14 +550,14 @@
       </div>
     </detail-page>
     <detail-block title="检定流程">
-      <template #btns>
+      <!-- <template #btns>
         <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
           批量添加
         </el-button>
         <el-button type="primary" style="margin-bottom: 10px;" @click="saveProcess">
           保存
         </el-button>
-      </template>
+      </template> -->
       <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 89323a3..068de3a 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -133,6 +133,7 @@
     offset: 1,
     limit: 20,
   }
+  timeRange.value = ['', '']
   fetchData(true)
 }
 // 点击详情
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index d5093d7..f212125 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -114,8 +114,11 @@
 }
 // 获取检定记录
 const fetchMeasureRecords = function (query: { id: string; limit: number; offset: number }) {
-  query.id = dataForm.value.id
-  getOrderByCustomer(query).then((res) => {
+  const postData = {
+    sampleId: '',
+    customeId: dataForm.value.id,
+  }
+  getOrderByCustomer(postData).then((res) => {
     dataList.value.measureRecords = res.data.rows
   })
 }
@@ -275,7 +278,6 @@
     evaluationList.value = response.data
   })
 }
-getDict()
 
 const getInfo = () => {
   loading.value = true
@@ -466,10 +468,14 @@
     item.editable = false
   }
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
-}
+
+onMounted(() => {
+  // 非添加页面获取详情
+  if (pageType.value !== 'add') {
+    getInfo()
+  }
+  getDict()
+})
 </script>
 
 <template>
@@ -477,7 +483,7 @@
     <detail-page v-loading="loading" :title="`客户-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印
+          打印1
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 0c76e05..8b6b4ac 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -262,25 +262,25 @@
 }
 // 导出
 const exportExcelBtn = () => {
+  if (list.value.length === 0) {
+    ElMessage.warning('无数据可导出数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
   const selectIds: string[] = selectList.value.map((item: fixedAssetsType) => item.id)
-  if (list.value.length > 0) {
-    const params = { ...searchQuery, ids: selectIds }
-    listExportApi(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, `${props.name}.xlsx`)
-      loading.close()
-    }).catch((_) => {
-      loading.close()
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
+  const params = { ...searchQuery, ids: selectIds }
+  console.log(params)
+  listExportApi(params).then((res) => {
+    const blob = new Blob([res.data])
+    exportFile(blob, `${props.name}.xlsx`)
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index 724da6e..3a258c8 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -86,14 +86,14 @@
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { id: string; offset: number; limit: number }) {
+export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
   return request({
-    url: `/customer/contractRecords?offset=${data.offset}&limit=${data.limit}`,
+    url: '/customer/fake/interface',
     method: 'post',
     data,
   })
 }
-// 根据客户查检定记录
+//
 export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) {
   return request({
     url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 7f9431b..8bce535 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
+import type { ISearchQuery } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -29,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: Iapprove) {
+export function deleteStatus(data: { id: string | number }) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -37,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: Iapprove) {
+export function cancelStatus(data: { processInstanceId: string }) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -45,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: Iapprove) {
+export function submitStatus(data: { id: string | number; formId: string }) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 89fd82d..eb4b260 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -43,15 +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}`,
-        })
-      }
+  return new Promise((resolve, reject) => {
+    // 获取菜单字典
+    getDictByCode('measureStatus').then((response) => {
+      response.data.forEach((item: dictType) => {
+        if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+          menu.value.push({
+            name: item.name,
+            id: `${item.value}`,
+          })
+        }
+      })
+      resolve(menu.value)
     })
   })
 }
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index d5afb9d..c604d3e 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -41,15 +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}`,
-        })
-      }
+  return new Promise((resolve, reject) => {
+    // 获取菜单字典
+    getDictByCode('measureStatus').then((response) => {
+      response.data.forEach((item: dictType) => {
+        if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+          menu.value.push({
+            name: item.name,
+            id: `${item.value}`,
+          })
+          resolve(menu.value)
+        }
+      })
     })
   })
 }
@@ -275,7 +278,7 @@
     active.value = window.sessionStorage.getItem('myMeasureActive') as string
   }
   else {
-    active.value = menu.value.find(item => item.name === '待检测')!.id // 待分发
+    active.value = menu.value.find(item => item.name === '待检测')!.id // 待检测
   }
   nextTick(() => {
     fetchData(true)
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 20ecc23..6409759 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -3,7 +3,7 @@
   certificateClass: string // 证书类型
   certificateNo: string // 证书编号
   createUserId: number // 创建人id
-  printStatus: number | null
+  printStatus: number | null | string
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
   sampleNo: string // 样品编号
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index d69d275..6b6f026 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -25,7 +25,7 @@
 const listQuery = ref<ICertPrintSearch>({
   certificateNo: '', // 证书编号
   createUserId: 0,
-  printStatus: 0, // 可打印(证书可打印传0,全部传null)
+  printStatus: '', // 可打印(证书可打印传0,全部传null)
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
   sampleNo: '', // 样品编号
@@ -50,21 +50,20 @@
   getDictByCode('certificationClass').then((response) => {
     certificationClassList.value = response.data
   })
-  getDictByCode('approvalStatus').then((response) => {
-    // 审批状态字典 {1：草稿箱}
-    // response.data.forEach((item: any) => {
-    //   approvalStatusMap.value[`${item.value}`] = item.name
-    // })
 
-    // 审批状态字典 {草稿箱: 1}
-    // response.data.forEach((item: any) => {
-    //   approvalStatusReserveMap.value[item.name] = `${item.value}`
-    // })
-    // 制作右上角的菜单
-    response.data.forEach((item: dictType) => {
+  // 制作右上角的菜单
+  // eslint-disable-next-line no-async-promise-executor
+  return new Promise(async (resolve, reject) => {
+    const data1 = await getDictByCode('printStatus').then((response) => {
+      return response.data
+    })
+    const data2 = await getDictByCode('approvalStatus').then((response) => {
+      return response.data.filter((item: dictType) => item.name != '可打印')
+    })
+    const _data = [...data1, ...data2]
+    _data.forEach((item: dictType) => {
       if (item.name === '可打印' || item.name === '全部'
-      || item.name === '待审批' || item.name === '审批中'
-      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '待审批' || item.name === '已通过' || item.name === '未通过'
       ) {
         if (item.name === '可打印') {
           active.value = item.value
@@ -82,12 +81,6 @@
         }
       }
     })
-    if (window.sessionStorage.getItem('certPrintActive') != null) {
-      active.value = window.sessionStorage.getItem('certPrintActive') as string
-    }
-    else {
-      active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
-    }
   })
 }
 
@@ -117,29 +110,15 @@
 
 // 根据过滤查询条件
 function filterQuery() {
-  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
-  listQuery.value.approvalStatus = approvalStatus
-  switch (activeTitle.value) {
-    case '可打印':
-      listQuery.value.printStatus = 0
-      listQuery.value.approvalStatus = ''
-      break
-    case '全部':
-      listQuery.value.printStatus = 2
-      listQuery.value.approvalStatus = ''
-      break
-    case '待审批':
-      listQuery.value.printStatus = 2
-      break
-    case '审批中':
-      listQuery.value.printStatus = 2
-      break
-    case '已通过':
-      listQuery.value.printStatus = 2
-      break
-    case '未通过':
-      listQuery.value.printStatus = 2
-      break
+  const StatuFlag = activeTitle.value == '可打印'
+  const value = menu.value.find(item => item.name === activeTitle.value)!.id
+  if (StatuFlag) {
+    listQuery.value.printStatus = value
+    listQuery.value.approvalStatus = ''
+  }
+  else {
+    listQuery.value.printStatus = ''
+    listQuery.value.approvalStatus = value == '0' ? 'null' : value
   }
 }
 
@@ -170,18 +149,17 @@
 }
 // 点击重置
 const clearList = () => {
-  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
     certificateNo: '', // 证书编号
     createUserId: 0,
-    printStatus: 0, // 可打印(证书可打印传0,全部传null)
+    printStatus: '', // 可打印(证书可打印传0,全部传null)
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
-    approvalStatus: active.value, // 审批状态-审批查询用
+    approvalStatus: '', // 审批状态-审批查询用
     orderId: '', // 委托书id
     reason: '', // 操作原因
     sampleId: '', // 样品id
@@ -190,10 +168,7 @@
     offset: 1,
     limit: 20,
   }
-  listQuery.value.approvalStatus = approvalStatus
-  if (activeTitle.value === '可打印' || activeTitle.value === '全部') {
-    listQuery.value.approvalStatus = ''
-  }
+  filterQuery()
   fetchData(true)
 }
 // 点击详情
@@ -206,9 +181,11 @@
 const handleDistribute = (row: ICerPrintList, status: string) => {
   if (status === 'agree') {
     approvalDialogPart.value.initDialog('agree', row.taskId)
+    fetchData(true)
   }
   else {
     approvalDialogPart.value.initDialog('refuse', row.taskId, row.id)
+    fetchData(true)
   }
 }
 
@@ -253,7 +230,6 @@
 
 // 打印
 const bindLabel = (row: ICerPrintList) => {
-  console.log(row)
   // 判断状态第一次可以直接打印,之后的打印需要审批
   if (row.printNum == 0) {
     ElMessageBox.confirm(
@@ -332,9 +308,13 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  setTimeout(() => {
-    fetchData(true)
-  }, 500)
+  if (window.sessionStorage.getItem('certPrintActive') != null) {
+    active.value = window.sessionStorage.getItem('certPrintActive') as string
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
+  }
+  fetchData(true)
 })
 </script>
 
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index 74b9dad..6474dce 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -2,7 +2,7 @@
 import processConfig from './processConfig.vue'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
-import { getTaskDetail } from '@/api/business/schedule/task'
+import { getTaskDetail, init } from '@/api/business/schedule/task'
 // 任务分发弹窗
 
 // 自定义方法：close关闭弹窗
@@ -31,6 +31,13 @@
   measureSendBackList: [],
 })
 
+// 分发接口初始化
+const getInfoNext = (measureContent: string) => {
+  init({ measureContent, orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    console.log(res)
+  })
+}
+
 // 获取分发详情
 const getInfo = () => {
   // 获取任务详情
@@ -41,8 +48,10 @@
     sampleDetail.value.certifications = res.data.certifications
     sampleDetail.value.measureProcessList = res.data.measureProcessList
     sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+    getInfoNext(res.data.measureContent)
   })
 }
+
 // 初始化弹窗
 const initDialog = (orderid: string, sampleid: string) => {
   dialogVisible.value = true
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index c7ed51c..7c4a4b4 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -217,6 +217,8 @@
     taskForm.value.measureContent = res.data.measureContent // 检定项目
     taskForm.value.measureProcessList = res.data.measureProcessList
     taskForm.value.measureSendBackList = res.data.measureSendBackList
+    // 改用一个接口获取
+    sampleForm.value = res.data
   })
 }
 
@@ -271,7 +273,7 @@
     orderId.value = $route.query.order as string
     // 获取分发详情
     getInfo()
-    getSampleInfo()
+    // getSampleInfo() // 取消
   }
 }
 </script>
@@ -283,9 +285,9 @@
         <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <!-- <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
-        </el-button>
+        </el-button> -->
         <el-button type="info" @click="close">
           关闭
         </el-button>
@@ -548,14 +550,14 @@
       </div>
     </detail-page>
     <detail-block title="检定流程">
-      <template #btns>
+      <!-- <template #btns>
         <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
           批量添加
         </el-button>
         <el-button type="primary" style="margin-bottom: 10px;" @click="saveProcess">
           保存
         </el-button>
-      </template>
+      </template> -->
       <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 89323a3..068de3a 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -133,6 +133,7 @@
     offset: 1,
     limit: 20,
   }
+  timeRange.value = ['', '']
   fetchData(true)
 }
 // 点击详情
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index d5093d7..f212125 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -114,8 +114,11 @@
 }
 // 获取检定记录
 const fetchMeasureRecords = function (query: { id: string; limit: number; offset: number }) {
-  query.id = dataForm.value.id
-  getOrderByCustomer(query).then((res) => {
+  const postData = {
+    sampleId: '',
+    customeId: dataForm.value.id,
+  }
+  getOrderByCustomer(postData).then((res) => {
     dataList.value.measureRecords = res.data.rows
   })
 }
@@ -275,7 +278,6 @@
     evaluationList.value = response.data
   })
 }
-getDict()
 
 const getInfo = () => {
   loading.value = true
@@ -466,10 +468,14 @@
     item.editable = false
   }
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
-}
+
+onMounted(() => {
+  // 非添加页面获取详情
+  if (pageType.value !== 'add') {
+    getInfo()
+  }
+  getDict()
+})
 </script>
 
 <template>
@@ -477,7 +483,7 @@
     <detail-page v-loading="loading" :title="`客户-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印
+          打印1
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 0c76e05..8b6b4ac 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -262,25 +262,25 @@
 }
 // 导出
 const exportExcelBtn = () => {
+  if (list.value.length === 0) {
+    ElMessage.warning('无数据可导出数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
   const selectIds: string[] = selectList.value.map((item: fixedAssetsType) => item.id)
-  if (list.value.length > 0) {
-    const params = { ...searchQuery, ids: selectIds }
-    listExportApi(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, `${props.name}.xlsx`)
-      loading.close()
-    }).catch((_) => {
-      loading.close()
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
+  const params = { ...searchQuery, ids: selectIds }
+  console.log(params)
+  listExportApi(params).then((res) => {
+    const blob = new Blob([res.data])
+    exportFile(blob, `${props.name}.xlsx`)
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 9696d06..4ee4d44 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -570,9 +570,7 @@
                   size="small"
                   type="primary"
                   link
-                  :disabled="
-                    (row.approvalStatus !== '审批中')
-                      || row.decisionItem === 3"
+                  :disabled="row.decisionItem === 3"
                   @click="agree(row)"
                 >
                   同意
@@ -582,10 +580,7 @@
                   size="small"
                   type="primary"
                   link
-                  :disabled="
-                    (row.approvalStatus !== '待审批'
-                      && row.approvalStatus !== '审批中')
-                      || row.decisionItem === 3"
+                  :disabled="row.decisionItem === 3"
                   @click="reject(row)"
                 >
                   驳回
@@ -595,10 +590,7 @@
                   size="small"
                   type="danger"
                   link
-                  :disabled="
-                    (row.approvalStatus !== '待审批'
-                      && row.approvalStatus !== '审批中')
-                      || row.decisionItem === 1 || row.decisionItem === 2"
+                  :disabled="row.decisionItem === 1 || row.decisionItem === 2"
                   @click="refuse(row)"
                 >
                   拒绝

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index 724da6e..3a258c8 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -86,14 +86,14 @@
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { id: string; offset: number; limit: number }) {
+export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
   return request({
-    url: `/customer/contractRecords?offset=${data.offset}&limit=${data.limit}`,
+    url: '/customer/fake/interface',
     method: 'post',
     data,
   })
 }
-// 根据客户查检定记录
+//
 export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) {
   return request({
     url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 7f9431b..8bce535 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
+import type { ISearchQuery } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -29,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: Iapprove) {
+export function deleteStatus(data: { id: string | number }) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -37,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: Iapprove) {
+export function cancelStatus(data: { processInstanceId: string }) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -45,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: Iapprove) {
+export function submitStatus(data: { id: string | number; formId: string }) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 89fd82d..eb4b260 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -43,15 +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}`,
-        })
-      }
+  return new Promise((resolve, reject) => {
+    // 获取菜单字典
+    getDictByCode('measureStatus').then((response) => {
+      response.data.forEach((item: dictType) => {
+        if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+          menu.value.push({
+            name: item.name,
+            id: `${item.value}`,
+          })
+        }
+      })
+      resolve(menu.value)
     })
   })
 }
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index d5afb9d..c604d3e 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -41,15 +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}`,
-        })
-      }
+  return new Promise((resolve, reject) => {
+    // 获取菜单字典
+    getDictByCode('measureStatus').then((response) => {
+      response.data.forEach((item: dictType) => {
+        if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+          menu.value.push({
+            name: item.name,
+            id: `${item.value}`,
+          })
+          resolve(menu.value)
+        }
+      })
     })
   })
 }
@@ -275,7 +278,7 @@
     active.value = window.sessionStorage.getItem('myMeasureActive') as string
   }
   else {
-    active.value = menu.value.find(item => item.name === '待检测')!.id // 待分发
+    active.value = menu.value.find(item => item.name === '待检测')!.id // 待检测
   }
   nextTick(() => {
     fetchData(true)
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 20ecc23..6409759 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -3,7 +3,7 @@
   certificateClass: string // 证书类型
   certificateNo: string // 证书编号
   createUserId: number // 创建人id
-  printStatus: number | null
+  printStatus: number | null | string
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
   sampleNo: string // 样品编号
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index d69d275..6b6f026 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -25,7 +25,7 @@
 const listQuery = ref<ICertPrintSearch>({
   certificateNo: '', // 证书编号
   createUserId: 0,
-  printStatus: 0, // 可打印(证书可打印传0,全部传null)
+  printStatus: '', // 可打印(证书可打印传0,全部传null)
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
   sampleNo: '', // 样品编号
@@ -50,21 +50,20 @@
   getDictByCode('certificationClass').then((response) => {
     certificationClassList.value = response.data
   })
-  getDictByCode('approvalStatus').then((response) => {
-    // 审批状态字典 {1：草稿箱}
-    // response.data.forEach((item: any) => {
-    //   approvalStatusMap.value[`${item.value}`] = item.name
-    // })
 
-    // 审批状态字典 {草稿箱: 1}
-    // response.data.forEach((item: any) => {
-    //   approvalStatusReserveMap.value[item.name] = `${item.value}`
-    // })
-    // 制作右上角的菜单
-    response.data.forEach((item: dictType) => {
+  // 制作右上角的菜单
+  // eslint-disable-next-line no-async-promise-executor
+  return new Promise(async (resolve, reject) => {
+    const data1 = await getDictByCode('printStatus').then((response) => {
+      return response.data
+    })
+    const data2 = await getDictByCode('approvalStatus').then((response) => {
+      return response.data.filter((item: dictType) => item.name != '可打印')
+    })
+    const _data = [...data1, ...data2]
+    _data.forEach((item: dictType) => {
       if (item.name === '可打印' || item.name === '全部'
-      || item.name === '待审批' || item.name === '审批中'
-      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '待审批' || item.name === '已通过' || item.name === '未通过'
       ) {
         if (item.name === '可打印') {
           active.value = item.value
@@ -82,12 +81,6 @@
         }
       }
     })
-    if (window.sessionStorage.getItem('certPrintActive') != null) {
-      active.value = window.sessionStorage.getItem('certPrintActive') as string
-    }
-    else {
-      active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
-    }
   })
 }
 
@@ -117,29 +110,15 @@
 
 // 根据过滤查询条件
 function filterQuery() {
-  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
-  listQuery.value.approvalStatus = approvalStatus
-  switch (activeTitle.value) {
-    case '可打印':
-      listQuery.value.printStatus = 0
-      listQuery.value.approvalStatus = ''
-      break
-    case '全部':
-      listQuery.value.printStatus = 2
-      listQuery.value.approvalStatus = ''
-      break
-    case '待审批':
-      listQuery.value.printStatus = 2
-      break
-    case '审批中':
-      listQuery.value.printStatus = 2
-      break
-    case '已通过':
-      listQuery.value.printStatus = 2
-      break
-    case '未通过':
-      listQuery.value.printStatus = 2
-      break
+  const StatuFlag = activeTitle.value == '可打印'
+  const value = menu.value.find(item => item.name === activeTitle.value)!.id
+  if (StatuFlag) {
+    listQuery.value.printStatus = value
+    listQuery.value.approvalStatus = ''
+  }
+  else {
+    listQuery.value.printStatus = ''
+    listQuery.value.approvalStatus = value == '0' ? 'null' : value
   }
 }
 
@@ -170,18 +149,17 @@
 }
 // 点击重置
 const clearList = () => {
-  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
     certificateNo: '', // 证书编号
     createUserId: 0,
-    printStatus: 0, // 可打印(证书可打印传0,全部传null)
+    printStatus: '', // 可打印(证书可打印传0,全部传null)
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
-    approvalStatus: active.value, // 审批状态-审批查询用
+    approvalStatus: '', // 审批状态-审批查询用
     orderId: '', // 委托书id
     reason: '', // 操作原因
     sampleId: '', // 样品id
@@ -190,10 +168,7 @@
     offset: 1,
     limit: 20,
   }
-  listQuery.value.approvalStatus = approvalStatus
-  if (activeTitle.value === '可打印' || activeTitle.value === '全部') {
-    listQuery.value.approvalStatus = ''
-  }
+  filterQuery()
   fetchData(true)
 }
 // 点击详情
@@ -206,9 +181,11 @@
 const handleDistribute = (row: ICerPrintList, status: string) => {
   if (status === 'agree') {
     approvalDialogPart.value.initDialog('agree', row.taskId)
+    fetchData(true)
   }
   else {
     approvalDialogPart.value.initDialog('refuse', row.taskId, row.id)
+    fetchData(true)
   }
 }
 
@@ -253,7 +230,6 @@
 
 // 打印
 const bindLabel = (row: ICerPrintList) => {
-  console.log(row)
   // 判断状态第一次可以直接打印,之后的打印需要审批
   if (row.printNum == 0) {
     ElMessageBox.confirm(
@@ -332,9 +308,13 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  setTimeout(() => {
-    fetchData(true)
-  }, 500)
+  if (window.sessionStorage.getItem('certPrintActive') != null) {
+    active.value = window.sessionStorage.getItem('certPrintActive') as string
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
+  }
+  fetchData(true)
 })
 </script>
 
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index 74b9dad..6474dce 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -2,7 +2,7 @@
 import processConfig from './processConfig.vue'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
-import { getTaskDetail } from '@/api/business/schedule/task'
+import { getTaskDetail, init } from '@/api/business/schedule/task'
 // 任务分发弹窗
 
 // 自定义方法：close关闭弹窗
@@ -31,6 +31,13 @@
   measureSendBackList: [],
 })
 
+// 分发接口初始化
+const getInfoNext = (measureContent: string) => {
+  init({ measureContent, orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    console.log(res)
+  })
+}
+
 // 获取分发详情
 const getInfo = () => {
   // 获取任务详情
@@ -41,8 +48,10 @@
     sampleDetail.value.certifications = res.data.certifications
     sampleDetail.value.measureProcessList = res.data.measureProcessList
     sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+    getInfoNext(res.data.measureContent)
   })
 }
+
 // 初始化弹窗
 const initDialog = (orderid: string, sampleid: string) => {
   dialogVisible.value = true
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index c7ed51c..7c4a4b4 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -217,6 +217,8 @@
     taskForm.value.measureContent = res.data.measureContent // 检定项目
     taskForm.value.measureProcessList = res.data.measureProcessList
     taskForm.value.measureSendBackList = res.data.measureSendBackList
+    // 改用一个接口获取
+    sampleForm.value = res.data
   })
 }
 
@@ -271,7 +273,7 @@
     orderId.value = $route.query.order as string
     // 获取分发详情
     getInfo()
-    getSampleInfo()
+    // getSampleInfo() // 取消
   }
 }
 </script>
@@ -283,9 +285,9 @@
         <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <!-- <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
-        </el-button>
+        </el-button> -->
         <el-button type="info" @click="close">
           关闭
         </el-button>
@@ -548,14 +550,14 @@
       </div>
     </detail-page>
     <detail-block title="检定流程">
-      <template #btns>
+      <!-- <template #btns>
         <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
           批量添加
         </el-button>
         <el-button type="primary" style="margin-bottom: 10px;" @click="saveProcess">
           保存
         </el-button>
-      </template>
+      </template> -->
       <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 89323a3..068de3a 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -133,6 +133,7 @@
     offset: 1,
     limit: 20,
   }
+  timeRange.value = ['', '']
   fetchData(true)
 }
 // 点击详情
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index d5093d7..f212125 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -114,8 +114,11 @@
 }
 // 获取检定记录
 const fetchMeasureRecords = function (query: { id: string; limit: number; offset: number }) {
-  query.id = dataForm.value.id
-  getOrderByCustomer(query).then((res) => {
+  const postData = {
+    sampleId: '',
+    customeId: dataForm.value.id,
+  }
+  getOrderByCustomer(postData).then((res) => {
     dataList.value.measureRecords = res.data.rows
   })
 }
@@ -275,7 +278,6 @@
     evaluationList.value = response.data
   })
 }
-getDict()
 
 const getInfo = () => {
   loading.value = true
@@ -466,10 +468,14 @@
     item.editable = false
   }
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
-}
+
+onMounted(() => {
+  // 非添加页面获取详情
+  if (pageType.value !== 'add') {
+    getInfo()
+  }
+  getDict()
+})
 </script>
 
 <template>
@@ -477,7 +483,7 @@
     <detail-page v-loading="loading" :title="`客户-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印
+          打印1
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 0c76e05..8b6b4ac 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -262,25 +262,25 @@
 }
 // 导出
 const exportExcelBtn = () => {
+  if (list.value.length === 0) {
+    ElMessage.warning('无数据可导出数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
   const selectIds: string[] = selectList.value.map((item: fixedAssetsType) => item.id)
-  if (list.value.length > 0) {
-    const params = { ...searchQuery, ids: selectIds }
-    listExportApi(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, `${props.name}.xlsx`)
-      loading.close()
-    }).catch((_) => {
-      loading.close()
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
+  const params = { ...searchQuery, ids: selectIds }
+  console.log(params)
+  listExportApi(params).then((res) => {
+    const blob = new Blob([res.data])
+    exportFile(blob, `${props.name}.xlsx`)
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 9696d06..4ee4d44 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -570,9 +570,7 @@
                   size="small"
                   type="primary"
                   link
-                  :disabled="
-                    (row.approvalStatus !== '审批中')
-                      || row.decisionItem === 3"
+                  :disabled="row.decisionItem === 3"
                   @click="agree(row)"
                 >
                   同意
@@ -582,10 +580,7 @@
                   size="small"
                   type="primary"
                   link
-                  :disabled="
-                    (row.approvalStatus !== '待审批'
-                      && row.approvalStatus !== '审批中')
-                      || row.decisionItem === 3"
+                  :disabled="row.decisionItem === 3"
                   @click="reject(row)"
                 >
                   驳回
@@ -595,10 +590,7 @@
                   size="small"
                   type="danger"
                   link
-                  :disabled="
-                    (row.approvalStatus !== '待审批'
-                      && row.approvalStatus !== '审批中')
-                      || row.decisionItem === 1 || row.decisionItem === 2"
+                  :disabled="row.decisionItem === 1 || row.decisionItem === 2"
                   @click="refuse(row)"
                 >
                   拒绝
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 8dc2bad..f58da25 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -56,7 +56,7 @@
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '类别', value: 'fileType', align: 'center' },
-  { text: '创建人', value: 'create', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center' },
 ]) // 表格
@@ -219,6 +219,10 @@
   searchQuery.fileNo = ''
   searchQuery.fileName = ''
   searchQuery.fileCode = ''
+  searchQuery.fileType = ''
+  searchQuery.createTime = ''
+  searchQuery.createUser = ''
+
   getList()
 }
 // 表格被选中的行

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index 724da6e..3a258c8 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -86,14 +86,14 @@
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { id: string; offset: number; limit: number }) {
+export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
   return request({
-    url: `/customer/contractRecords?offset=${data.offset}&limit=${data.limit}`,
+    url: '/customer/fake/interface',
     method: 'post',
     data,
   })
 }
-// 根据客户查检定记录
+//
 export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) {
   return request({
     url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 7f9431b..8bce535 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
+import type { ISearchQuery } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -29,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: Iapprove) {
+export function deleteStatus(data: { id: string | number }) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -37,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: Iapprove) {
+export function cancelStatus(data: { processInstanceId: string }) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -45,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: Iapprove) {
+export function submitStatus(data: { id: string | number; formId: string }) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 89fd82d..eb4b260 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -43,15 +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}`,
-        })
-      }
+  return new Promise((resolve, reject) => {
+    // 获取菜单字典
+    getDictByCode('measureStatus').then((response) => {
+      response.data.forEach((item: dictType) => {
+        if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+          menu.value.push({
+            name: item.name,
+            id: `${item.value}`,
+          })
+        }
+      })
+      resolve(menu.value)
     })
   })
 }
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index d5afb9d..c604d3e 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -41,15 +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}`,
-        })
-      }
+  return new Promise((resolve, reject) => {
+    // 获取菜单字典
+    getDictByCode('measureStatus').then((response) => {
+      response.data.forEach((item: dictType) => {
+        if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+          menu.value.push({
+            name: item.name,
+            id: `${item.value}`,
+          })
+          resolve(menu.value)
+        }
+      })
     })
   })
 }
@@ -275,7 +278,7 @@
     active.value = window.sessionStorage.getItem('myMeasureActive') as string
   }
   else {
-    active.value = menu.value.find(item => item.name === '待检测')!.id // 待分发
+    active.value = menu.value.find(item => item.name === '待检测')!.id // 待检测
   }
   nextTick(() => {
     fetchData(true)
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 20ecc23..6409759 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -3,7 +3,7 @@
   certificateClass: string // 证书类型
   certificateNo: string // 证书编号
   createUserId: number // 创建人id
-  printStatus: number | null
+  printStatus: number | null | string
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
   sampleNo: string // 样品编号
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index d69d275..6b6f026 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -25,7 +25,7 @@
 const listQuery = ref<ICertPrintSearch>({
   certificateNo: '', // 证书编号
   createUserId: 0,
-  printStatus: 0, // 可打印(证书可打印传0,全部传null)
+  printStatus: '', // 可打印(证书可打印传0,全部传null)
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
   sampleNo: '', // 样品编号
@@ -50,21 +50,20 @@
   getDictByCode('certificationClass').then((response) => {
     certificationClassList.value = response.data
   })
-  getDictByCode('approvalStatus').then((response) => {
-    // 审批状态字典 {1：草稿箱}
-    // response.data.forEach((item: any) => {
-    //   approvalStatusMap.value[`${item.value}`] = item.name
-    // })
 
-    // 审批状态字典 {草稿箱: 1}
-    // response.data.forEach((item: any) => {
-    //   approvalStatusReserveMap.value[item.name] = `${item.value}`
-    // })
-    // 制作右上角的菜单
-    response.data.forEach((item: dictType) => {
+  // 制作右上角的菜单
+  // eslint-disable-next-line no-async-promise-executor
+  return new Promise(async (resolve, reject) => {
+    const data1 = await getDictByCode('printStatus').then((response) => {
+      return response.data
+    })
+    const data2 = await getDictByCode('approvalStatus').then((response) => {
+      return response.data.filter((item: dictType) => item.name != '可打印')
+    })
+    const _data = [...data1, ...data2]
+    _data.forEach((item: dictType) => {
       if (item.name === '可打印' || item.name === '全部'
-      || item.name === '待审批' || item.name === '审批中'
-      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '待审批' || item.name === '已通过' || item.name === '未通过'
       ) {
         if (item.name === '可打印') {
           active.value = item.value
@@ -82,12 +81,6 @@
         }
       }
     })
-    if (window.sessionStorage.getItem('certPrintActive') != null) {
-      active.value = window.sessionStorage.getItem('certPrintActive') as string
-    }
-    else {
-      active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
-    }
   })
 }
 
@@ -117,29 +110,15 @@
 
 // 根据过滤查询条件
 function filterQuery() {
-  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
-  listQuery.value.approvalStatus = approvalStatus
-  switch (activeTitle.value) {
-    case '可打印':
-      listQuery.value.printStatus = 0
-      listQuery.value.approvalStatus = ''
-      break
-    case '全部':
-      listQuery.value.printStatus = 2
-      listQuery.value.approvalStatus = ''
-      break
-    case '待审批':
-      listQuery.value.printStatus = 2
-      break
-    case '审批中':
-      listQuery.value.printStatus = 2
-      break
-    case '已通过':
-      listQuery.value.printStatus = 2
-      break
-    case '未通过':
-      listQuery.value.printStatus = 2
-      break
+  const StatuFlag = activeTitle.value == '可打印'
+  const value = menu.value.find(item => item.name === activeTitle.value)!.id
+  if (StatuFlag) {
+    listQuery.value.printStatus = value
+    listQuery.value.approvalStatus = ''
+  }
+  else {
+    listQuery.value.printStatus = ''
+    listQuery.value.approvalStatus = value == '0' ? 'null' : value
   }
 }
 
@@ -170,18 +149,17 @@
 }
 // 点击重置
 const clearList = () => {
-  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
     certificateNo: '', // 证书编号
     createUserId: 0,
-    printStatus: 0, // 可打印(证书可打印传0,全部传null)
+    printStatus: '', // 可打印(证书可打印传0,全部传null)
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
-    approvalStatus: active.value, // 审批状态-审批查询用
+    approvalStatus: '', // 审批状态-审批查询用
     orderId: '', // 委托书id
     reason: '', // 操作原因
     sampleId: '', // 样品id
@@ -190,10 +168,7 @@
     offset: 1,
     limit: 20,
   }
-  listQuery.value.approvalStatus = approvalStatus
-  if (activeTitle.value === '可打印' || activeTitle.value === '全部') {
-    listQuery.value.approvalStatus = ''
-  }
+  filterQuery()
   fetchData(true)
 }
 // 点击详情
@@ -206,9 +181,11 @@
 const handleDistribute = (row: ICerPrintList, status: string) => {
   if (status === 'agree') {
     approvalDialogPart.value.initDialog('agree', row.taskId)
+    fetchData(true)
   }
   else {
     approvalDialogPart.value.initDialog('refuse', row.taskId, row.id)
+    fetchData(true)
   }
 }
 
@@ -253,7 +230,6 @@
 
 // 打印
 const bindLabel = (row: ICerPrintList) => {
-  console.log(row)
   // 判断状态第一次可以直接打印,之后的打印需要审批
   if (row.printNum == 0) {
     ElMessageBox.confirm(
@@ -332,9 +308,13 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  setTimeout(() => {
-    fetchData(true)
-  }, 500)
+  if (window.sessionStorage.getItem('certPrintActive') != null) {
+    active.value = window.sessionStorage.getItem('certPrintActive') as string
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
+  }
+  fetchData(true)
 })
 </script>
 
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index 74b9dad..6474dce 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -2,7 +2,7 @@
 import processConfig from './processConfig.vue'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
-import { getTaskDetail } from '@/api/business/schedule/task'
+import { getTaskDetail, init } from '@/api/business/schedule/task'
 // 任务分发弹窗
 
 // 自定义方法：close关闭弹窗
@@ -31,6 +31,13 @@
   measureSendBackList: [],
 })
 
+// 分发接口初始化
+const getInfoNext = (measureContent: string) => {
+  init({ measureContent, orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    console.log(res)
+  })
+}
+
 // 获取分发详情
 const getInfo = () => {
   // 获取任务详情
@@ -41,8 +48,10 @@
     sampleDetail.value.certifications = res.data.certifications
     sampleDetail.value.measureProcessList = res.data.measureProcessList
     sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+    getInfoNext(res.data.measureContent)
   })
 }
+
 // 初始化弹窗
 const initDialog = (orderid: string, sampleid: string) => {
   dialogVisible.value = true
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index c7ed51c..7c4a4b4 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -217,6 +217,8 @@
     taskForm.value.measureContent = res.data.measureContent // 检定项目
     taskForm.value.measureProcessList = res.data.measureProcessList
     taskForm.value.measureSendBackList = res.data.measureSendBackList
+    // 改用一个接口获取
+    sampleForm.value = res.data
   })
 }
 
@@ -271,7 +273,7 @@
     orderId.value = $route.query.order as string
     // 获取分发详情
     getInfo()
-    getSampleInfo()
+    // getSampleInfo() // 取消
   }
 }
 </script>
@@ -283,9 +285,9 @@
         <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <!-- <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
-        </el-button>
+        </el-button> -->
         <el-button type="info" @click="close">
           关闭
         </el-button>
@@ -548,14 +550,14 @@
       </div>
     </detail-page>
     <detail-block title="检定流程">
-      <template #btns>
+      <!-- <template #btns>
         <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
           批量添加
         </el-button>
         <el-button type="primary" style="margin-bottom: 10px;" @click="saveProcess">
           保存
         </el-button>
-      </template>
+      </template> -->
       <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 89323a3..068de3a 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -133,6 +133,7 @@
     offset: 1,
     limit: 20,
   }
+  timeRange.value = ['', '']
   fetchData(true)
 }
 // 点击详情
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index d5093d7..f212125 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -114,8 +114,11 @@
 }
 // 获取检定记录
 const fetchMeasureRecords = function (query: { id: string; limit: number; offset: number }) {
-  query.id = dataForm.value.id
-  getOrderByCustomer(query).then((res) => {
+  const postData = {
+    sampleId: '',
+    customeId: dataForm.value.id,
+  }
+  getOrderByCustomer(postData).then((res) => {
     dataList.value.measureRecords = res.data.rows
   })
 }
@@ -275,7 +278,6 @@
     evaluationList.value = response.data
   })
 }
-getDict()
 
 const getInfo = () => {
   loading.value = true
@@ -466,10 +468,14 @@
     item.editable = false
   }
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
-}
+
+onMounted(() => {
+  // 非添加页面获取详情
+  if (pageType.value !== 'add') {
+    getInfo()
+  }
+  getDict()
+})
 </script>
 
 <template>
@@ -477,7 +483,7 @@
     <detail-page v-loading="loading" :title="`客户-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印
+          打印1
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 0c76e05..8b6b4ac 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -262,25 +262,25 @@
 }
 // 导出
 const exportExcelBtn = () => {
+  if (list.value.length === 0) {
+    ElMessage.warning('无数据可导出数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
   const selectIds: string[] = selectList.value.map((item: fixedAssetsType) => item.id)
-  if (list.value.length > 0) {
-    const params = { ...searchQuery, ids: selectIds }
-    listExportApi(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, `${props.name}.xlsx`)
-      loading.close()
-    }).catch((_) => {
-      loading.close()
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
+  const params = { ...searchQuery, ids: selectIds }
+  console.log(params)
+  listExportApi(params).then((res) => {
+    const blob = new Blob([res.data])
+    exportFile(blob, `${props.name}.xlsx`)
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 9696d06..4ee4d44 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -570,9 +570,7 @@
                   size="small"
                   type="primary"
                   link
-                  :disabled="
-                    (row.approvalStatus !== '审批中')
-                      || row.decisionItem === 3"
+                  :disabled="row.decisionItem === 3"
                   @click="agree(row)"
                 >
                   同意
@@ -582,10 +580,7 @@
                   size="small"
                   type="primary"
                   link
-                  :disabled="
-                    (row.approvalStatus !== '待审批'
-                      && row.approvalStatus !== '审批中')
-                      || row.decisionItem === 3"
+                  :disabled="row.decisionItem === 3"
                   @click="reject(row)"
                 >
                   驳回
@@ -595,10 +590,7 @@
                   size="small"
                   type="danger"
                   link
-                  :disabled="
-                    (row.approvalStatus !== '待审批'
-                      && row.approvalStatus !== '审批中')
-                      || row.decisionItem === 1 || row.decisionItem === 2"
+                  :disabled="row.decisionItem === 1 || row.decisionItem === 2"
                   @click="refuse(row)"
                 >
                   拒绝
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 8dc2bad..f58da25 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -56,7 +56,7 @@
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '类别', value: 'fileType', align: 'center' },
-  { text: '创建人', value: 'create', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center' },
 ]) // 表格
@@ -219,6 +219,10 @@
   searchQuery.fileNo = ''
   searchQuery.fileName = ''
   searchQuery.fileCode = ''
+  searchQuery.fileType = ''
+  searchQuery.createTime = ''
+  searchQuery.createUser = ''
+
   getList()
 }
 // 表格被选中的行
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 9d75cff..e19a555 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -49,7 +49,7 @@
   getStaffList({
     staffNo: '', // 人员编号
     name: '', // 姓名
-    deptId: '', // 所在部门
+    deptId: ruleForm.value.deptId, // 所属科室, // 所在部门
     limit: 999999,
     offset: 1,
   }).then((res) => {

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index 724da6e..3a258c8 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -86,14 +86,14 @@
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { id: string; offset: number; limit: number }) {
+export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
   return request({
-    url: `/customer/contractRecords?offset=${data.offset}&limit=${data.limit}`,
+    url: '/customer/fake/interface',
     method: 'post',
     data,
   })
 }
-// 根据客户查检定记录
+//
 export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) {
   return request({
     url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 7f9431b..8bce535 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
+import type { ISearchQuery } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -29,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: Iapprove) {
+export function deleteStatus(data: { id: string | number }) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -37,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: Iapprove) {
+export function cancelStatus(data: { processInstanceId: string }) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -45,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: Iapprove) {
+export function submitStatus(data: { id: string | number; formId: string }) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 89fd82d..eb4b260 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -43,15 +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}`,
-        })
-      }
+  return new Promise((resolve, reject) => {
+    // 获取菜单字典
+    getDictByCode('measureStatus').then((response) => {
+      response.data.forEach((item: dictType) => {
+        if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+          menu.value.push({
+            name: item.name,
+            id: `${item.value}`,
+          })
+        }
+      })
+      resolve(menu.value)
     })
   })
 }
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index d5afb9d..c604d3e 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -41,15 +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}`,
-        })
-      }
+  return new Promise((resolve, reject) => {
+    // 获取菜单字典
+    getDictByCode('measureStatus').then((response) => {
+      response.data.forEach((item: dictType) => {
+        if (['待检测', '检测中', '检测完成'].includes(item.name)) {
+          menu.value.push({
+            name: item.name,
+            id: `${item.value}`,
+          })
+          resolve(menu.value)
+        }
+      })
     })
   })
 }
@@ -275,7 +278,7 @@
     active.value = window.sessionStorage.getItem('myMeasureActive') as string
   }
   else {
-    active.value = menu.value.find(item => item.name === '待检测')!.id // 待分发
+    active.value = menu.value.find(item => item.name === '待检测')!.id // 待检测
   }
   nextTick(() => {
     fetchData(true)
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 20ecc23..6409759 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -3,7 +3,7 @@
   certificateClass: string // 证书类型
   certificateNo: string // 证书编号
   createUserId: number // 创建人id
-  printStatus: number | null
+  printStatus: number | null | string
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
   sampleNo: string // 样品编号
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index d69d275..6b6f026 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -25,7 +25,7 @@
 const listQuery = ref<ICertPrintSearch>({
   certificateNo: '', // 证书编号
   createUserId: 0,
-  printStatus: 0, // 可打印(证书可打印传0,全部传null)
+  printStatus: '', // 可打印(证书可打印传0,全部传null)
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
   sampleNo: '', // 样品编号
@@ -50,21 +50,20 @@
   getDictByCode('certificationClass').then((response) => {
     certificationClassList.value = response.data
   })
-  getDictByCode('approvalStatus').then((response) => {
-    // 审批状态字典 {1：草稿箱}
-    // response.data.forEach((item: any) => {
-    //   approvalStatusMap.value[`${item.value}`] = item.name
-    // })
 
-    // 审批状态字典 {草稿箱: 1}
-    // response.data.forEach((item: any) => {
-    //   approvalStatusReserveMap.value[item.name] = `${item.value}`
-    // })
-    // 制作右上角的菜单
-    response.data.forEach((item: dictType) => {
+  // 制作右上角的菜单
+  // eslint-disable-next-line no-async-promise-executor
+  return new Promise(async (resolve, reject) => {
+    const data1 = await getDictByCode('printStatus').then((response) => {
+      return response.data
+    })
+    const data2 = await getDictByCode('approvalStatus').then((response) => {
+      return response.data.filter((item: dictType) => item.name != '可打印')
+    })
+    const _data = [...data1, ...data2]
+    _data.forEach((item: dictType) => {
       if (item.name === '可打印' || item.name === '全部'
-      || item.name === '待审批' || item.name === '审批中'
-      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '待审批' || item.name === '已通过' || item.name === '未通过'
       ) {
         if (item.name === '可打印') {
           active.value = item.value
@@ -82,12 +81,6 @@
         }
       }
     })
-    if (window.sessionStorage.getItem('certPrintActive') != null) {
-      active.value = window.sessionStorage.getItem('certPrintActive') as string
-    }
-    else {
-      active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
-    }
   })
 }
 
@@ -117,29 +110,15 @@
 
 // 根据过滤查询条件
 function filterQuery() {
-  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
-  listQuery.value.approvalStatus = approvalStatus
-  switch (activeTitle.value) {
-    case '可打印':
-      listQuery.value.printStatus = 0
-      listQuery.value.approvalStatus = ''
-      break
-    case '全部':
-      listQuery.value.printStatus = 2
-      listQuery.value.approvalStatus = ''
-      break
-    case '待审批':
-      listQuery.value.printStatus = 2
-      break
-    case '审批中':
-      listQuery.value.printStatus = 2
-      break
-    case '已通过':
-      listQuery.value.printStatus = 2
-      break
-    case '未通过':
-      listQuery.value.printStatus = 2
-      break
+  const StatuFlag = activeTitle.value == '可打印'
+  const value = menu.value.find(item => item.name === activeTitle.value)!.id
+  if (StatuFlag) {
+    listQuery.value.printStatus = value
+    listQuery.value.approvalStatus = ''
+  }
+  else {
+    listQuery.value.printStatus = ''
+    listQuery.value.approvalStatus = value == '0' ? 'null' : value
   }
 }
 
@@ -170,18 +149,17 @@
 }
 // 点击重置
 const clearList = () => {
-  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
     certificateNo: '', // 证书编号
     createUserId: 0,
-    printStatus: 0, // 可打印(证书可打印传0,全部传null)
+    printStatus: '', // 可打印(证书可打印传0,全部传null)
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
-    approvalStatus: active.value, // 审批状态-审批查询用
+    approvalStatus: '', // 审批状态-审批查询用
     orderId: '', // 委托书id
     reason: '', // 操作原因
     sampleId: '', // 样品id
@@ -190,10 +168,7 @@
     offset: 1,
     limit: 20,
   }
-  listQuery.value.approvalStatus = approvalStatus
-  if (activeTitle.value === '可打印' || activeTitle.value === '全部') {
-    listQuery.value.approvalStatus = ''
-  }
+  filterQuery()
   fetchData(true)
 }
 // 点击详情
@@ -206,9 +181,11 @@
 const handleDistribute = (row: ICerPrintList, status: string) => {
   if (status === 'agree') {
     approvalDialogPart.value.initDialog('agree', row.taskId)
+    fetchData(true)
   }
   else {
     approvalDialogPart.value.initDialog('refuse', row.taskId, row.id)
+    fetchData(true)
   }
 }
 
@@ -253,7 +230,6 @@
 
 // 打印
 const bindLabel = (row: ICerPrintList) => {
-  console.log(row)
   // 判断状态第一次可以直接打印,之后的打印需要审批
   if (row.printNum == 0) {
     ElMessageBox.confirm(
@@ -332,9 +308,13 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  setTimeout(() => {
-    fetchData(true)
-  }, 500)
+  if (window.sessionStorage.getItem('certPrintActive') != null) {
+    active.value = window.sessionStorage.getItem('certPrintActive') as string
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
+  }
+  fetchData(true)
 })
 </script>
 
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index 74b9dad..6474dce 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -2,7 +2,7 @@
 import processConfig from './processConfig.vue'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
-import { getTaskDetail } from '@/api/business/schedule/task'
+import { getTaskDetail, init } from '@/api/business/schedule/task'
 // 任务分发弹窗
 
 // 自定义方法：close关闭弹窗
@@ -31,6 +31,13 @@
   measureSendBackList: [],
 })
 
+// 分发接口初始化
+const getInfoNext = (measureContent: string) => {
+  init({ measureContent, orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    console.log(res)
+  })
+}
+
 // 获取分发详情
 const getInfo = () => {
   // 获取任务详情
@@ -41,8 +48,10 @@
     sampleDetail.value.certifications = res.data.certifications
     sampleDetail.value.measureProcessList = res.data.measureProcessList
     sampleDetail.value.measureSendBackList = res.data.measureSendBackList
+    getInfoNext(res.data.measureContent)
   })
 }
+
 // 初始化弹窗
 const initDialog = (orderid: string, sampleid: string) => {
   dialogVisible.value = true
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index c7ed51c..7c4a4b4 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -217,6 +217,8 @@
     taskForm.value.measureContent = res.data.measureContent // 检定项目
     taskForm.value.measureProcessList = res.data.measureProcessList
     taskForm.value.measureSendBackList = res.data.measureSendBackList
+    // 改用一个接口获取
+    sampleForm.value = res.data
   })
 }
 
@@ -271,7 +273,7 @@
     orderId.value = $route.query.order as string
     // 获取分发详情
     getInfo()
-    getSampleInfo()
+    // getSampleInfo() // 取消
   }
 }
 </script>
@@ -283,9 +285,9 @@
         <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <!-- <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
-        </el-button>
+        </el-button> -->
         <el-button type="info" @click="close">
           关闭
         </el-button>
@@ -548,14 +550,14 @@
       </div>
     </detail-page>
     <detail-block title="检定流程">
-      <template #btns>
+      <!-- <template #btns>
         <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
           批量添加
         </el-button>
         <el-button type="primary" style="margin-bottom: 10px;" @click="saveProcess">
           保存
         </el-button>
-      </template>
+      </template> -->
       <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 89323a3..068de3a 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -133,6 +133,7 @@
     offset: 1,
     limit: 20,
   }
+  timeRange.value = ['', '']
   fetchData(true)
 }
 // 点击详情
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index d5093d7..f212125 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -114,8 +114,11 @@
 }
 // 获取检定记录
 const fetchMeasureRecords = function (query: { id: string; limit: number; offset: number }) {
-  query.id = dataForm.value.id
-  getOrderByCustomer(query).then((res) => {
+  const postData = {
+    sampleId: '',
+    customeId: dataForm.value.id,
+  }
+  getOrderByCustomer(postData).then((res) => {
     dataList.value.measureRecords = res.data.rows
   })
 }
@@ -275,7 +278,6 @@
     evaluationList.value = response.data
   })
 }
-getDict()
 
 const getInfo = () => {
   loading.value = true
@@ -466,10 +468,14 @@
     item.editable = false
   }
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
-}
+
+onMounted(() => {
+  // 非添加页面获取详情
+  if (pageType.value !== 'add') {
+    getInfo()
+  }
+  getDict()
+})
 </script>
 
 <template>
@@ -477,7 +483,7 @@
     <detail-page v-loading="loading" :title="`客户-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印
+          打印1
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 0c76e05..8b6b4ac 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -262,25 +262,25 @@
 }
 // 导出
 const exportExcelBtn = () => {
+  if (list.value.length === 0) {
+    ElMessage.warning('无数据可导出数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
   const selectIds: string[] = selectList.value.map((item: fixedAssetsType) => item.id)
-  if (list.value.length > 0) {
-    const params = { ...searchQuery, ids: selectIds }
-    listExportApi(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, `${props.name}.xlsx`)
-      loading.close()
-    }).catch((_) => {
-      loading.close()
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
+  const params = { ...searchQuery, ids: selectIds }
+  console.log(params)
+  listExportApi(params).then((res) => {
+    const blob = new Blob([res.data])
+    exportFile(blob, `${props.name}.xlsx`)
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 9696d06..4ee4d44 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -570,9 +570,7 @@
                   size="small"
                   type="primary"
                   link
-                  :disabled="
-                    (row.approvalStatus !== '审批中')
-                      || row.decisionItem === 3"
+                  :disabled="row.decisionItem === 3"
                   @click="agree(row)"
                 >
                   同意
@@ -582,10 +580,7 @@
                   size="small"
                   type="primary"
                   link
-                  :disabled="
-                    (row.approvalStatus !== '待审批'
-                      && row.approvalStatus !== '审批中')
-                      || row.decisionItem === 3"
+                  :disabled="row.decisionItem === 3"
                   @click="reject(row)"
                 >
                   驳回
@@ -595,10 +590,7 @@
                   size="small"
                   type="danger"
                   link
-                  :disabled="
-                    (row.approvalStatus !== '待审批'
-                      && row.approvalStatus !== '审批中')
-                      || row.decisionItem === 1 || row.decisionItem === 2"
+                  :disabled="row.decisionItem === 1 || row.decisionItem === 2"
                   @click="refuse(row)"
                 >
                   拒绝
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 8dc2bad..f58da25 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -56,7 +56,7 @@
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '类别', value: 'fileType', align: 'center' },
-  { text: '创建人', value: 'create', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center' },
 ]) // 表格
@@ -219,6 +219,10 @@
   searchQuery.fileNo = ''
   searchQuery.fileName = ''
   searchQuery.fileCode = ''
+  searchQuery.fileType = ''
+  searchQuery.createTime = ''
+  searchQuery.createUser = ''
+
   getList()
 }
 // 表格被选中的行
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 9d75cff..e19a555 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -49,7 +49,7 @@
   getStaffList({
     staffNo: '', // 人员编号
     name: '', // 姓名
-    deptId: '', // 所在部门
+    deptId: ruleForm.value.deptId, // 所属科室, // 所在部门
     limit: 999999,
     offset: 1,
   }).then((res) => {
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 78508ce..bd26dd9 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -89,7 +89,18 @@
   getCertificateList(searchQuery).then((res) => {
     if (res.code === 200) {
       res.data.records = res.data.records.map((item: any) => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效', validDate: item.validDate.split(' ')[0], certificateDate: item.certificateDate.split(' ')[0] }))
-      list.value = res.data.records
+      console.log(res.data.records)
+      switch (searchQuery.certificateStatus) {
+        case '正常':
+          list.value = res.data.records.filter((item: any) => item.certificateStatus === '正常')
+          break
+        case '已失效':
+          list.value = res.data.records.filter((item: any) => item.certificateStatus === '已失效')
+          break
+        default:
+          list.value = res.data.records
+          break
+      }
       total.value = Number(res.data.total)
     }
     loadingTable.value = false