diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index 4301f6f..92ad9b6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -23,6 +23,15 @@
   })
 }
 
+// 部门检测我的检测详情
+export function executiveDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/executive/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
@@ -63,7 +72,25 @@
 // 退回(待检测/检测中->退回)
 export function sendBackProcess(data: ISendBack) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/executive/sendBack',
+    method: 'post',
+    data,
+  })
+}
+
+// 收入（待检测->检测中）->收入)
+export function myExecutiveReceive(data: object) {
+  return request({
+    url: '/business/labExecutive/myExecutive/receive',
+    method: 'post',
+    data,
+  })
+}
+
+// 分配
+export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+  return request({
+    url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
     data,
   })

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index 4301f6f..92ad9b6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -23,6 +23,15 @@
   })
 }
 
+// 部门检测我的检测详情
+export function executiveDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/executive/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
@@ -63,7 +72,25 @@
 // 退回(待检测/检测中->退回)
 export function sendBackProcess(data: ISendBack) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/executive/sendBack',
+    method: 'post',
+    data,
+  })
+}
+
+// 收入（待检测->检测中）->收入)
+export function myExecutiveReceive(data: object) {
+  return request({
+    url: '/business/labExecutive/myExecutive/receive',
+    method: 'post',
+    data,
+  })
+}
+
+// 分配
+export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+  return request({
+    url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
     data,
   })
diff --git a/src/main.ts b/src/main.ts
index 695df5c..3cf24ef 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -16,13 +16,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
+import buttonPerm from '@/utils/buttonPerm'
 // 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
-
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.config.globalProperties.buttonPerm = buttonPerm
 app.use(print)
 app.use(ElementPlus)
 app.use(pinia)

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index 4301f6f..92ad9b6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -23,6 +23,15 @@
   })
 }
 
+// 部门检测我的检测详情
+export function executiveDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/executive/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
@@ -63,7 +72,25 @@
 // 退回(待检测/检测中->退回)
 export function sendBackProcess(data: ISendBack) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/executive/sendBack',
+    method: 'post',
+    data,
+  })
+}
+
+// 收入（待检测->检测中）->收入)
+export function myExecutiveReceive(data: object) {
+  return request({
+    url: '/business/labExecutive/myExecutive/receive',
+    method: 'post',
+    data,
+  })
+}
+
+// 分配
+export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+  return request({
+    url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
     data,
   })
diff --git a/src/main.ts b/src/main.ts
index 695df5c..3cf24ef 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -16,13 +16,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
+import buttonPerm from '@/utils/buttonPerm'
 // 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
-
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.config.globalProperties.buttonPerm = buttonPerm
 app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
new file mode 100644
index 0000000..205d84a
--- /dev/null
+++ b/src/utils/buttonPerm.ts
@@ -0,0 +1,66 @@
+import { hasPermission } from '@/utils/composables/permission'
+
+function error(permPath: string) {
+  if (permPath === undefined) {
+    throw new Error('Button permission url is required!!!')
+  }
+}
+
+export default {
+  agree: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  reject: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  refuse: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  edit: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && (row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消')
+    },
+  },
+  submit: {
+    if: (row: any) => {
+      row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
+    },
+  },
+  cancel: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '审批中'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '审批中'
+    },
+  },
+  delete: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
+    },
+  },
+}

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index 4301f6f..92ad9b6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -23,6 +23,15 @@
   })
 }
 
+// 部门检测我的检测详情
+export function executiveDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/executive/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
@@ -63,7 +72,25 @@
 // 退回(待检测/检测中->退回)
 export function sendBackProcess(data: ISendBack) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/executive/sendBack',
+    method: 'post',
+    data,
+  })
+}
+
+// 收入（待检测->检测中）->收入)
+export function myExecutiveReceive(data: object) {
+  return request({
+    url: '/business/labExecutive/myExecutive/receive',
+    method: 'post',
+    data,
+  })
+}
+
+// 分配
+export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+  return request({
+    url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
     data,
   })
diff --git a/src/main.ts b/src/main.ts
index 695df5c..3cf24ef 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -16,13 +16,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
+import buttonPerm from '@/utils/buttonPerm'
 // 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
-
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.config.globalProperties.buttonPerm = buttonPerm
 app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
new file mode 100644
index 0000000..205d84a
--- /dev/null
+++ b/src/utils/buttonPerm.ts
@@ -0,0 +1,66 @@
+import { hasPermission } from '@/utils/composables/permission'
+
+function error(permPath: string) {
+  if (permPath === undefined) {
+    throw new Error('Button permission url is required!!!')
+  }
+}
+
+export default {
+  agree: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  reject: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  refuse: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  edit: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && (row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消')
+    },
+  },
+  submit: {
+    if: (row: any) => {
+      row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
+    },
+  },
+  cancel: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '审批中'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '审批中'
+    },
+  },
+  delete: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
+    },
+  },
+}
diff --git a/src/utils/download.ts b/src/utils/download.ts
new file mode 100644
index 0000000..d70f539
--- /dev/null
+++ b/src/utils/download.ts
@@ -0,0 +1,149 @@
+/**
+ * 下载本地图片 href为 127.0.0.1/xxxx
+ * @param href 图片地址
+ * @param name 图片名称
+ */
+function downloadImg(href: string, name: string) {
+  const eleLink = document.createElement('a')
+  eleLink.download = name
+  eleLink.href = href
+  eleLink.click()
+  eleLink.remove()
+}
+
+/**
+ * 下载文件
+ * @param file 文件对象
+ * @param name 图片名称
+ */
+export function downloadFile(file: File, name: string) {
+  console.log(new Blob([file]), 'new Blob([file])')
+  const objectUrl = URL.createObjectURL(new Blob([file]))
+  const link = document.createElement('a')
+  link.download = name
+  link.href = objectUrl
+  link.click()
+  link.remove()
+  window.URL.revokeObjectURL(link.href)
+}
+// 各种文件类型的type
+export const fileType: { [key: string]: string } = {
+  pdf: 'application/pdf',
+  doc: 'application/doc',
+  docx: 'application/docx',
+  excel: 'application/excel',
+  ppt: 'application/vnd.ms-powerpoint',
+  dir: 'application/x-director',
+  js: 'application/x-javascript',
+  swf: 'application/x-shockwave-flash',
+  xhtml: 'application/xhtml+xml',
+  xht: 'application/xhtml+xml',
+  zip: 'application/zip',
+  mid: 'audio/midi',
+  midi: 'audio/midi',
+  mp3: 'audio/mpeg',
+  rm: 'audio/x-pn-realaudio',
+  rpm: 'audio/x-pn-realaudio-plugin',
+  wav: 'audio/x-wav',
+  bmp: 'image/bmp',
+  gif: 'image/gif',
+  jpeg: 'image/jpeg',
+  jpg: 'image/jpeg',
+  png: 'image/png',
+  css: 'text/css',
+  html: 'text/html',
+  htm: 'text/html',
+  txt: 'text/plain',
+  xsl: 'text/xml',
+  xml: 'text/xml',
+  mpeg: 'video/mpeg',
+  mpg: 'video/mpeg',
+  avi: 'video/x-msvideo',
+  movie: 'video/x-sgi-movie',
+}
+/**
+ * 将网络文件地址转化为文件对象
+ * @param url 文件地址
+ * @param fileName 文件名称
+ */
+export function getFileFromUrl(url: string, fileName: string) {
+  return new Promise((resolve, reject) => {
+    var blob = null
+    var xhr = new XMLHttpRequest()
+    xhr.open('GET', url)
+    const urlFileType = url.split('.')[url.split('.').length - 1]
+    xhr.setRequestHeader('Accept', fileType[urlFileType])
+    xhr.responseType = 'blob'
+    // 加载时处理
+    xhr.onload = () => {
+      // 获取返回结果
+      blob = xhr.response
+      const file = new File([blob], fileName, { type: fileType[urlFileType] })
+      // 返回结果
+      resolve(file)
+    }
+    xhr.onerror = (e) => {
+      reject(e)
+    }
+    // 发送
+    xhr.send()
+  })
+}
+/**
+ * 将网络地址转化为 blob地址 并下载
+ * @param url 文件地址
+ * @param fileName 文件名称
+ */
+export function urlToBlob(url: string, name: string) {
+  const xhr = new XMLHttpRequest()
+  xhr.open('get', url)
+  xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
+  xhr.onload = function () {
+    const path = URL.createObjectURL(xhr.response)
+    const link = document.createElement('a')
+    link.download = name
+    link.href = path
+    link.click()
+    link.remove()
+    window.URL.revokeObjectURL(link.href)
+  }
+  xhr.send()
+}
+
+/**
+ * 下载文件 各种文件
+ * @param url 网络文件地址
+ * @param name  文件名
+ */
+export function download(url: string, name: string) {
+  // 下载图片
+  const photo = ['jpg', 'jpeg', 'png']
+  const fileType = url.split('.')[url.split('.').length - 1]
+  console.log(fileType, 'fileType')
+  if (photo.includes(fileType)) {
+    // 图片 将服务器图片地址转化成本地地址
+    const image = new Image()
+    image.setAttribute('crossOrigin', 'anonymous')
+    image.src = url
+    image.onload = () => {
+      const canvas = document.createElement('canvas')
+      canvas.width = image.width
+      canvas.height = image.height
+      const ctx = canvas.getContext('2d');
+      (ctx as CanvasRenderingContext2D).drawImage(image, 0, 0, image.width, image.height)
+      canvas.toBlob((blob) => {
+        const url = URL.createObjectURL(blob as Blob)
+        downloadImg(url, name)
+        // 用完释放URL对象
+        URL.revokeObjectURL(url)
+      })
+    }
+  }
+  else {
+    // 预览一般都是用的a标签，文件下载用的window.open
+    // 1.pdf文件路径放到window.open里面，点击是进行在线预览
+    // 2.word文件和excel文件通过a标签打开时，是直接下载了
+    // 将网络地址转化为 blob地址 并下载
+    urlToBlob(url, name)
+  }
+}

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index 4301f6f..92ad9b6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -23,6 +23,15 @@
   })
 }
 
+// 部门检测我的检测详情
+export function executiveDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/executive/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
@@ -63,7 +72,25 @@
 // 退回(待检测/检测中->退回)
 export function sendBackProcess(data: ISendBack) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/executive/sendBack',
+    method: 'post',
+    data,
+  })
+}
+
+// 收入（待检测->检测中）->收入)
+export function myExecutiveReceive(data: object) {
+  return request({
+    url: '/business/labExecutive/myExecutive/receive',
+    method: 'post',
+    data,
+  })
+}
+
+// 分配
+export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+  return request({
+    url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
     data,
   })
diff --git a/src/main.ts b/src/main.ts
index 695df5c..3cf24ef 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -16,13 +16,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
+import buttonPerm from '@/utils/buttonPerm'
 // 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
-
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.config.globalProperties.buttonPerm = buttonPerm
 app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
new file mode 100644
index 0000000..205d84a
--- /dev/null
+++ b/src/utils/buttonPerm.ts
@@ -0,0 +1,66 @@
+import { hasPermission } from '@/utils/composables/permission'
+
+function error(permPath: string) {
+  if (permPath === undefined) {
+    throw new Error('Button permission url is required!!!')
+  }
+}
+
+export default {
+  agree: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  reject: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  refuse: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  edit: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && (row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消')
+    },
+  },
+  submit: {
+    if: (row: any) => {
+      row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
+    },
+  },
+  cancel: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '审批中'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '审批中'
+    },
+  },
+  delete: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
+    },
+  },
+}
diff --git a/src/utils/download.ts b/src/utils/download.ts
new file mode 100644
index 0000000..d70f539
--- /dev/null
+++ b/src/utils/download.ts
@@ -0,0 +1,149 @@
+/**
+ * 下载本地图片 href为 127.0.0.1/xxxx
+ * @param href 图片地址
+ * @param name 图片名称
+ */
+function downloadImg(href: string, name: string) {
+  const eleLink = document.createElement('a')
+  eleLink.download = name
+  eleLink.href = href
+  eleLink.click()
+  eleLink.remove()
+}
+
+/**
+ * 下载文件
+ * @param file 文件对象
+ * @param name 图片名称
+ */
+export function downloadFile(file: File, name: string) {
+  console.log(new Blob([file]), 'new Blob([file])')
+  const objectUrl = URL.createObjectURL(new Blob([file]))
+  const link = document.createElement('a')
+  link.download = name
+  link.href = objectUrl
+  link.click()
+  link.remove()
+  window.URL.revokeObjectURL(link.href)
+}
+// 各种文件类型的type
+export const fileType: { [key: string]: string } = {
+  pdf: 'application/pdf',
+  doc: 'application/doc',
+  docx: 'application/docx',
+  excel: 'application/excel',
+  ppt: 'application/vnd.ms-powerpoint',
+  dir: 'application/x-director',
+  js: 'application/x-javascript',
+  swf: 'application/x-shockwave-flash',
+  xhtml: 'application/xhtml+xml',
+  xht: 'application/xhtml+xml',
+  zip: 'application/zip',
+  mid: 'audio/midi',
+  midi: 'audio/midi',
+  mp3: 'audio/mpeg',
+  rm: 'audio/x-pn-realaudio',
+  rpm: 'audio/x-pn-realaudio-plugin',
+  wav: 'audio/x-wav',
+  bmp: 'image/bmp',
+  gif: 'image/gif',
+  jpeg: 'image/jpeg',
+  jpg: 'image/jpeg',
+  png: 'image/png',
+  css: 'text/css',
+  html: 'text/html',
+  htm: 'text/html',
+  txt: 'text/plain',
+  xsl: 'text/xml',
+  xml: 'text/xml',
+  mpeg: 'video/mpeg',
+  mpg: 'video/mpeg',
+  avi: 'video/x-msvideo',
+  movie: 'video/x-sgi-movie',
+}
+/**
+ * 将网络文件地址转化为文件对象
+ * @param url 文件地址
+ * @param fileName 文件名称
+ */
+export function getFileFromUrl(url: string, fileName: string) {
+  return new Promise((resolve, reject) => {
+    var blob = null
+    var xhr = new XMLHttpRequest()
+    xhr.open('GET', url)
+    const urlFileType = url.split('.')[url.split('.').length - 1]
+    xhr.setRequestHeader('Accept', fileType[urlFileType])
+    xhr.responseType = 'blob'
+    // 加载时处理
+    xhr.onload = () => {
+      // 获取返回结果
+      blob = xhr.response
+      const file = new File([blob], fileName, { type: fileType[urlFileType] })
+      // 返回结果
+      resolve(file)
+    }
+    xhr.onerror = (e) => {
+      reject(e)
+    }
+    // 发送
+    xhr.send()
+  })
+}
+/**
+ * 将网络地址转化为 blob地址 并下载
+ * @param url 文件地址
+ * @param fileName 文件名称
+ */
+export function urlToBlob(url: string, name: string) {
+  const xhr = new XMLHttpRequest()
+  xhr.open('get', url)
+  xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
+  xhr.onload = function () {
+    const path = URL.createObjectURL(xhr.response)
+    const link = document.createElement('a')
+    link.download = name
+    link.href = path
+    link.click()
+    link.remove()
+    window.URL.revokeObjectURL(link.href)
+  }
+  xhr.send()
+}
+
+/**
+ * 下载文件 各种文件
+ * @param url 网络文件地址
+ * @param name  文件名
+ */
+export function download(url: string, name: string) {
+  // 下载图片
+  const photo = ['jpg', 'jpeg', 'png']
+  const fileType = url.split('.')[url.split('.').length - 1]
+  console.log(fileType, 'fileType')
+  if (photo.includes(fileType)) {
+    // 图片 将服务器图片地址转化成本地地址
+    const image = new Image()
+    image.setAttribute('crossOrigin', 'anonymous')
+    image.src = url
+    image.onload = () => {
+      const canvas = document.createElement('canvas')
+      canvas.width = image.width
+      canvas.height = image.height
+      const ctx = canvas.getContext('2d');
+      (ctx as CanvasRenderingContext2D).drawImage(image, 0, 0, image.width, image.height)
+      canvas.toBlob((blob) => {
+        const url = URL.createObjectURL(blob as Blob)
+        downloadImg(url, name)
+        // 用完释放URL对象
+        URL.revokeObjectURL(url)
+      })
+    }
+  }
+  else {
+    // 预览一般都是用的a标签，文件下载用的window.open
+    // 1.pdf文件路径放到window.open里面，点击是进行在线预览
+    // 2.word文件和excel文件通过a标签打开时，是直接下载了
+    // 将网络地址转化为 blob地址 并下载
+    urlToBlob(url, name)
+  }
+}
diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue
index 628f3ca..92c45f1 100644
--- a/src/views/business/lab/components/distributeDialog.vue
+++ b/src/views/business/lab/components/distributeDialog.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts" name="DistributeDialog">
 import { Aim } from '@element-plus/icons-vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
+import { allocate, executiveDetail } from '@/api/business/schedule/task'
 // 实验室任务分发弹窗
 
 // 自定义方法：close关闭弹窗
@@ -18,14 +20,13 @@
     certificationTypes.value = response.data
   })
 }
-
-getDict()
 // 样品详情
 const sampleDetail = ref({
-  sampleName: '压力表',
-  mesureContent: '压力、ip68',
-  certifications: ['1', '2'],
-  remark: '这是备注',
+  sampleName: '',
+  measureContent: '',
+  certifications: [] as any,
+  remark: '',
+  laboratoryId: '',
 })
 
 const processNode = ref({
@@ -47,13 +48,23 @@
   distributeTime: '', // 分配时间
   startTime: '', // 检测开始时间
   overTime: '', // 检测结束时间
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', // 实验室id
 })
 
 // 初始化弹窗
-const initDialog = (sampleid: string, orderid: string) => {
+const initDialog = (id: string, sampleid: string, orderid: string) => {
   dialogVisible.value = true
   sampleId.value = sampleid
   orderId.value = orderid
+  executiveDetail({ orderId: orderid, sampleId: sampleid }).then((res) => {
+    if (res.data) {
+      sampleDetail.value = res.data
+      sampleDetail.value.laboratoryId = id
+      // 证书类别
+      sampleDetail.value.certifications = res.data.certifications.split(',')
+    }
+  })
 }
 
 // 选择人员
@@ -62,21 +73,39 @@
   choosePersonShow.value = true
 }
 // 人员选择完毕
-const choosePersonOver = (person: { id: string; name: string }) => {
+const choosePersonOver = (person: { id: string; name: string; measurePersonId: string; measureSegmentId: string }) => {
+  console.log(person)
   processNode.value.executivePerson = person.id
   processNode.value.executivePersonName = person.name
+  processNode.value.measurePersonId = person.measurePersonId
+  processNode.value.measureSegmentId = person.measureSegmentId
   choosePersonShow.value = false
 }
 
 // 流程配置组件
 const processConfigRef = ref()
-// 保存流程按钮点击
+// 保存流程按钮点击分配
 const saveProcess = () => {
+  // ctx.emit('fetchData') // fatherMethod 是想要调用父组件的一个方法
+
+  const postData = {
+    id: sampleDetail.value.laboratoryId, // 实验室检测id
+    measurePersonId: processNode.value.executivePerson, // 分配检定人员id（在本部门下的计量人员列表中选择）
+    requireCertifications: processNode.value.requireCertifications, // 应出具证书总数
+  }
+  allocate(postData).then((res: { code: number }) => {
+    if (res.code == 200) {
+      ElMessage.success('分配成功')
+    }
+  })
   emit('close')
 }
+
 function cancel() {
   dialogVisible.value = false
 }
+getDict()
+
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
 </script>
@@ -98,7 +127,7 @@
       </div>
       <div class="simple-info-line">
         <span class="label">检定项目:</span>
-        <el-input v-model="sampleDetail.mesureContent" disabled style="width: 480px;" />
+        <el-input v-model="sampleDetail.measureContent" disabled style="width: 480px;" />
       </div>
       <div class="simple-info-line">
         <span class="label">备注:</span>
@@ -119,7 +148,7 @@
     </div>
     <template #footer>
       <el-button type="primary" @click="saveProcess">
-        确定
+        分配
       </el-button>
       <el-button @click="cancel">
         取消

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index 4301f6f..92ad9b6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -23,6 +23,15 @@
   })
 }
 
+// 部门检测我的检测详情
+export function executiveDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/executive/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
@@ -63,7 +72,25 @@
 // 退回(待检测/检测中->退回)
 export function sendBackProcess(data: ISendBack) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/executive/sendBack',
+    method: 'post',
+    data,
+  })
+}
+
+// 收入（待检测->检测中）->收入)
+export function myExecutiveReceive(data: object) {
+  return request({
+    url: '/business/labExecutive/myExecutive/receive',
+    method: 'post',
+    data,
+  })
+}
+
+// 分配
+export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+  return request({
+    url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
     data,
   })
diff --git a/src/main.ts b/src/main.ts
index 695df5c..3cf24ef 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -16,13 +16,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
+import buttonPerm from '@/utils/buttonPerm'
 // 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
-
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.config.globalProperties.buttonPerm = buttonPerm
 app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
new file mode 100644
index 0000000..205d84a
--- /dev/null
+++ b/src/utils/buttonPerm.ts
@@ -0,0 +1,66 @@
+import { hasPermission } from '@/utils/composables/permission'
+
+function error(permPath: string) {
+  if (permPath === undefined) {
+    throw new Error('Button permission url is required!!!')
+  }
+}
+
+export default {
+  agree: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  reject: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  refuse: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  edit: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && (row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消')
+    },
+  },
+  submit: {
+    if: (row: any) => {
+      row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
+    },
+  },
+  cancel: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '审批中'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '审批中'
+    },
+  },
+  delete: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
+    },
+  },
+}
diff --git a/src/utils/download.ts b/src/utils/download.ts
new file mode 100644
index 0000000..d70f539
--- /dev/null
+++ b/src/utils/download.ts
@@ -0,0 +1,149 @@
+/**
+ * 下载本地图片 href为 127.0.0.1/xxxx
+ * @param href 图片地址
+ * @param name 图片名称
+ */
+function downloadImg(href: string, name: string) {
+  const eleLink = document.createElement('a')
+  eleLink.download = name
+  eleLink.href = href
+  eleLink.click()
+  eleLink.remove()
+}
+
+/**
+ * 下载文件
+ * @param file 文件对象
+ * @param name 图片名称
+ */
+export function downloadFile(file: File, name: string) {
+  console.log(new Blob([file]), 'new Blob([file])')
+  const objectUrl = URL.createObjectURL(new Blob([file]))
+  const link = document.createElement('a')
+  link.download = name
+  link.href = objectUrl
+  link.click()
+  link.remove()
+  window.URL.revokeObjectURL(link.href)
+}
+// 各种文件类型的type
+export const fileType: { [key: string]: string } = {
+  pdf: 'application/pdf',
+  doc: 'application/doc',
+  docx: 'application/docx',
+  excel: 'application/excel',
+  ppt: 'application/vnd.ms-powerpoint',
+  dir: 'application/x-director',
+  js: 'application/x-javascript',
+  swf: 'application/x-shockwave-flash',
+  xhtml: 'application/xhtml+xml',
+  xht: 'application/xhtml+xml',
+  zip: 'application/zip',
+  mid: 'audio/midi',
+  midi: 'audio/midi',
+  mp3: 'audio/mpeg',
+  rm: 'audio/x-pn-realaudio',
+  rpm: 'audio/x-pn-realaudio-plugin',
+  wav: 'audio/x-wav',
+  bmp: 'image/bmp',
+  gif: 'image/gif',
+  jpeg: 'image/jpeg',
+  jpg: 'image/jpeg',
+  png: 'image/png',
+  css: 'text/css',
+  html: 'text/html',
+  htm: 'text/html',
+  txt: 'text/plain',
+  xsl: 'text/xml',
+  xml: 'text/xml',
+  mpeg: 'video/mpeg',
+  mpg: 'video/mpeg',
+  avi: 'video/x-msvideo',
+  movie: 'video/x-sgi-movie',
+}
+/**
+ * 将网络文件地址转化为文件对象
+ * @param url 文件地址
+ * @param fileName 文件名称
+ */
+export function getFileFromUrl(url: string, fileName: string) {
+  return new Promise((resolve, reject) => {
+    var blob = null
+    var xhr = new XMLHttpRequest()
+    xhr.open('GET', url)
+    const urlFileType = url.split('.')[url.split('.').length - 1]
+    xhr.setRequestHeader('Accept', fileType[urlFileType])
+    xhr.responseType = 'blob'
+    // 加载时处理
+    xhr.onload = () => {
+      // 获取返回结果
+      blob = xhr.response
+      const file = new File([blob], fileName, { type: fileType[urlFileType] })
+      // 返回结果
+      resolve(file)
+    }
+    xhr.onerror = (e) => {
+      reject(e)
+    }
+    // 发送
+    xhr.send()
+  })
+}
+/**
+ * 将网络地址转化为 blob地址 并下载
+ * @param url 文件地址
+ * @param fileName 文件名称
+ */
+export function urlToBlob(url: string, name: string) {
+  const xhr = new XMLHttpRequest()
+  xhr.open('get', url)
+  xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
+  xhr.onload = function () {
+    const path = URL.createObjectURL(xhr.response)
+    const link = document.createElement('a')
+    link.download = name
+    link.href = path
+    link.click()
+    link.remove()
+    window.URL.revokeObjectURL(link.href)
+  }
+  xhr.send()
+}
+
+/**
+ * 下载文件 各种文件
+ * @param url 网络文件地址
+ * @param name  文件名
+ */
+export function download(url: string, name: string) {
+  // 下载图片
+  const photo = ['jpg', 'jpeg', 'png']
+  const fileType = url.split('.')[url.split('.').length - 1]
+  console.log(fileType, 'fileType')
+  if (photo.includes(fileType)) {
+    // 图片 将服务器图片地址转化成本地地址
+    const image = new Image()
+    image.setAttribute('crossOrigin', 'anonymous')
+    image.src = url
+    image.onload = () => {
+      const canvas = document.createElement('canvas')
+      canvas.width = image.width
+      canvas.height = image.height
+      const ctx = canvas.getContext('2d');
+      (ctx as CanvasRenderingContext2D).drawImage(image, 0, 0, image.width, image.height)
+      canvas.toBlob((blob) => {
+        const url = URL.createObjectURL(blob as Blob)
+        downloadImg(url, name)
+        // 用完释放URL对象
+        URL.revokeObjectURL(url)
+      })
+    }
+  }
+  else {
+    // 预览一般都是用的a标签，文件下载用的window.open
+    // 1.pdf文件路径放到window.open里面，点击是进行在线预览
+    // 2.word文件和excel文件通过a标签打开时，是直接下载了
+    // 将网络地址转化为 blob地址 并下载
+    urlToBlob(url, name)
+  }
+}
diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue
index 628f3ca..92c45f1 100644
--- a/src/views/business/lab/components/distributeDialog.vue
+++ b/src/views/business/lab/components/distributeDialog.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts" name="DistributeDialog">
 import { Aim } from '@element-plus/icons-vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
+import { allocate, executiveDetail } from '@/api/business/schedule/task'
 // 实验室任务分发弹窗
 
 // 自定义方法：close关闭弹窗
@@ -18,14 +20,13 @@
     certificationTypes.value = response.data
   })
 }
-
-getDict()
 // 样品详情
 const sampleDetail = ref({
-  sampleName: '压力表',
-  mesureContent: '压力、ip68',
-  certifications: ['1', '2'],
-  remark: '这是备注',
+  sampleName: '',
+  measureContent: '',
+  certifications: [] as any,
+  remark: '',
+  laboratoryId: '',
 })
 
 const processNode = ref({
@@ -47,13 +48,23 @@
   distributeTime: '', // 分配时间
   startTime: '', // 检测开始时间
   overTime: '', // 检测结束时间
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', // 实验室id
 })
 
 // 初始化弹窗
-const initDialog = (sampleid: string, orderid: string) => {
+const initDialog = (id: string, sampleid: string, orderid: string) => {
   dialogVisible.value = true
   sampleId.value = sampleid
   orderId.value = orderid
+  executiveDetail({ orderId: orderid, sampleId: sampleid }).then((res) => {
+    if (res.data) {
+      sampleDetail.value = res.data
+      sampleDetail.value.laboratoryId = id
+      // 证书类别
+      sampleDetail.value.certifications = res.data.certifications.split(',')
+    }
+  })
 }
 
 // 选择人员
@@ -62,21 +73,39 @@
   choosePersonShow.value = true
 }
 // 人员选择完毕
-const choosePersonOver = (person: { id: string; name: string }) => {
+const choosePersonOver = (person: { id: string; name: string; measurePersonId: string; measureSegmentId: string }) => {
+  console.log(person)
   processNode.value.executivePerson = person.id
   processNode.value.executivePersonName = person.name
+  processNode.value.measurePersonId = person.measurePersonId
+  processNode.value.measureSegmentId = person.measureSegmentId
   choosePersonShow.value = false
 }
 
 // 流程配置组件
 const processConfigRef = ref()
-// 保存流程按钮点击
+// 保存流程按钮点击分配
 const saveProcess = () => {
+  // ctx.emit('fetchData') // fatherMethod 是想要调用父组件的一个方法
+
+  const postData = {
+    id: sampleDetail.value.laboratoryId, // 实验室检测id
+    measurePersonId: processNode.value.executivePerson, // 分配检定人员id（在本部门下的计量人员列表中选择）
+    requireCertifications: processNode.value.requireCertifications, // 应出具证书总数
+  }
+  allocate(postData).then((res: { code: number }) => {
+    if (res.code == 200) {
+      ElMessage.success('分配成功')
+    }
+  })
   emit('close')
 }
+
 function cancel() {
   dialogVisible.value = false
 }
+getDict()
+
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
 </script>
@@ -98,7 +127,7 @@
       </div>
       <div class="simple-info-line">
         <span class="label">检定项目:</span>
-        <el-input v-model="sampleDetail.mesureContent" disabled style="width: 480px;" />
+        <el-input v-model="sampleDetail.measureContent" disabled style="width: 480px;" />
       </div>
       <div class="simple-info-line">
         <span class="label">备注:</span>
@@ -119,7 +148,7 @@
     </div>
     <template #footer>
       <el-button type="primary" @click="saveProcess">
-        确定
+        分配
       </el-button>
       <el-button @click="cancel">
         取消
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index 553d2ec..0a7022a 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -47,7 +47,7 @@
 function initDialog(row: IlabMeasureList) {
   formData.id = row.id
   formData.measurePersonId = row.measurePersonId
-  formData.measureSegmentId = row.measureSegmentId
+  formData.measureSegmentId = row.currentSegmentId
   formData.orderId = row.orderId
   formData.sampleId = row.sampleId
   formData.operateReason = ''

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index 4301f6f..92ad9b6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -23,6 +23,15 @@
   })
 }
 
+// 部门检测我的检测详情
+export function executiveDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/executive/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
@@ -63,7 +72,25 @@
 // 退回(待检测/检测中->退回)
 export function sendBackProcess(data: ISendBack) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/executive/sendBack',
+    method: 'post',
+    data,
+  })
+}
+
+// 收入（待检测->检测中）->收入)
+export function myExecutiveReceive(data: object) {
+  return request({
+    url: '/business/labExecutive/myExecutive/receive',
+    method: 'post',
+    data,
+  })
+}
+
+// 分配
+export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+  return request({
+    url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
     data,
   })
diff --git a/src/main.ts b/src/main.ts
index 695df5c..3cf24ef 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -16,13 +16,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
+import buttonPerm from '@/utils/buttonPerm'
 // 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
-
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.config.globalProperties.buttonPerm = buttonPerm
 app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
new file mode 100644
index 0000000..205d84a
--- /dev/null
+++ b/src/utils/buttonPerm.ts
@@ -0,0 +1,66 @@
+import { hasPermission } from '@/utils/composables/permission'
+
+function error(permPath: string) {
+  if (permPath === undefined) {
+    throw new Error('Button permission url is required!!!')
+  }
+}
+
+export default {
+  agree: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  reject: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  refuse: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  edit: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && (row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消')
+    },
+  },
+  submit: {
+    if: (row: any) => {
+      row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
+    },
+  },
+  cancel: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '审批中'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '审批中'
+    },
+  },
+  delete: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
+    },
+  },
+}
diff --git a/src/utils/download.ts b/src/utils/download.ts
new file mode 100644
index 0000000..d70f539
--- /dev/null
+++ b/src/utils/download.ts
@@ -0,0 +1,149 @@
+/**
+ * 下载本地图片 href为 127.0.0.1/xxxx
+ * @param href 图片地址
+ * @param name 图片名称
+ */
+function downloadImg(href: string, name: string) {
+  const eleLink = document.createElement('a')
+  eleLink.download = name
+  eleLink.href = href
+  eleLink.click()
+  eleLink.remove()
+}
+
+/**
+ * 下载文件
+ * @param file 文件对象
+ * @param name 图片名称
+ */
+export function downloadFile(file: File, name: string) {
+  console.log(new Blob([file]), 'new Blob([file])')
+  const objectUrl = URL.createObjectURL(new Blob([file]))
+  const link = document.createElement('a')
+  link.download = name
+  link.href = objectUrl
+  link.click()
+  link.remove()
+  window.URL.revokeObjectURL(link.href)
+}
+// 各种文件类型的type
+export const fileType: { [key: string]: string } = {
+  pdf: 'application/pdf',
+  doc: 'application/doc',
+  docx: 'application/docx',
+  excel: 'application/excel',
+  ppt: 'application/vnd.ms-powerpoint',
+  dir: 'application/x-director',
+  js: 'application/x-javascript',
+  swf: 'application/x-shockwave-flash',
+  xhtml: 'application/xhtml+xml',
+  xht: 'application/xhtml+xml',
+  zip: 'application/zip',
+  mid: 'audio/midi',
+  midi: 'audio/midi',
+  mp3: 'audio/mpeg',
+  rm: 'audio/x-pn-realaudio',
+  rpm: 'audio/x-pn-realaudio-plugin',
+  wav: 'audio/x-wav',
+  bmp: 'image/bmp',
+  gif: 'image/gif',
+  jpeg: 'image/jpeg',
+  jpg: 'image/jpeg',
+  png: 'image/png',
+  css: 'text/css',
+  html: 'text/html',
+  htm: 'text/html',
+  txt: 'text/plain',
+  xsl: 'text/xml',
+  xml: 'text/xml',
+  mpeg: 'video/mpeg',
+  mpg: 'video/mpeg',
+  avi: 'video/x-msvideo',
+  movie: 'video/x-sgi-movie',
+}
+/**
+ * 将网络文件地址转化为文件对象
+ * @param url 文件地址
+ * @param fileName 文件名称
+ */
+export function getFileFromUrl(url: string, fileName: string) {
+  return new Promise((resolve, reject) => {
+    var blob = null
+    var xhr = new XMLHttpRequest()
+    xhr.open('GET', url)
+    const urlFileType = url.split('.')[url.split('.').length - 1]
+    xhr.setRequestHeader('Accept', fileType[urlFileType])
+    xhr.responseType = 'blob'
+    // 加载时处理
+    xhr.onload = () => {
+      // 获取返回结果
+      blob = xhr.response
+      const file = new File([blob], fileName, { type: fileType[urlFileType] })
+      // 返回结果
+      resolve(file)
+    }
+    xhr.onerror = (e) => {
+      reject(e)
+    }
+    // 发送
+    xhr.send()
+  })
+}
+/**
+ * 将网络地址转化为 blob地址 并下载
+ * @param url 文件地址
+ * @param fileName 文件名称
+ */
+export function urlToBlob(url: string, name: string) {
+  const xhr = new XMLHttpRequest()
+  xhr.open('get', url)
+  xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
+  xhr.onload = function () {
+    const path = URL.createObjectURL(xhr.response)
+    const link = document.createElement('a')
+    link.download = name
+    link.href = path
+    link.click()
+    link.remove()
+    window.URL.revokeObjectURL(link.href)
+  }
+  xhr.send()
+}
+
+/**
+ * 下载文件 各种文件
+ * @param url 网络文件地址
+ * @param name  文件名
+ */
+export function download(url: string, name: string) {
+  // 下载图片
+  const photo = ['jpg', 'jpeg', 'png']
+  const fileType = url.split('.')[url.split('.').length - 1]
+  console.log(fileType, 'fileType')
+  if (photo.includes(fileType)) {
+    // 图片 将服务器图片地址转化成本地地址
+    const image = new Image()
+    image.setAttribute('crossOrigin', 'anonymous')
+    image.src = url
+    image.onload = () => {
+      const canvas = document.createElement('canvas')
+      canvas.width = image.width
+      canvas.height = image.height
+      const ctx = canvas.getContext('2d');
+      (ctx as CanvasRenderingContext2D).drawImage(image, 0, 0, image.width, image.height)
+      canvas.toBlob((blob) => {
+        const url = URL.createObjectURL(blob as Blob)
+        downloadImg(url, name)
+        // 用完释放URL对象
+        URL.revokeObjectURL(url)
+      })
+    }
+  }
+  else {
+    // 预览一般都是用的a标签，文件下载用的window.open
+    // 1.pdf文件路径放到window.open里面，点击是进行在线预览
+    // 2.word文件和excel文件通过a标签打开时，是直接下载了
+    // 将网络地址转化为 blob地址 并下载
+    urlToBlob(url, name)
+  }
+}
diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue
index 628f3ca..92c45f1 100644
--- a/src/views/business/lab/components/distributeDialog.vue
+++ b/src/views/business/lab/components/distributeDialog.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts" name="DistributeDialog">
 import { Aim } from '@element-plus/icons-vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
+import { allocate, executiveDetail } from '@/api/business/schedule/task'
 // 实验室任务分发弹窗
 
 // 自定义方法：close关闭弹窗
@@ -18,14 +20,13 @@
     certificationTypes.value = response.data
   })
 }
-
-getDict()
 // 样品详情
 const sampleDetail = ref({
-  sampleName: '压力表',
-  mesureContent: '压力、ip68',
-  certifications: ['1', '2'],
-  remark: '这是备注',
+  sampleName: '',
+  measureContent: '',
+  certifications: [] as any,
+  remark: '',
+  laboratoryId: '',
 })
 
 const processNode = ref({
@@ -47,13 +48,23 @@
   distributeTime: '', // 分配时间
   startTime: '', // 检测开始时间
   overTime: '', // 检测结束时间
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', // 实验室id
 })
 
 // 初始化弹窗
-const initDialog = (sampleid: string, orderid: string) => {
+const initDialog = (id: string, sampleid: string, orderid: string) => {
   dialogVisible.value = true
   sampleId.value = sampleid
   orderId.value = orderid
+  executiveDetail({ orderId: orderid, sampleId: sampleid }).then((res) => {
+    if (res.data) {
+      sampleDetail.value = res.data
+      sampleDetail.value.laboratoryId = id
+      // 证书类别
+      sampleDetail.value.certifications = res.data.certifications.split(',')
+    }
+  })
 }
 
 // 选择人员
@@ -62,21 +73,39 @@
   choosePersonShow.value = true
 }
 // 人员选择完毕
-const choosePersonOver = (person: { id: string; name: string }) => {
+const choosePersonOver = (person: { id: string; name: string; measurePersonId: string; measureSegmentId: string }) => {
+  console.log(person)
   processNode.value.executivePerson = person.id
   processNode.value.executivePersonName = person.name
+  processNode.value.measurePersonId = person.measurePersonId
+  processNode.value.measureSegmentId = person.measureSegmentId
   choosePersonShow.value = false
 }
 
 // 流程配置组件
 const processConfigRef = ref()
-// 保存流程按钮点击
+// 保存流程按钮点击分配
 const saveProcess = () => {
+  // ctx.emit('fetchData') // fatherMethod 是想要调用父组件的一个方法
+
+  const postData = {
+    id: sampleDetail.value.laboratoryId, // 实验室检测id
+    measurePersonId: processNode.value.executivePerson, // 分配检定人员id（在本部门下的计量人员列表中选择）
+    requireCertifications: processNode.value.requireCertifications, // 应出具证书总数
+  }
+  allocate(postData).then((res: { code: number }) => {
+    if (res.code == 200) {
+      ElMessage.success('分配成功')
+    }
+  })
   emit('close')
 }
+
 function cancel() {
   dialogVisible.value = false
 }
+getDict()
+
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
 </script>
@@ -98,7 +127,7 @@
       </div>
       <div class="simple-info-line">
         <span class="label">检定项目:</span>
-        <el-input v-model="sampleDetail.mesureContent" disabled style="width: 480px;" />
+        <el-input v-model="sampleDetail.measureContent" disabled style="width: 480px;" />
       </div>
       <div class="simple-info-line">
         <span class="label">备注:</span>
@@ -119,7 +148,7 @@
     </div>
     <template #footer>
       <el-button type="primary" @click="saveProcess">
-        确定
+        分配
       </el-button>
       <el-button @click="cancel">
         取消
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index 553d2ec..0a7022a 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -47,7 +47,7 @@
 function initDialog(row: IlabMeasureList) {
   formData.id = row.id
   formData.measurePersonId = row.measurePersonId
-  formData.measureSegmentId = row.measureSegmentId
+  formData.measureSegmentId = row.currentSegmentId
   formData.orderId = row.orderId
   formData.sampleId = row.sampleId
   formData.operateReason = ''
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index eb4b260..e849fd3 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -135,7 +135,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
 }
 // 点击标签绑定
 const barCodeBind = ref()

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index 4301f6f..92ad9b6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -23,6 +23,15 @@
   })
 }
 
+// 部门检测我的检测详情
+export function executiveDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/executive/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
@@ -63,7 +72,25 @@
 // 退回(待检测/检测中->退回)
 export function sendBackProcess(data: ISendBack) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/executive/sendBack',
+    method: 'post',
+    data,
+  })
+}
+
+// 收入（待检测->检测中）->收入)
+export function myExecutiveReceive(data: object) {
+  return request({
+    url: '/business/labExecutive/myExecutive/receive',
+    method: 'post',
+    data,
+  })
+}
+
+// 分配
+export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+  return request({
+    url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
     data,
   })
diff --git a/src/main.ts b/src/main.ts
index 695df5c..3cf24ef 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -16,13 +16,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
+import buttonPerm from '@/utils/buttonPerm'
 // 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
-
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.config.globalProperties.buttonPerm = buttonPerm
 app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
new file mode 100644
index 0000000..205d84a
--- /dev/null
+++ b/src/utils/buttonPerm.ts
@@ -0,0 +1,66 @@
+import { hasPermission } from '@/utils/composables/permission'
+
+function error(permPath: string) {
+  if (permPath === undefined) {
+    throw new Error('Button permission url is required!!!')
+  }
+}
+
+export default {
+  agree: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  reject: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  refuse: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  edit: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && (row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消')
+    },
+  },
+  submit: {
+    if: (row: any) => {
+      row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
+    },
+  },
+  cancel: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '审批中'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '审批中'
+    },
+  },
+  delete: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
+    },
+  },
+}
diff --git a/src/utils/download.ts b/src/utils/download.ts
new file mode 100644
index 0000000..d70f539
--- /dev/null
+++ b/src/utils/download.ts
@@ -0,0 +1,149 @@
+/**
+ * 下载本地图片 href为 127.0.0.1/xxxx
+ * @param href 图片地址
+ * @param name 图片名称
+ */
+function downloadImg(href: string, name: string) {
+  const eleLink = document.createElement('a')
+  eleLink.download = name
+  eleLink.href = href
+  eleLink.click()
+  eleLink.remove()
+}
+
+/**
+ * 下载文件
+ * @param file 文件对象
+ * @param name 图片名称
+ */
+export function downloadFile(file: File, name: string) {
+  console.log(new Blob([file]), 'new Blob([file])')
+  const objectUrl = URL.createObjectURL(new Blob([file]))
+  const link = document.createElement('a')
+  link.download = name
+  link.href = objectUrl
+  link.click()
+  link.remove()
+  window.URL.revokeObjectURL(link.href)
+}
+// 各种文件类型的type
+export const fileType: { [key: string]: string } = {
+  pdf: 'application/pdf',
+  doc: 'application/doc',
+  docx: 'application/docx',
+  excel: 'application/excel',
+  ppt: 'application/vnd.ms-powerpoint',
+  dir: 'application/x-director',
+  js: 'application/x-javascript',
+  swf: 'application/x-shockwave-flash',
+  xhtml: 'application/xhtml+xml',
+  xht: 'application/xhtml+xml',
+  zip: 'application/zip',
+  mid: 'audio/midi',
+  midi: 'audio/midi',
+  mp3: 'audio/mpeg',
+  rm: 'audio/x-pn-realaudio',
+  rpm: 'audio/x-pn-realaudio-plugin',
+  wav: 'audio/x-wav',
+  bmp: 'image/bmp',
+  gif: 'image/gif',
+  jpeg: 'image/jpeg',
+  jpg: 'image/jpeg',
+  png: 'image/png',
+  css: 'text/css',
+  html: 'text/html',
+  htm: 'text/html',
+  txt: 'text/plain',
+  xsl: 'text/xml',
+  xml: 'text/xml',
+  mpeg: 'video/mpeg',
+  mpg: 'video/mpeg',
+  avi: 'video/x-msvideo',
+  movie: 'video/x-sgi-movie',
+}
+/**
+ * 将网络文件地址转化为文件对象
+ * @param url 文件地址
+ * @param fileName 文件名称
+ */
+export function getFileFromUrl(url: string, fileName: string) {
+  return new Promise((resolve, reject) => {
+    var blob = null
+    var xhr = new XMLHttpRequest()
+    xhr.open('GET', url)
+    const urlFileType = url.split('.')[url.split('.').length - 1]
+    xhr.setRequestHeader('Accept', fileType[urlFileType])
+    xhr.responseType = 'blob'
+    // 加载时处理
+    xhr.onload = () => {
+      // 获取返回结果
+      blob = xhr.response
+      const file = new File([blob], fileName, { type: fileType[urlFileType] })
+      // 返回结果
+      resolve(file)
+    }
+    xhr.onerror = (e) => {
+      reject(e)
+    }
+    // 发送
+    xhr.send()
+  })
+}
+/**
+ * 将网络地址转化为 blob地址 并下载
+ * @param url 文件地址
+ * @param fileName 文件名称
+ */
+export function urlToBlob(url: string, name: string) {
+  const xhr = new XMLHttpRequest()
+  xhr.open('get', url)
+  xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
+  xhr.onload = function () {
+    const path = URL.createObjectURL(xhr.response)
+    const link = document.createElement('a')
+    link.download = name
+    link.href = path
+    link.click()
+    link.remove()
+    window.URL.revokeObjectURL(link.href)
+  }
+  xhr.send()
+}
+
+/**
+ * 下载文件 各种文件
+ * @param url 网络文件地址
+ * @param name  文件名
+ */
+export function download(url: string, name: string) {
+  // 下载图片
+  const photo = ['jpg', 'jpeg', 'png']
+  const fileType = url.split('.')[url.split('.').length - 1]
+  console.log(fileType, 'fileType')
+  if (photo.includes(fileType)) {
+    // 图片 将服务器图片地址转化成本地地址
+    const image = new Image()
+    image.setAttribute('crossOrigin', 'anonymous')
+    image.src = url
+    image.onload = () => {
+      const canvas = document.createElement('canvas')
+      canvas.width = image.width
+      canvas.height = image.height
+      const ctx = canvas.getContext('2d');
+      (ctx as CanvasRenderingContext2D).drawImage(image, 0, 0, image.width, image.height)
+      canvas.toBlob((blob) => {
+        const url = URL.createObjectURL(blob as Blob)
+        downloadImg(url, name)
+        // 用完释放URL对象
+        URL.revokeObjectURL(url)
+      })
+    }
+  }
+  else {
+    // 预览一般都是用的a标签，文件下载用的window.open
+    // 1.pdf文件路径放到window.open里面，点击是进行在线预览
+    // 2.word文件和excel文件通过a标签打开时，是直接下载了
+    // 将网络地址转化为 blob地址 并下载
+    urlToBlob(url, name)
+  }
+}
diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue
index 628f3ca..92c45f1 100644
--- a/src/views/business/lab/components/distributeDialog.vue
+++ b/src/views/business/lab/components/distributeDialog.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts" name="DistributeDialog">
 import { Aim } from '@element-plus/icons-vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
+import { allocate, executiveDetail } from '@/api/business/schedule/task'
 // 实验室任务分发弹窗
 
 // 自定义方法：close关闭弹窗
@@ -18,14 +20,13 @@
     certificationTypes.value = response.data
   })
 }
-
-getDict()
 // 样品详情
 const sampleDetail = ref({
-  sampleName: '压力表',
-  mesureContent: '压力、ip68',
-  certifications: ['1', '2'],
-  remark: '这是备注',
+  sampleName: '',
+  measureContent: '',
+  certifications: [] as any,
+  remark: '',
+  laboratoryId: '',
 })
 
 const processNode = ref({
@@ -47,13 +48,23 @@
   distributeTime: '', // 分配时间
   startTime: '', // 检测开始时间
   overTime: '', // 检测结束时间
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', // 实验室id
 })
 
 // 初始化弹窗
-const initDialog = (sampleid: string, orderid: string) => {
+const initDialog = (id: string, sampleid: string, orderid: string) => {
   dialogVisible.value = true
   sampleId.value = sampleid
   orderId.value = orderid
+  executiveDetail({ orderId: orderid, sampleId: sampleid }).then((res) => {
+    if (res.data) {
+      sampleDetail.value = res.data
+      sampleDetail.value.laboratoryId = id
+      // 证书类别
+      sampleDetail.value.certifications = res.data.certifications.split(',')
+    }
+  })
 }
 
 // 选择人员
@@ -62,21 +73,39 @@
   choosePersonShow.value = true
 }
 // 人员选择完毕
-const choosePersonOver = (person: { id: string; name: string }) => {
+const choosePersonOver = (person: { id: string; name: string; measurePersonId: string; measureSegmentId: string }) => {
+  console.log(person)
   processNode.value.executivePerson = person.id
   processNode.value.executivePersonName = person.name
+  processNode.value.measurePersonId = person.measurePersonId
+  processNode.value.measureSegmentId = person.measureSegmentId
   choosePersonShow.value = false
 }
 
 // 流程配置组件
 const processConfigRef = ref()
-// 保存流程按钮点击
+// 保存流程按钮点击分配
 const saveProcess = () => {
+  // ctx.emit('fetchData') // fatherMethod 是想要调用父组件的一个方法
+
+  const postData = {
+    id: sampleDetail.value.laboratoryId, // 实验室检测id
+    measurePersonId: processNode.value.executivePerson, // 分配检定人员id（在本部门下的计量人员列表中选择）
+    requireCertifications: processNode.value.requireCertifications, // 应出具证书总数
+  }
+  allocate(postData).then((res: { code: number }) => {
+    if (res.code == 200) {
+      ElMessage.success('分配成功')
+    }
+  })
   emit('close')
 }
+
 function cancel() {
   dialogVisible.value = false
 }
+getDict()
+
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
 </script>
@@ -98,7 +127,7 @@
       </div>
       <div class="simple-info-line">
         <span class="label">检定项目:</span>
-        <el-input v-model="sampleDetail.mesureContent" disabled style="width: 480px;" />
+        <el-input v-model="sampleDetail.measureContent" disabled style="width: 480px;" />
       </div>
       <div class="simple-info-line">
         <span class="label">备注:</span>
@@ -119,7 +148,7 @@
     </div>
     <template #footer>
       <el-button type="primary" @click="saveProcess">
-        确定
+        分配
       </el-button>
       <el-button @click="cancel">
         取消
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index 553d2ec..0a7022a 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -47,7 +47,7 @@
 function initDialog(row: IlabMeasureList) {
   formData.id = row.id
   formData.measurePersonId = row.measurePersonId
-  formData.measureSegmentId = row.measureSegmentId
+  formData.measureSegmentId = row.currentSegmentId
   formData.orderId = row.orderId
   formData.sampleId = row.sampleId
   formData.operateReason = ''
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index eb4b260..e849fd3 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -135,7 +135,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index c604d3e..d998c13 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -10,9 +10,10 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { getMyMeasureList } from '@/api/business/schedule/task'
+import { getMyMeasureList, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -157,12 +158,12 @@
 
 // 导出
 const exportAll = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
   if (list.value.length > 0) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: '下载中请稍后',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     // const params = {
     //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
     //   customerName: listQuery.value.customerName, // 公司名称
@@ -174,11 +175,11 @@
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '任务分发列表.xlsx')
     // })
+    loading.close()
   }
   else {
-    ElMessage.warning('无数据可导出数据')
+    ElMessage.warning('无数据可导出')
   }
-  loading.close()
 }
 
 // 打印列表
@@ -222,6 +223,11 @@
     { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
   ).then(() => {
     // 收入样品
+    myExecutiveReceive([{ orderId: row.orderId, sampleId: row.sampleId }]).then((res) => {
+      if (res.code == 200) {
+        ElMessage.success('收入成功')
+      }
+    })
   })
 }
 
@@ -278,7 +284,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 as string // 待检测
   }
   nextTick(() => {
     fetchData(true)

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index 4301f6f..92ad9b6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -23,6 +23,15 @@
   })
 }
 
+// 部门检测我的检测详情
+export function executiveDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/executive/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
@@ -63,7 +72,25 @@
 // 退回(待检测/检测中->退回)
 export function sendBackProcess(data: ISendBack) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/executive/sendBack',
+    method: 'post',
+    data,
+  })
+}
+
+// 收入（待检测->检测中）->收入)
+export function myExecutiveReceive(data: object) {
+  return request({
+    url: '/business/labExecutive/myExecutive/receive',
+    method: 'post',
+    data,
+  })
+}
+
+// 分配
+export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+  return request({
+    url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
     data,
   })
diff --git a/src/main.ts b/src/main.ts
index 695df5c..3cf24ef 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -16,13 +16,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
+import buttonPerm from '@/utils/buttonPerm'
 // 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
-
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.config.globalProperties.buttonPerm = buttonPerm
 app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
new file mode 100644
index 0000000..205d84a
--- /dev/null
+++ b/src/utils/buttonPerm.ts
@@ -0,0 +1,66 @@
+import { hasPermission } from '@/utils/composables/permission'
+
+function error(permPath: string) {
+  if (permPath === undefined) {
+    throw new Error('Button permission url is required!!!')
+  }
+}
+
+export default {
+  agree: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  reject: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  refuse: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  edit: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && (row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消')
+    },
+  },
+  submit: {
+    if: (row: any) => {
+      row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
+    },
+  },
+  cancel: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '审批中'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '审批中'
+    },
+  },
+  delete: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
+    },
+  },
+}
diff --git a/src/utils/download.ts b/src/utils/download.ts
new file mode 100644
index 0000000..d70f539
--- /dev/null
+++ b/src/utils/download.ts
@@ -0,0 +1,149 @@
+/**
+ * 下载本地图片 href为 127.0.0.1/xxxx
+ * @param href 图片地址
+ * @param name 图片名称
+ */
+function downloadImg(href: string, name: string) {
+  const eleLink = document.createElement('a')
+  eleLink.download = name
+  eleLink.href = href
+  eleLink.click()
+  eleLink.remove()
+}
+
+/**
+ * 下载文件
+ * @param file 文件对象
+ * @param name 图片名称
+ */
+export function downloadFile(file: File, name: string) {
+  console.log(new Blob([file]), 'new Blob([file])')
+  const objectUrl = URL.createObjectURL(new Blob([file]))
+  const link = document.createElement('a')
+  link.download = name
+  link.href = objectUrl
+  link.click()
+  link.remove()
+  window.URL.revokeObjectURL(link.href)
+}
+// 各种文件类型的type
+export const fileType: { [key: string]: string } = {
+  pdf: 'application/pdf',
+  doc: 'application/doc',
+  docx: 'application/docx',
+  excel: 'application/excel',
+  ppt: 'application/vnd.ms-powerpoint',
+  dir: 'application/x-director',
+  js: 'application/x-javascript',
+  swf: 'application/x-shockwave-flash',
+  xhtml: 'application/xhtml+xml',
+  xht: 'application/xhtml+xml',
+  zip: 'application/zip',
+  mid: 'audio/midi',
+  midi: 'audio/midi',
+  mp3: 'audio/mpeg',
+  rm: 'audio/x-pn-realaudio',
+  rpm: 'audio/x-pn-realaudio-plugin',
+  wav: 'audio/x-wav',
+  bmp: 'image/bmp',
+  gif: 'image/gif',
+  jpeg: 'image/jpeg',
+  jpg: 'image/jpeg',
+  png: 'image/png',
+  css: 'text/css',
+  html: 'text/html',
+  htm: 'text/html',
+  txt: 'text/plain',
+  xsl: 'text/xml',
+  xml: 'text/xml',
+  mpeg: 'video/mpeg',
+  mpg: 'video/mpeg',
+  avi: 'video/x-msvideo',
+  movie: 'video/x-sgi-movie',
+}
+/**
+ * 将网络文件地址转化为文件对象
+ * @param url 文件地址
+ * @param fileName 文件名称
+ */
+export function getFileFromUrl(url: string, fileName: string) {
+  return new Promise((resolve, reject) => {
+    var blob = null
+    var xhr = new XMLHttpRequest()
+    xhr.open('GET', url)
+    const urlFileType = url.split('.')[url.split('.').length - 1]
+    xhr.setRequestHeader('Accept', fileType[urlFileType])
+    xhr.responseType = 'blob'
+    // 加载时处理
+    xhr.onload = () => {
+      // 获取返回结果
+      blob = xhr.response
+      const file = new File([blob], fileName, { type: fileType[urlFileType] })
+      // 返回结果
+      resolve(file)
+    }
+    xhr.onerror = (e) => {
+      reject(e)
+    }
+    // 发送
+    xhr.send()
+  })
+}
+/**
+ * 将网络地址转化为 blob地址 并下载
+ * @param url 文件地址
+ * @param fileName 文件名称
+ */
+export function urlToBlob(url: string, name: string) {
+  const xhr = new XMLHttpRequest()
+  xhr.open('get', url)
+  xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
+  xhr.onload = function () {
+    const path = URL.createObjectURL(xhr.response)
+    const link = document.createElement('a')
+    link.download = name
+    link.href = path
+    link.click()
+    link.remove()
+    window.URL.revokeObjectURL(link.href)
+  }
+  xhr.send()
+}
+
+/**
+ * 下载文件 各种文件
+ * @param url 网络文件地址
+ * @param name  文件名
+ */
+export function download(url: string, name: string) {
+  // 下载图片
+  const photo = ['jpg', 'jpeg', 'png']
+  const fileType = url.split('.')[url.split('.').length - 1]
+  console.log(fileType, 'fileType')
+  if (photo.includes(fileType)) {
+    // 图片 将服务器图片地址转化成本地地址
+    const image = new Image()
+    image.setAttribute('crossOrigin', 'anonymous')
+    image.src = url
+    image.onload = () => {
+      const canvas = document.createElement('canvas')
+      canvas.width = image.width
+      canvas.height = image.height
+      const ctx = canvas.getContext('2d');
+      (ctx as CanvasRenderingContext2D).drawImage(image, 0, 0, image.width, image.height)
+      canvas.toBlob((blob) => {
+        const url = URL.createObjectURL(blob as Blob)
+        downloadImg(url, name)
+        // 用完释放URL对象
+        URL.revokeObjectURL(url)
+      })
+    }
+  }
+  else {
+    // 预览一般都是用的a标签，文件下载用的window.open
+    // 1.pdf文件路径放到window.open里面，点击是进行在线预览
+    // 2.word文件和excel文件通过a标签打开时，是直接下载了
+    // 将网络地址转化为 blob地址 并下载
+    urlToBlob(url, name)
+  }
+}
diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue
index 628f3ca..92c45f1 100644
--- a/src/views/business/lab/components/distributeDialog.vue
+++ b/src/views/business/lab/components/distributeDialog.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts" name="DistributeDialog">
 import { Aim } from '@element-plus/icons-vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
+import { allocate, executiveDetail } from '@/api/business/schedule/task'
 // 实验室任务分发弹窗
 
 // 自定义方法：close关闭弹窗
@@ -18,14 +20,13 @@
     certificationTypes.value = response.data
   })
 }
-
-getDict()
 // 样品详情
 const sampleDetail = ref({
-  sampleName: '压力表',
-  mesureContent: '压力、ip68',
-  certifications: ['1', '2'],
-  remark: '这是备注',
+  sampleName: '',
+  measureContent: '',
+  certifications: [] as any,
+  remark: '',
+  laboratoryId: '',
 })
 
 const processNode = ref({
@@ -47,13 +48,23 @@
   distributeTime: '', // 分配时间
   startTime: '', // 检测开始时间
   overTime: '', // 检测结束时间
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', // 实验室id
 })
 
 // 初始化弹窗
-const initDialog = (sampleid: string, orderid: string) => {
+const initDialog = (id: string, sampleid: string, orderid: string) => {
   dialogVisible.value = true
   sampleId.value = sampleid
   orderId.value = orderid
+  executiveDetail({ orderId: orderid, sampleId: sampleid }).then((res) => {
+    if (res.data) {
+      sampleDetail.value = res.data
+      sampleDetail.value.laboratoryId = id
+      // 证书类别
+      sampleDetail.value.certifications = res.data.certifications.split(',')
+    }
+  })
 }
 
 // 选择人员
@@ -62,21 +73,39 @@
   choosePersonShow.value = true
 }
 // 人员选择完毕
-const choosePersonOver = (person: { id: string; name: string }) => {
+const choosePersonOver = (person: { id: string; name: string; measurePersonId: string; measureSegmentId: string }) => {
+  console.log(person)
   processNode.value.executivePerson = person.id
   processNode.value.executivePersonName = person.name
+  processNode.value.measurePersonId = person.measurePersonId
+  processNode.value.measureSegmentId = person.measureSegmentId
   choosePersonShow.value = false
 }
 
 // 流程配置组件
 const processConfigRef = ref()
-// 保存流程按钮点击
+// 保存流程按钮点击分配
 const saveProcess = () => {
+  // ctx.emit('fetchData') // fatherMethod 是想要调用父组件的一个方法
+
+  const postData = {
+    id: sampleDetail.value.laboratoryId, // 实验室检测id
+    measurePersonId: processNode.value.executivePerson, // 分配检定人员id（在本部门下的计量人员列表中选择）
+    requireCertifications: processNode.value.requireCertifications, // 应出具证书总数
+  }
+  allocate(postData).then((res: { code: number }) => {
+    if (res.code == 200) {
+      ElMessage.success('分配成功')
+    }
+  })
   emit('close')
 }
+
 function cancel() {
   dialogVisible.value = false
 }
+getDict()
+
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
 </script>
@@ -98,7 +127,7 @@
       </div>
       <div class="simple-info-line">
         <span class="label">检定项目:</span>
-        <el-input v-model="sampleDetail.mesureContent" disabled style="width: 480px;" />
+        <el-input v-model="sampleDetail.measureContent" disabled style="width: 480px;" />
       </div>
       <div class="simple-info-line">
         <span class="label">备注:</span>
@@ -119,7 +148,7 @@
     </div>
     <template #footer>
       <el-button type="primary" @click="saveProcess">
-        确定
+        分配
       </el-button>
       <el-button @click="cancel">
         取消
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index 553d2ec..0a7022a 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -47,7 +47,7 @@
 function initDialog(row: IlabMeasureList) {
   formData.id = row.id
   formData.measurePersonId = row.measurePersonId
-  formData.measureSegmentId = row.measureSegmentId
+  formData.measureSegmentId = row.currentSegmentId
   formData.orderId = row.orderId
   formData.sampleId = row.sampleId
   formData.operateReason = ''
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index eb4b260..e849fd3 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -135,7 +135,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index c604d3e..d998c13 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -10,9 +10,10 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { getMyMeasureList } from '@/api/business/schedule/task'
+import { getMyMeasureList, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -157,12 +158,12 @@
 
 // 导出
 const exportAll = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
   if (list.value.length > 0) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: '下载中请稍后',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     // const params = {
     //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
     //   customerName: listQuery.value.customerName, // 公司名称
@@ -174,11 +175,11 @@
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '任务分发列表.xlsx')
     // })
+    loading.close()
   }
   else {
-    ElMessage.warning('无数据可导出数据')
+    ElMessage.warning('无数据可导出')
   }
-  loading.close()
 }
 
 // 打印列表
@@ -222,6 +223,11 @@
     { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
   ).then(() => {
     // 收入样品
+    myExecutiveReceive([{ orderId: row.orderId, sampleId: row.sampleId }]).then((res) => {
+      if (res.code == 200) {
+        ElMessage.success('收入成功')
+      }
+    })
   })
 }
 
@@ -278,7 +284,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 as string // 待检测
   }
   nextTick(() => {
     fetchData(true)
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index aa481ea..6503a12 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -51,6 +51,7 @@
   requireCertifications: number // 应出具证书总数
   distributeState: string // 分发性质-初次分发、退回分发
   handOutProperty: string // 分发性质-初次分发、退回分发
+  id?: string // 实验室id
 }
 
 // 实验室检测/我的检测列表
@@ -58,6 +59,7 @@
   id: string // 实验室检测id
   measurePersonId: string // 检测人id
   measureSegmentId: string // 检测部门id
+  currentSegmentId: string // 检测部门id (新)
 }
 
 // 全部检测流程节点

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index 4301f6f..92ad9b6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -23,6 +23,15 @@
   })
 }
 
+// 部门检测我的检测详情
+export function executiveDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/executive/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
@@ -63,7 +72,25 @@
 // 退回(待检测/检测中->退回)
 export function sendBackProcess(data: ISendBack) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/executive/sendBack',
+    method: 'post',
+    data,
+  })
+}
+
+// 收入（待检测->检测中）->收入)
+export function myExecutiveReceive(data: object) {
+  return request({
+    url: '/business/labExecutive/myExecutive/receive',
+    method: 'post',
+    data,
+  })
+}
+
+// 分配
+export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+  return request({
+    url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
     data,
   })
diff --git a/src/main.ts b/src/main.ts
index 695df5c..3cf24ef 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -16,13 +16,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
+import buttonPerm from '@/utils/buttonPerm'
 // 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
-
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.config.globalProperties.buttonPerm = buttonPerm
 app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
new file mode 100644
index 0000000..205d84a
--- /dev/null
+++ b/src/utils/buttonPerm.ts
@@ -0,0 +1,66 @@
+import { hasPermission } from '@/utils/composables/permission'
+
+function error(permPath: string) {
+  if (permPath === undefined) {
+    throw new Error('Button permission url is required!!!')
+  }
+}
+
+export default {
+  agree: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  reject: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  refuse: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  edit: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && (row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消')
+    },
+  },
+  submit: {
+    if: (row: any) => {
+      row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
+    },
+  },
+  cancel: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '审批中'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '审批中'
+    },
+  },
+  delete: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
+    },
+  },
+}
diff --git a/src/utils/download.ts b/src/utils/download.ts
new file mode 100644
index 0000000..d70f539
--- /dev/null
+++ b/src/utils/download.ts
@@ -0,0 +1,149 @@
+/**
+ * 下载本地图片 href为 127.0.0.1/xxxx
+ * @param href 图片地址
+ * @param name 图片名称
+ */
+function downloadImg(href: string, name: string) {
+  const eleLink = document.createElement('a')
+  eleLink.download = name
+  eleLink.href = href
+  eleLink.click()
+  eleLink.remove()
+}
+
+/**
+ * 下载文件
+ * @param file 文件对象
+ * @param name 图片名称
+ */
+export function downloadFile(file: File, name: string) {
+  console.log(new Blob([file]), 'new Blob([file])')
+  const objectUrl = URL.createObjectURL(new Blob([file]))
+  const link = document.createElement('a')
+  link.download = name
+  link.href = objectUrl
+  link.click()
+  link.remove()
+  window.URL.revokeObjectURL(link.href)
+}
+// 各种文件类型的type
+export const fileType: { [key: string]: string } = {
+  pdf: 'application/pdf',
+  doc: 'application/doc',
+  docx: 'application/docx',
+  excel: 'application/excel',
+  ppt: 'application/vnd.ms-powerpoint',
+  dir: 'application/x-director',
+  js: 'application/x-javascript',
+  swf: 'application/x-shockwave-flash',
+  xhtml: 'application/xhtml+xml',
+  xht: 'application/xhtml+xml',
+  zip: 'application/zip',
+  mid: 'audio/midi',
+  midi: 'audio/midi',
+  mp3: 'audio/mpeg',
+  rm: 'audio/x-pn-realaudio',
+  rpm: 'audio/x-pn-realaudio-plugin',
+  wav: 'audio/x-wav',
+  bmp: 'image/bmp',
+  gif: 'image/gif',
+  jpeg: 'image/jpeg',
+  jpg: 'image/jpeg',
+  png: 'image/png',
+  css: 'text/css',
+  html: 'text/html',
+  htm: 'text/html',
+  txt: 'text/plain',
+  xsl: 'text/xml',
+  xml: 'text/xml',
+  mpeg: 'video/mpeg',
+  mpg: 'video/mpeg',
+  avi: 'video/x-msvideo',
+  movie: 'video/x-sgi-movie',
+}
+/**
+ * 将网络文件地址转化为文件对象
+ * @param url 文件地址
+ * @param fileName 文件名称
+ */
+export function getFileFromUrl(url: string, fileName: string) {
+  return new Promise((resolve, reject) => {
+    var blob = null
+    var xhr = new XMLHttpRequest()
+    xhr.open('GET', url)
+    const urlFileType = url.split('.')[url.split('.').length - 1]
+    xhr.setRequestHeader('Accept', fileType[urlFileType])
+    xhr.responseType = 'blob'
+    // 加载时处理
+    xhr.onload = () => {
+      // 获取返回结果
+      blob = xhr.response
+      const file = new File([blob], fileName, { type: fileType[urlFileType] })
+      // 返回结果
+      resolve(file)
+    }
+    xhr.onerror = (e) => {
+      reject(e)
+    }
+    // 发送
+    xhr.send()
+  })
+}
+/**
+ * 将网络地址转化为 blob地址 并下载
+ * @param url 文件地址
+ * @param fileName 文件名称
+ */
+export function urlToBlob(url: string, name: string) {
+  const xhr = new XMLHttpRequest()
+  xhr.open('get', url)
+  xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
+  xhr.onload = function () {
+    const path = URL.createObjectURL(xhr.response)
+    const link = document.createElement('a')
+    link.download = name
+    link.href = path
+    link.click()
+    link.remove()
+    window.URL.revokeObjectURL(link.href)
+  }
+  xhr.send()
+}
+
+/**
+ * 下载文件 各种文件
+ * @param url 网络文件地址
+ * @param name  文件名
+ */
+export function download(url: string, name: string) {
+  // 下载图片
+  const photo = ['jpg', 'jpeg', 'png']
+  const fileType = url.split('.')[url.split('.').length - 1]
+  console.log(fileType, 'fileType')
+  if (photo.includes(fileType)) {
+    // 图片 将服务器图片地址转化成本地地址
+    const image = new Image()
+    image.setAttribute('crossOrigin', 'anonymous')
+    image.src = url
+    image.onload = () => {
+      const canvas = document.createElement('canvas')
+      canvas.width = image.width
+      canvas.height = image.height
+      const ctx = canvas.getContext('2d');
+      (ctx as CanvasRenderingContext2D).drawImage(image, 0, 0, image.width, image.height)
+      canvas.toBlob((blob) => {
+        const url = URL.createObjectURL(blob as Blob)
+        downloadImg(url, name)
+        // 用完释放URL对象
+        URL.revokeObjectURL(url)
+      })
+    }
+  }
+  else {
+    // 预览一般都是用的a标签，文件下载用的window.open
+    // 1.pdf文件路径放到window.open里面，点击是进行在线预览
+    // 2.word文件和excel文件通过a标签打开时，是直接下载了
+    // 将网络地址转化为 blob地址 并下载
+    urlToBlob(url, name)
+  }
+}
diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue
index 628f3ca..92c45f1 100644
--- a/src/views/business/lab/components/distributeDialog.vue
+++ b/src/views/business/lab/components/distributeDialog.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts" name="DistributeDialog">
 import { Aim } from '@element-plus/icons-vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
+import { allocate, executiveDetail } from '@/api/business/schedule/task'
 // 实验室任务分发弹窗
 
 // 自定义方法：close关闭弹窗
@@ -18,14 +20,13 @@
     certificationTypes.value = response.data
   })
 }
-
-getDict()
 // 样品详情
 const sampleDetail = ref({
-  sampleName: '压力表',
-  mesureContent: '压力、ip68',
-  certifications: ['1', '2'],
-  remark: '这是备注',
+  sampleName: '',
+  measureContent: '',
+  certifications: [] as any,
+  remark: '',
+  laboratoryId: '',
 })
 
 const processNode = ref({
@@ -47,13 +48,23 @@
   distributeTime: '', // 分配时间
   startTime: '', // 检测开始时间
   overTime: '', // 检测结束时间
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', // 实验室id
 })
 
 // 初始化弹窗
-const initDialog = (sampleid: string, orderid: string) => {
+const initDialog = (id: string, sampleid: string, orderid: string) => {
   dialogVisible.value = true
   sampleId.value = sampleid
   orderId.value = orderid
+  executiveDetail({ orderId: orderid, sampleId: sampleid }).then((res) => {
+    if (res.data) {
+      sampleDetail.value = res.data
+      sampleDetail.value.laboratoryId = id
+      // 证书类别
+      sampleDetail.value.certifications = res.data.certifications.split(',')
+    }
+  })
 }
 
 // 选择人员
@@ -62,21 +73,39 @@
   choosePersonShow.value = true
 }
 // 人员选择完毕
-const choosePersonOver = (person: { id: string; name: string }) => {
+const choosePersonOver = (person: { id: string; name: string; measurePersonId: string; measureSegmentId: string }) => {
+  console.log(person)
   processNode.value.executivePerson = person.id
   processNode.value.executivePersonName = person.name
+  processNode.value.measurePersonId = person.measurePersonId
+  processNode.value.measureSegmentId = person.measureSegmentId
   choosePersonShow.value = false
 }
 
 // 流程配置组件
 const processConfigRef = ref()
-// 保存流程按钮点击
+// 保存流程按钮点击分配
 const saveProcess = () => {
+  // ctx.emit('fetchData') // fatherMethod 是想要调用父组件的一个方法
+
+  const postData = {
+    id: sampleDetail.value.laboratoryId, // 实验室检测id
+    measurePersonId: processNode.value.executivePerson, // 分配检定人员id（在本部门下的计量人员列表中选择）
+    requireCertifications: processNode.value.requireCertifications, // 应出具证书总数
+  }
+  allocate(postData).then((res: { code: number }) => {
+    if (res.code == 200) {
+      ElMessage.success('分配成功')
+    }
+  })
   emit('close')
 }
+
 function cancel() {
   dialogVisible.value = false
 }
+getDict()
+
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
 </script>
@@ -98,7 +127,7 @@
       </div>
       <div class="simple-info-line">
         <span class="label">检定项目:</span>
-        <el-input v-model="sampleDetail.mesureContent" disabled style="width: 480px;" />
+        <el-input v-model="sampleDetail.measureContent" disabled style="width: 480px;" />
       </div>
       <div class="simple-info-line">
         <span class="label">备注:</span>
@@ -119,7 +148,7 @@
     </div>
     <template #footer>
       <el-button type="primary" @click="saveProcess">
-        确定
+        分配
       </el-button>
       <el-button @click="cancel">
         取消
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index 553d2ec..0a7022a 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -47,7 +47,7 @@
 function initDialog(row: IlabMeasureList) {
   formData.id = row.id
   formData.measurePersonId = row.measurePersonId
-  formData.measureSegmentId = row.measureSegmentId
+  formData.measureSegmentId = row.currentSegmentId
   formData.orderId = row.orderId
   formData.sampleId = row.sampleId
   formData.operateReason = ''
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index eb4b260..e849fd3 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -135,7 +135,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index c604d3e..d998c13 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -10,9 +10,10 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { getMyMeasureList } from '@/api/business/schedule/task'
+import { getMyMeasureList, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -157,12 +158,12 @@
 
 // 导出
 const exportAll = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
   if (list.value.length > 0) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: '下载中请稍后',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     // const params = {
     //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
     //   customerName: listQuery.value.customerName, // 公司名称
@@ -174,11 +175,11 @@
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '任务分发列表.xlsx')
     // })
+    loading.close()
   }
   else {
-    ElMessage.warning('无数据可导出数据')
+    ElMessage.warning('无数据可导出')
   }
-  loading.close()
 }
 
 // 打印列表
@@ -222,6 +223,11 @@
     { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
   ).then(() => {
     // 收入样品
+    myExecutiveReceive([{ orderId: row.orderId, sampleId: row.sampleId }]).then((res) => {
+      if (res.code == 200) {
+        ElMessage.success('收入成功')
+      }
+    })
   })
 }
 
@@ -278,7 +284,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 as string // 待检测
   }
   nextTick(() => {
     fetchData(true)
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index aa481ea..6503a12 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -51,6 +51,7 @@
   requireCertifications: number // 应出具证书总数
   distributeState: string // 分发性质-初次分发、退回分发
   handOutProperty: string // 分发性质-初次分发、退回分发
+  id?: string // 实验室id
 }
 
 // 实验室检测/我的检测列表
@@ -58,6 +59,7 @@
   id: string // 实验室检测id
   measurePersonId: string // 检测人id
   measureSegmentId: string // 检测部门id
+  currentSegmentId: string // 检测部门id (新)
 }
 
 // 全部检测流程节点
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 44876b7..fb29410 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -299,18 +299,13 @@
         </search-item>
         <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2" placeholder="文件类别" clearable>
-            <el-option
-              v-for="item in fileTypeList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
+            <el-option v-for="item in fileTypeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="创建时间"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss" placeholder="创建时间"
           />
         </search-item>
         <search-item>
@@ -320,19 +315,17 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/file/approve/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button
+            v-if="proxy.hasPerm('/file/approve/export')" icon="icon-export" title="导出"
+            @click="exportExcelBtn"
+          />
           <icon-button v-if="proxy.hasPerm('/file/approve/print')" icon="icon-print" title="打印" @click="printList" />
         </template>
         <!-- 表格区域 -->
         <normal-table
-          id="print"
-          :data="list" :total="total" :columns="columns"
-          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-          :list-loading="loadingTable"
-          :is-showmulti-select="true"
-          :is-multi="true"
-          @change="changePage"
-          @multi-select="multiSelect"
+          id="print" :data="list" :total="total" :columns="columns"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
+          :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -347,27 +340,56 @@
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button v-if="proxy.hasPerm('/file/approve/edit') && ['草稿箱', '已取消'].includes(activeTitle)" size="small" type="primary" link @click="edit(row)">
+                <el-button
+                  v-if="proxy.buttonPerm.edit.if(row, '/file/approve/edit')"
+                  size="small" type="primary" link @click="edit(row)"
+                >
                   编辑
                 </el-button>
-                <el-button v-if="proxy.hasPerm('/file/approve/edit') && ['草稿箱', '已取消'].includes(activeTitle)" size="small" type="primary" link @click="submit(row)">
+                <el-button
+                  v-if="proxy.buttonPerm.submit.if(row)"
+                  @click="submit(row)"
+                >
                   提交
                 </el-button>
-                <template v-if="['全部', '待审批'].includes(activeTitle)">
-                  <el-button v-if="proxy.hasPerm('/file/approve/agree')" size="small" type="primary" link :disabled="row.approvalStatusName !== '待审批'" @click="approval('agree', row.taskId)">
-                    同意
-                  </el-button>
-                  <el-button v-if="proxy.hasPerm('/file/approve/reject')" size="small" type="primary" link :disabled="row.approvalStatusName !== '待审批' || row.decisionItem === 3" @click="approval('reject', row.taskId)">
-                    驳回
-                  </el-button>
-                  <el-button v-if="proxy.hasPerm('/file/approve/refuse')" size="small" type="primary" link :disabled="row.approvalStatusName !== '待审批' || row.decisionItem === 1 || row.decisionItem === 2" @click="approval('refuse', row.taskId)">
-                    拒绝
-                  </el-button>
-                </template>
-                <el-button v-if="proxy.hasPerm('/file/approve/cancle') && ['审批中', '全部'].includes(activeTitle)" size="small" type="primary" :disabled="row.approvalStatusName !== '审批中'" link @click="cancel(row)">
+                <el-button
+                  v-if="proxy.buttonPerm.agree.if(row, '/file/approve/agree')"
+                  size="small"
+                  type="primary" link :disabled="proxy.buttonPerm.agree.disabled(row)"
+                  @click="approval('agree', row.taskId)"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.reject.if(row, '/file/approve/reject')"
+                  size="small"
+                  type="primary" link
+                  :disabled="proxy.buttonPerm.reject.disabled(row)"
+                  @click="approval('reject', row.taskId)"
+                >
+                  驳回
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.refuse.if(row, '/file/approve/refuse')"
+                  size="small" type="primary" link
+                  :disabled="proxy.buttonPerm.refuse.disabled(row)"
+                  @click="approval('refuse', row.taskId)"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.cancel.if(row, '/file/approve/cancel')"
+                  :disabled="proxy.buttonPerm.cancel.disabled(row)"
+                  size="small" type="primary"
+                  link @click="cancel(row)"
+                >
                   取消
                 </el-button>
-                <el-button v-if="proxy.hasPerm('/file/approve/delete') && !['已通过', '未通过'].includes(activeTitle)" size="small" type="danger" link @click="remove(row)">
+                <el-button
+                  v-if="proxy.buttonPerm.delete.if(row, '/file/approve/delete')"
+                  :disabled="proxy.buttonPerm.delete.disabled(row)" size="small" type="danger" link
+                  @click="remove(row)"
+                >
                   删除
                 </el-button>
               </template>

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index 4301f6f..92ad9b6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -23,6 +23,15 @@
   })
 }
 
+// 部门检测我的检测详情
+export function executiveDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/executive/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
@@ -63,7 +72,25 @@
 // 退回(待检测/检测中->退回)
 export function sendBackProcess(data: ISendBack) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/executive/sendBack',
+    method: 'post',
+    data,
+  })
+}
+
+// 收入（待检测->检测中）->收入)
+export function myExecutiveReceive(data: object) {
+  return request({
+    url: '/business/labExecutive/myExecutive/receive',
+    method: 'post',
+    data,
+  })
+}
+
+// 分配
+export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+  return request({
+    url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
     data,
   })
diff --git a/src/main.ts b/src/main.ts
index 695df5c..3cf24ef 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -16,13 +16,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
+import buttonPerm from '@/utils/buttonPerm'
 // 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
-
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.config.globalProperties.buttonPerm = buttonPerm
 app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
new file mode 100644
index 0000000..205d84a
--- /dev/null
+++ b/src/utils/buttonPerm.ts
@@ -0,0 +1,66 @@
+import { hasPermission } from '@/utils/composables/permission'
+
+function error(permPath: string) {
+  if (permPath === undefined) {
+    throw new Error('Button permission url is required!!!')
+  }
+}
+
+export default {
+  agree: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  reject: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  refuse: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  edit: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && (row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消')
+    },
+  },
+  submit: {
+    if: (row: any) => {
+      row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
+    },
+  },
+  cancel: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '审批中'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '审批中'
+    },
+  },
+  delete: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
+    },
+  },
+}
diff --git a/src/utils/download.ts b/src/utils/download.ts
new file mode 100644
index 0000000..d70f539
--- /dev/null
+++ b/src/utils/download.ts
@@ -0,0 +1,149 @@
+/**
+ * 下载本地图片 href为 127.0.0.1/xxxx
+ * @param href 图片地址
+ * @param name 图片名称
+ */
+function downloadImg(href: string, name: string) {
+  const eleLink = document.createElement('a')
+  eleLink.download = name
+  eleLink.href = href
+  eleLink.click()
+  eleLink.remove()
+}
+
+/**
+ * 下载文件
+ * @param file 文件对象
+ * @param name 图片名称
+ */
+export function downloadFile(file: File, name: string) {
+  console.log(new Blob([file]), 'new Blob([file])')
+  const objectUrl = URL.createObjectURL(new Blob([file]))
+  const link = document.createElement('a')
+  link.download = name
+  link.href = objectUrl
+  link.click()
+  link.remove()
+  window.URL.revokeObjectURL(link.href)
+}
+// 各种文件类型的type
+export const fileType: { [key: string]: string } = {
+  pdf: 'application/pdf',
+  doc: 'application/doc',
+  docx: 'application/docx',
+  excel: 'application/excel',
+  ppt: 'application/vnd.ms-powerpoint',
+  dir: 'application/x-director',
+  js: 'application/x-javascript',
+  swf: 'application/x-shockwave-flash',
+  xhtml: 'application/xhtml+xml',
+  xht: 'application/xhtml+xml',
+  zip: 'application/zip',
+  mid: 'audio/midi',
+  midi: 'audio/midi',
+  mp3: 'audio/mpeg',
+  rm: 'audio/x-pn-realaudio',
+  rpm: 'audio/x-pn-realaudio-plugin',
+  wav: 'audio/x-wav',
+  bmp: 'image/bmp',
+  gif: 'image/gif',
+  jpeg: 'image/jpeg',
+  jpg: 'image/jpeg',
+  png: 'image/png',
+  css: 'text/css',
+  html: 'text/html',
+  htm: 'text/html',
+  txt: 'text/plain',
+  xsl: 'text/xml',
+  xml: 'text/xml',
+  mpeg: 'video/mpeg',
+  mpg: 'video/mpeg',
+  avi: 'video/x-msvideo',
+  movie: 'video/x-sgi-movie',
+}
+/**
+ * 将网络文件地址转化为文件对象
+ * @param url 文件地址
+ * @param fileName 文件名称
+ */
+export function getFileFromUrl(url: string, fileName: string) {
+  return new Promise((resolve, reject) => {
+    var blob = null
+    var xhr = new XMLHttpRequest()
+    xhr.open('GET', url)
+    const urlFileType = url.split('.')[url.split('.').length - 1]
+    xhr.setRequestHeader('Accept', fileType[urlFileType])
+    xhr.responseType = 'blob'
+    // 加载时处理
+    xhr.onload = () => {
+      // 获取返回结果
+      blob = xhr.response
+      const file = new File([blob], fileName, { type: fileType[urlFileType] })
+      // 返回结果
+      resolve(file)
+    }
+    xhr.onerror = (e) => {
+      reject(e)
+    }
+    // 发送
+    xhr.send()
+  })
+}
+/**
+ * 将网络地址转化为 blob地址 并下载
+ * @param url 文件地址
+ * @param fileName 文件名称
+ */
+export function urlToBlob(url: string, name: string) {
+  const xhr = new XMLHttpRequest()
+  xhr.open('get', url)
+  xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
+  xhr.onload = function () {
+    const path = URL.createObjectURL(xhr.response)
+    const link = document.createElement('a')
+    link.download = name
+    link.href = path
+    link.click()
+    link.remove()
+    window.URL.revokeObjectURL(link.href)
+  }
+  xhr.send()
+}
+
+/**
+ * 下载文件 各种文件
+ * @param url 网络文件地址
+ * @param name  文件名
+ */
+export function download(url: string, name: string) {
+  // 下载图片
+  const photo = ['jpg', 'jpeg', 'png']
+  const fileType = url.split('.')[url.split('.').length - 1]
+  console.log(fileType, 'fileType')
+  if (photo.includes(fileType)) {
+    // 图片 将服务器图片地址转化成本地地址
+    const image = new Image()
+    image.setAttribute('crossOrigin', 'anonymous')
+    image.src = url
+    image.onload = () => {
+      const canvas = document.createElement('canvas')
+      canvas.width = image.width
+      canvas.height = image.height
+      const ctx = canvas.getContext('2d');
+      (ctx as CanvasRenderingContext2D).drawImage(image, 0, 0, image.width, image.height)
+      canvas.toBlob((blob) => {
+        const url = URL.createObjectURL(blob as Blob)
+        downloadImg(url, name)
+        // 用完释放URL对象
+        URL.revokeObjectURL(url)
+      })
+    }
+  }
+  else {
+    // 预览一般都是用的a标签，文件下载用的window.open
+    // 1.pdf文件路径放到window.open里面，点击是进行在线预览
+    // 2.word文件和excel文件通过a标签打开时，是直接下载了
+    // 将网络地址转化为 blob地址 并下载
+    urlToBlob(url, name)
+  }
+}
diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue
index 628f3ca..92c45f1 100644
--- a/src/views/business/lab/components/distributeDialog.vue
+++ b/src/views/business/lab/components/distributeDialog.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts" name="DistributeDialog">
 import { Aim } from '@element-plus/icons-vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
+import { allocate, executiveDetail } from '@/api/business/schedule/task'
 // 实验室任务分发弹窗
 
 // 自定义方法：close关闭弹窗
@@ -18,14 +20,13 @@
     certificationTypes.value = response.data
   })
 }
-
-getDict()
 // 样品详情
 const sampleDetail = ref({
-  sampleName: '压力表',
-  mesureContent: '压力、ip68',
-  certifications: ['1', '2'],
-  remark: '这是备注',
+  sampleName: '',
+  measureContent: '',
+  certifications: [] as any,
+  remark: '',
+  laboratoryId: '',
 })
 
 const processNode = ref({
@@ -47,13 +48,23 @@
   distributeTime: '', // 分配时间
   startTime: '', // 检测开始时间
   overTime: '', // 检测结束时间
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', // 实验室id
 })
 
 // 初始化弹窗
-const initDialog = (sampleid: string, orderid: string) => {
+const initDialog = (id: string, sampleid: string, orderid: string) => {
   dialogVisible.value = true
   sampleId.value = sampleid
   orderId.value = orderid
+  executiveDetail({ orderId: orderid, sampleId: sampleid }).then((res) => {
+    if (res.data) {
+      sampleDetail.value = res.data
+      sampleDetail.value.laboratoryId = id
+      // 证书类别
+      sampleDetail.value.certifications = res.data.certifications.split(',')
+    }
+  })
 }
 
 // 选择人员
@@ -62,21 +73,39 @@
   choosePersonShow.value = true
 }
 // 人员选择完毕
-const choosePersonOver = (person: { id: string; name: string }) => {
+const choosePersonOver = (person: { id: string; name: string; measurePersonId: string; measureSegmentId: string }) => {
+  console.log(person)
   processNode.value.executivePerson = person.id
   processNode.value.executivePersonName = person.name
+  processNode.value.measurePersonId = person.measurePersonId
+  processNode.value.measureSegmentId = person.measureSegmentId
   choosePersonShow.value = false
 }
 
 // 流程配置组件
 const processConfigRef = ref()
-// 保存流程按钮点击
+// 保存流程按钮点击分配
 const saveProcess = () => {
+  // ctx.emit('fetchData') // fatherMethod 是想要调用父组件的一个方法
+
+  const postData = {
+    id: sampleDetail.value.laboratoryId, // 实验室检测id
+    measurePersonId: processNode.value.executivePerson, // 分配检定人员id（在本部门下的计量人员列表中选择）
+    requireCertifications: processNode.value.requireCertifications, // 应出具证书总数
+  }
+  allocate(postData).then((res: { code: number }) => {
+    if (res.code == 200) {
+      ElMessage.success('分配成功')
+    }
+  })
   emit('close')
 }
+
 function cancel() {
   dialogVisible.value = false
 }
+getDict()
+
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
 </script>
@@ -98,7 +127,7 @@
       </div>
       <div class="simple-info-line">
         <span class="label">检定项目:</span>
-        <el-input v-model="sampleDetail.mesureContent" disabled style="width: 480px;" />
+        <el-input v-model="sampleDetail.measureContent" disabled style="width: 480px;" />
       </div>
       <div class="simple-info-line">
         <span class="label">备注:</span>
@@ -119,7 +148,7 @@
     </div>
     <template #footer>
       <el-button type="primary" @click="saveProcess">
-        确定
+        分配
       </el-button>
       <el-button @click="cancel">
         取消
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index 553d2ec..0a7022a 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -47,7 +47,7 @@
 function initDialog(row: IlabMeasureList) {
   formData.id = row.id
   formData.measurePersonId = row.measurePersonId
-  formData.measureSegmentId = row.measureSegmentId
+  formData.measureSegmentId = row.currentSegmentId
   formData.orderId = row.orderId
   formData.sampleId = row.sampleId
   formData.operateReason = ''
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index eb4b260..e849fd3 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -135,7 +135,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index c604d3e..d998c13 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -10,9 +10,10 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { getMyMeasureList } from '@/api/business/schedule/task'
+import { getMyMeasureList, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -157,12 +158,12 @@
 
 // 导出
 const exportAll = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
   if (list.value.length > 0) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: '下载中请稍后',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     // const params = {
     //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
     //   customerName: listQuery.value.customerName, // 公司名称
@@ -174,11 +175,11 @@
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '任务分发列表.xlsx')
     // })
+    loading.close()
   }
   else {
-    ElMessage.warning('无数据可导出数据')
+    ElMessage.warning('无数据可导出')
   }
-  loading.close()
 }
 
 // 打印列表
@@ -222,6 +223,11 @@
     { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
   ).then(() => {
     // 收入样品
+    myExecutiveReceive([{ orderId: row.orderId, sampleId: row.sampleId }]).then((res) => {
+      if (res.code == 200) {
+        ElMessage.success('收入成功')
+      }
+    })
   })
 }
 
@@ -278,7 +284,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 as string // 待检测
   }
   nextTick(() => {
     fetchData(true)
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index aa481ea..6503a12 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -51,6 +51,7 @@
   requireCertifications: number // 应出具证书总数
   distributeState: string // 分发性质-初次分发、退回分发
   handOutProperty: string // 分发性质-初次分发、退回分发
+  id?: string // 实验室id
 }
 
 // 实验室检测/我的检测列表
@@ -58,6 +59,7 @@
   id: string // 实验室检测id
   measurePersonId: string // 检测人id
   measureSegmentId: string // 检测部门id
+  currentSegmentId: string // 检测部门id (新)
 }
 
 // 全部检测流程节点
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 44876b7..fb29410 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -299,18 +299,13 @@
         </search-item>
         <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2" placeholder="文件类别" clearable>
-            <el-option
-              v-for="item in fileTypeList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
+            <el-option v-for="item in fileTypeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="创建时间"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss" placeholder="创建时间"
           />
         </search-item>
         <search-item>
@@ -320,19 +315,17 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/file/approve/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button
+            v-if="proxy.hasPerm('/file/approve/export')" icon="icon-export" title="导出"
+            @click="exportExcelBtn"
+          />
           <icon-button v-if="proxy.hasPerm('/file/approve/print')" icon="icon-print" title="打印" @click="printList" />
         </template>
         <!-- 表格区域 -->
         <normal-table
-          id="print"
-          :data="list" :total="total" :columns="columns"
-          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-          :list-loading="loadingTable"
-          :is-showmulti-select="true"
-          :is-multi="true"
-          @change="changePage"
-          @multi-select="multiSelect"
+          id="print" :data="list" :total="total" :columns="columns"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
+          :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -347,27 +340,56 @@
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button v-if="proxy.hasPerm('/file/approve/edit') && ['草稿箱', '已取消'].includes(activeTitle)" size="small" type="primary" link @click="edit(row)">
+                <el-button
+                  v-if="proxy.buttonPerm.edit.if(row, '/file/approve/edit')"
+                  size="small" type="primary" link @click="edit(row)"
+                >
                   编辑
                 </el-button>
-                <el-button v-if="proxy.hasPerm('/file/approve/edit') && ['草稿箱', '已取消'].includes(activeTitle)" size="small" type="primary" link @click="submit(row)">
+                <el-button
+                  v-if="proxy.buttonPerm.submit.if(row)"
+                  @click="submit(row)"
+                >
                   提交
                 </el-button>
-                <template v-if="['全部', '待审批'].includes(activeTitle)">
-                  <el-button v-if="proxy.hasPerm('/file/approve/agree')" size="small" type="primary" link :disabled="row.approvalStatusName !== '待审批'" @click="approval('agree', row.taskId)">
-                    同意
-                  </el-button>
-                  <el-button v-if="proxy.hasPerm('/file/approve/reject')" size="small" type="primary" link :disabled="row.approvalStatusName !== '待审批' || row.decisionItem === 3" @click="approval('reject', row.taskId)">
-                    驳回
-                  </el-button>
-                  <el-button v-if="proxy.hasPerm('/file/approve/refuse')" size="small" type="primary" link :disabled="row.approvalStatusName !== '待审批' || row.decisionItem === 1 || row.decisionItem === 2" @click="approval('refuse', row.taskId)">
-                    拒绝
-                  </el-button>
-                </template>
-                <el-button v-if="proxy.hasPerm('/file/approve/cancle') && ['审批中', '全部'].includes(activeTitle)" size="small" type="primary" :disabled="row.approvalStatusName !== '审批中'" link @click="cancel(row)">
+                <el-button
+                  v-if="proxy.buttonPerm.agree.if(row, '/file/approve/agree')"
+                  size="small"
+                  type="primary" link :disabled="proxy.buttonPerm.agree.disabled(row)"
+                  @click="approval('agree', row.taskId)"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.reject.if(row, '/file/approve/reject')"
+                  size="small"
+                  type="primary" link
+                  :disabled="proxy.buttonPerm.reject.disabled(row)"
+                  @click="approval('reject', row.taskId)"
+                >
+                  驳回
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.refuse.if(row, '/file/approve/refuse')"
+                  size="small" type="primary" link
+                  :disabled="proxy.buttonPerm.refuse.disabled(row)"
+                  @click="approval('refuse', row.taskId)"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.cancel.if(row, '/file/approve/cancel')"
+                  :disabled="proxy.buttonPerm.cancel.disabled(row)"
+                  size="small" type="primary"
+                  link @click="cancel(row)"
+                >
                   取消
                 </el-button>
-                <el-button v-if="proxy.hasPerm('/file/approve/delete') && !['已通过', '未通过'].includes(activeTitle)" size="small" type="danger" link @click="remove(row)">
+                <el-button
+                  v-if="proxy.buttonPerm.delete.if(row, '/file/approve/delete')"
+                  :disabled="proxy.buttonPerm.delete.disabled(row)" size="small" type="danger" link
+                  @click="remove(row)"
+                >
                   删除
                 </el-button>
               </template>
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index e56f293..d856aff 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -92,7 +92,7 @@
     // })
   }
   ruleForm.templateType = row.templateType
-  getuser()
+  // getuser()
 }
 defineExpose({ initDialog })
 // 关闭弹窗

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index 4301f6f..92ad9b6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -23,6 +23,15 @@
   })
 }
 
+// 部门检测我的检测详情
+export function executiveDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/executive/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
@@ -63,7 +72,25 @@
 // 退回(待检测/检测中->退回)
 export function sendBackProcess(data: ISendBack) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/executive/sendBack',
+    method: 'post',
+    data,
+  })
+}
+
+// 收入（待检测->检测中）->收入)
+export function myExecutiveReceive(data: object) {
+  return request({
+    url: '/business/labExecutive/myExecutive/receive',
+    method: 'post',
+    data,
+  })
+}
+
+// 分配
+export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+  return request({
+    url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
     data,
   })
diff --git a/src/main.ts b/src/main.ts
index 695df5c..3cf24ef 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -16,13 +16,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
+import buttonPerm from '@/utils/buttonPerm'
 // 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
-
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.config.globalProperties.buttonPerm = buttonPerm
 app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
new file mode 100644
index 0000000..205d84a
--- /dev/null
+++ b/src/utils/buttonPerm.ts
@@ -0,0 +1,66 @@
+import { hasPermission } from '@/utils/composables/permission'
+
+function error(permPath: string) {
+  if (permPath === undefined) {
+    throw new Error('Button permission url is required!!!')
+  }
+}
+
+export default {
+  agree: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  reject: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  refuse: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  edit: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && (row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消')
+    },
+  },
+  submit: {
+    if: (row: any) => {
+      row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
+    },
+  },
+  cancel: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '审批中'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '审批中'
+    },
+  },
+  delete: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
+    },
+  },
+}
diff --git a/src/utils/download.ts b/src/utils/download.ts
new file mode 100644
index 0000000..d70f539
--- /dev/null
+++ b/src/utils/download.ts
@@ -0,0 +1,149 @@
+/**
+ * 下载本地图片 href为 127.0.0.1/xxxx
+ * @param href 图片地址
+ * @param name 图片名称
+ */
+function downloadImg(href: string, name: string) {
+  const eleLink = document.createElement('a')
+  eleLink.download = name
+  eleLink.href = href
+  eleLink.click()
+  eleLink.remove()
+}
+
+/**
+ * 下载文件
+ * @param file 文件对象
+ * @param name 图片名称
+ */
+export function downloadFile(file: File, name: string) {
+  console.log(new Blob([file]), 'new Blob([file])')
+  const objectUrl = URL.createObjectURL(new Blob([file]))
+  const link = document.createElement('a')
+  link.download = name
+  link.href = objectUrl
+  link.click()
+  link.remove()
+  window.URL.revokeObjectURL(link.href)
+}
+// 各种文件类型的type
+export const fileType: { [key: string]: string } = {
+  pdf: 'application/pdf',
+  doc: 'application/doc',
+  docx: 'application/docx',
+  excel: 'application/excel',
+  ppt: 'application/vnd.ms-powerpoint',
+  dir: 'application/x-director',
+  js: 'application/x-javascript',
+  swf: 'application/x-shockwave-flash',
+  xhtml: 'application/xhtml+xml',
+  xht: 'application/xhtml+xml',
+  zip: 'application/zip',
+  mid: 'audio/midi',
+  midi: 'audio/midi',
+  mp3: 'audio/mpeg',
+  rm: 'audio/x-pn-realaudio',
+  rpm: 'audio/x-pn-realaudio-plugin',
+  wav: 'audio/x-wav',
+  bmp: 'image/bmp',
+  gif: 'image/gif',
+  jpeg: 'image/jpeg',
+  jpg: 'image/jpeg',
+  png: 'image/png',
+  css: 'text/css',
+  html: 'text/html',
+  htm: 'text/html',
+  txt: 'text/plain',
+  xsl: 'text/xml',
+  xml: 'text/xml',
+  mpeg: 'video/mpeg',
+  mpg: 'video/mpeg',
+  avi: 'video/x-msvideo',
+  movie: 'video/x-sgi-movie',
+}
+/**
+ * 将网络文件地址转化为文件对象
+ * @param url 文件地址
+ * @param fileName 文件名称
+ */
+export function getFileFromUrl(url: string, fileName: string) {
+  return new Promise((resolve, reject) => {
+    var blob = null
+    var xhr = new XMLHttpRequest()
+    xhr.open('GET', url)
+    const urlFileType = url.split('.')[url.split('.').length - 1]
+    xhr.setRequestHeader('Accept', fileType[urlFileType])
+    xhr.responseType = 'blob'
+    // 加载时处理
+    xhr.onload = () => {
+      // 获取返回结果
+      blob = xhr.response
+      const file = new File([blob], fileName, { type: fileType[urlFileType] })
+      // 返回结果
+      resolve(file)
+    }
+    xhr.onerror = (e) => {
+      reject(e)
+    }
+    // 发送
+    xhr.send()
+  })
+}
+/**
+ * 将网络地址转化为 blob地址 并下载
+ * @param url 文件地址
+ * @param fileName 文件名称
+ */
+export function urlToBlob(url: string, name: string) {
+  const xhr = new XMLHttpRequest()
+  xhr.open('get', url)
+  xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
+  xhr.onload = function () {
+    const path = URL.createObjectURL(xhr.response)
+    const link = document.createElement('a')
+    link.download = name
+    link.href = path
+    link.click()
+    link.remove()
+    window.URL.revokeObjectURL(link.href)
+  }
+  xhr.send()
+}
+
+/**
+ * 下载文件 各种文件
+ * @param url 网络文件地址
+ * @param name  文件名
+ */
+export function download(url: string, name: string) {
+  // 下载图片
+  const photo = ['jpg', 'jpeg', 'png']
+  const fileType = url.split('.')[url.split('.').length - 1]
+  console.log(fileType, 'fileType')
+  if (photo.includes(fileType)) {
+    // 图片 将服务器图片地址转化成本地地址
+    const image = new Image()
+    image.setAttribute('crossOrigin', 'anonymous')
+    image.src = url
+    image.onload = () => {
+      const canvas = document.createElement('canvas')
+      canvas.width = image.width
+      canvas.height = image.height
+      const ctx = canvas.getContext('2d');
+      (ctx as CanvasRenderingContext2D).drawImage(image, 0, 0, image.width, image.height)
+      canvas.toBlob((blob) => {
+        const url = URL.createObjectURL(blob as Blob)
+        downloadImg(url, name)
+        // 用完释放URL对象
+        URL.revokeObjectURL(url)
+      })
+    }
+  }
+  else {
+    // 预览一般都是用的a标签，文件下载用的window.open
+    // 1.pdf文件路径放到window.open里面，点击是进行在线预览
+    // 2.word文件和excel文件通过a标签打开时，是直接下载了
+    // 将网络地址转化为 blob地址 并下载
+    urlToBlob(url, name)
+  }
+}
diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue
index 628f3ca..92c45f1 100644
--- a/src/views/business/lab/components/distributeDialog.vue
+++ b/src/views/business/lab/components/distributeDialog.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts" name="DistributeDialog">
 import { Aim } from '@element-plus/icons-vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
+import { allocate, executiveDetail } from '@/api/business/schedule/task'
 // 实验室任务分发弹窗
 
 // 自定义方法：close关闭弹窗
@@ -18,14 +20,13 @@
     certificationTypes.value = response.data
   })
 }
-
-getDict()
 // 样品详情
 const sampleDetail = ref({
-  sampleName: '压力表',
-  mesureContent: '压力、ip68',
-  certifications: ['1', '2'],
-  remark: '这是备注',
+  sampleName: '',
+  measureContent: '',
+  certifications: [] as any,
+  remark: '',
+  laboratoryId: '',
 })
 
 const processNode = ref({
@@ -47,13 +48,23 @@
   distributeTime: '', // 分配时间
   startTime: '', // 检测开始时间
   overTime: '', // 检测结束时间
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', // 实验室id
 })
 
 // 初始化弹窗
-const initDialog = (sampleid: string, orderid: string) => {
+const initDialog = (id: string, sampleid: string, orderid: string) => {
   dialogVisible.value = true
   sampleId.value = sampleid
   orderId.value = orderid
+  executiveDetail({ orderId: orderid, sampleId: sampleid }).then((res) => {
+    if (res.data) {
+      sampleDetail.value = res.data
+      sampleDetail.value.laboratoryId = id
+      // 证书类别
+      sampleDetail.value.certifications = res.data.certifications.split(',')
+    }
+  })
 }
 
 // 选择人员
@@ -62,21 +73,39 @@
   choosePersonShow.value = true
 }
 // 人员选择完毕
-const choosePersonOver = (person: { id: string; name: string }) => {
+const choosePersonOver = (person: { id: string; name: string; measurePersonId: string; measureSegmentId: string }) => {
+  console.log(person)
   processNode.value.executivePerson = person.id
   processNode.value.executivePersonName = person.name
+  processNode.value.measurePersonId = person.measurePersonId
+  processNode.value.measureSegmentId = person.measureSegmentId
   choosePersonShow.value = false
 }
 
 // 流程配置组件
 const processConfigRef = ref()
-// 保存流程按钮点击
+// 保存流程按钮点击分配
 const saveProcess = () => {
+  // ctx.emit('fetchData') // fatherMethod 是想要调用父组件的一个方法
+
+  const postData = {
+    id: sampleDetail.value.laboratoryId, // 实验室检测id
+    measurePersonId: processNode.value.executivePerson, // 分配检定人员id（在本部门下的计量人员列表中选择）
+    requireCertifications: processNode.value.requireCertifications, // 应出具证书总数
+  }
+  allocate(postData).then((res: { code: number }) => {
+    if (res.code == 200) {
+      ElMessage.success('分配成功')
+    }
+  })
   emit('close')
 }
+
 function cancel() {
   dialogVisible.value = false
 }
+getDict()
+
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
 </script>
@@ -98,7 +127,7 @@
       </div>
       <div class="simple-info-line">
         <span class="label">检定项目:</span>
-        <el-input v-model="sampleDetail.mesureContent" disabled style="width: 480px;" />
+        <el-input v-model="sampleDetail.measureContent" disabled style="width: 480px;" />
       </div>
       <div class="simple-info-line">
         <span class="label">备注:</span>
@@ -119,7 +148,7 @@
     </div>
     <template #footer>
       <el-button type="primary" @click="saveProcess">
-        确定
+        分配
       </el-button>
       <el-button @click="cancel">
         取消
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index 553d2ec..0a7022a 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -47,7 +47,7 @@
 function initDialog(row: IlabMeasureList) {
   formData.id = row.id
   formData.measurePersonId = row.measurePersonId
-  formData.measureSegmentId = row.measureSegmentId
+  formData.measureSegmentId = row.currentSegmentId
   formData.orderId = row.orderId
   formData.sampleId = row.sampleId
   formData.operateReason = ''
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index eb4b260..e849fd3 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -135,7 +135,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index c604d3e..d998c13 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -10,9 +10,10 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { getMyMeasureList } from '@/api/business/schedule/task'
+import { getMyMeasureList, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -157,12 +158,12 @@
 
 // 导出
 const exportAll = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
   if (list.value.length > 0) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: '下载中请稍后',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     // const params = {
     //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
     //   customerName: listQuery.value.customerName, // 公司名称
@@ -174,11 +175,11 @@
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '任务分发列表.xlsx')
     // })
+    loading.close()
   }
   else {
-    ElMessage.warning('无数据可导出数据')
+    ElMessage.warning('无数据可导出')
   }
-  loading.close()
 }
 
 // 打印列表
@@ -222,6 +223,11 @@
     { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
   ).then(() => {
     // 收入样品
+    myExecutiveReceive([{ orderId: row.orderId, sampleId: row.sampleId }]).then((res) => {
+      if (res.code == 200) {
+        ElMessage.success('收入成功')
+      }
+    })
   })
 }
 
@@ -278,7 +284,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 as string // 待检测
   }
   nextTick(() => {
     fetchData(true)
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index aa481ea..6503a12 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -51,6 +51,7 @@
   requireCertifications: number // 应出具证书总数
   distributeState: string // 分发性质-初次分发、退回分发
   handOutProperty: string // 分发性质-初次分发、退回分发
+  id?: string // 实验室id
 }
 
 // 实验室检测/我的检测列表
@@ -58,6 +59,7 @@
   id: string // 实验室检测id
   measurePersonId: string // 检测人id
   measureSegmentId: string // 检测部门id
+  currentSegmentId: string // 检测部门id (新)
 }
 
 // 全部检测流程节点
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 44876b7..fb29410 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -299,18 +299,13 @@
         </search-item>
         <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2" placeholder="文件类别" clearable>
-            <el-option
-              v-for="item in fileTypeList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
+            <el-option v-for="item in fileTypeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="创建时间"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss" placeholder="创建时间"
           />
         </search-item>
         <search-item>
@@ -320,19 +315,17 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/file/approve/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button
+            v-if="proxy.hasPerm('/file/approve/export')" icon="icon-export" title="导出"
+            @click="exportExcelBtn"
+          />
           <icon-button v-if="proxy.hasPerm('/file/approve/print')" icon="icon-print" title="打印" @click="printList" />
         </template>
         <!-- 表格区域 -->
         <normal-table
-          id="print"
-          :data="list" :total="total" :columns="columns"
-          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-          :list-loading="loadingTable"
-          :is-showmulti-select="true"
-          :is-multi="true"
-          @change="changePage"
-          @multi-select="multiSelect"
+          id="print" :data="list" :total="total" :columns="columns"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
+          :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -347,27 +340,56 @@
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button v-if="proxy.hasPerm('/file/approve/edit') && ['草稿箱', '已取消'].includes(activeTitle)" size="small" type="primary" link @click="edit(row)">
+                <el-button
+                  v-if="proxy.buttonPerm.edit.if(row, '/file/approve/edit')"
+                  size="small" type="primary" link @click="edit(row)"
+                >
                   编辑
                 </el-button>
-                <el-button v-if="proxy.hasPerm('/file/approve/edit') && ['草稿箱', '已取消'].includes(activeTitle)" size="small" type="primary" link @click="submit(row)">
+                <el-button
+                  v-if="proxy.buttonPerm.submit.if(row)"
+                  @click="submit(row)"
+                >
                   提交
                 </el-button>
-                <template v-if="['全部', '待审批'].includes(activeTitle)">
-                  <el-button v-if="proxy.hasPerm('/file/approve/agree')" size="small" type="primary" link :disabled="row.approvalStatusName !== '待审批'" @click="approval('agree', row.taskId)">
-                    同意
-                  </el-button>
-                  <el-button v-if="proxy.hasPerm('/file/approve/reject')" size="small" type="primary" link :disabled="row.approvalStatusName !== '待审批' || row.decisionItem === 3" @click="approval('reject', row.taskId)">
-                    驳回
-                  </el-button>
-                  <el-button v-if="proxy.hasPerm('/file/approve/refuse')" size="small" type="primary" link :disabled="row.approvalStatusName !== '待审批' || row.decisionItem === 1 || row.decisionItem === 2" @click="approval('refuse', row.taskId)">
-                    拒绝
-                  </el-button>
-                </template>
-                <el-button v-if="proxy.hasPerm('/file/approve/cancle') && ['审批中', '全部'].includes(activeTitle)" size="small" type="primary" :disabled="row.approvalStatusName !== '审批中'" link @click="cancel(row)">
+                <el-button
+                  v-if="proxy.buttonPerm.agree.if(row, '/file/approve/agree')"
+                  size="small"
+                  type="primary" link :disabled="proxy.buttonPerm.agree.disabled(row)"
+                  @click="approval('agree', row.taskId)"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.reject.if(row, '/file/approve/reject')"
+                  size="small"
+                  type="primary" link
+                  :disabled="proxy.buttonPerm.reject.disabled(row)"
+                  @click="approval('reject', row.taskId)"
+                >
+                  驳回
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.refuse.if(row, '/file/approve/refuse')"
+                  size="small" type="primary" link
+                  :disabled="proxy.buttonPerm.refuse.disabled(row)"
+                  @click="approval('refuse', row.taskId)"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.cancel.if(row, '/file/approve/cancel')"
+                  :disabled="proxy.buttonPerm.cancel.disabled(row)"
+                  size="small" type="primary"
+                  link @click="cancel(row)"
+                >
                   取消
                 </el-button>
-                <el-button v-if="proxy.hasPerm('/file/approve/delete') && !['已通过', '未通过'].includes(activeTitle)" size="small" type="danger" link @click="remove(row)">
+                <el-button
+                  v-if="proxy.buttonPerm.delete.if(row, '/file/approve/delete')"
+                  :disabled="proxy.buttonPerm.delete.disabled(row)" size="small" type="danger" link
+                  @click="remove(row)"
+                >
                   删除
                 </el-button>
               </template>
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index e56f293..d856aff 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -92,7 +92,7 @@
     // })
   }
   ruleForm.templateType = row.templateType
-  getuser()
+  // getuser()
 }
 defineExpose({ initDialog })
 // 关闭弹窗
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index 14b11aa..c4ad507 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+import { download } from '@/utils/download'
 const { proxy } = getCurrentInstance() as any
 const createTime = ref()
 const searchQuery = reactive({
@@ -141,7 +142,8 @@
   if (row.minioFileName) {
     getPhotoUrl(row.minioFileName).then((res) => {
       fileUrl.value = res.data
-      fileUrl.value ? downRef.value.click() : ElMessage('无可下载内容')
+      // fileUrl.value ? downRef.value.click() : ElMessage('无可下载内容')
+      download(res.data, row.templateName as string)
     }).catch(() => {
       ElMessage.error('下载失败')
     })

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index 4301f6f..92ad9b6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -23,6 +23,15 @@
   })
 }
 
+// 部门检测我的检测详情
+export function executiveDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/executive/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
@@ -63,7 +72,25 @@
 // 退回(待检测/检测中->退回)
 export function sendBackProcess(data: ISendBack) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/executive/sendBack',
+    method: 'post',
+    data,
+  })
+}
+
+// 收入（待检测->检测中）->收入)
+export function myExecutiveReceive(data: object) {
+  return request({
+    url: '/business/labExecutive/myExecutive/receive',
+    method: 'post',
+    data,
+  })
+}
+
+// 分配
+export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+  return request({
+    url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
     data,
   })
diff --git a/src/main.ts b/src/main.ts
index 695df5c..3cf24ef 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -16,13 +16,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
+import buttonPerm from '@/utils/buttonPerm'
 // 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
-
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.config.globalProperties.buttonPerm = buttonPerm
 app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
new file mode 100644
index 0000000..205d84a
--- /dev/null
+++ b/src/utils/buttonPerm.ts
@@ -0,0 +1,66 @@
+import { hasPermission } from '@/utils/composables/permission'
+
+function error(permPath: string) {
+  if (permPath === undefined) {
+    throw new Error('Button permission url is required!!!')
+  }
+}
+
+export default {
+  agree: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  reject: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  refuse: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  edit: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && (row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消')
+    },
+  },
+  submit: {
+    if: (row: any) => {
+      row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
+    },
+  },
+  cancel: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '审批中'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '审批中'
+    },
+  },
+  delete: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
+    },
+  },
+}
diff --git a/src/utils/download.ts b/src/utils/download.ts
new file mode 100644
index 0000000..d70f539
--- /dev/null
+++ b/src/utils/download.ts
@@ -0,0 +1,149 @@
+/**
+ * 下载本地图片 href为 127.0.0.1/xxxx
+ * @param href 图片地址
+ * @param name 图片名称
+ */
+function downloadImg(href: string, name: string) {
+  const eleLink = document.createElement('a')
+  eleLink.download = name
+  eleLink.href = href
+  eleLink.click()
+  eleLink.remove()
+}
+
+/**
+ * 下载文件
+ * @param file 文件对象
+ * @param name 图片名称
+ */
+export function downloadFile(file: File, name: string) {
+  console.log(new Blob([file]), 'new Blob([file])')
+  const objectUrl = URL.createObjectURL(new Blob([file]))
+  const link = document.createElement('a')
+  link.download = name
+  link.href = objectUrl
+  link.click()
+  link.remove()
+  window.URL.revokeObjectURL(link.href)
+}
+// 各种文件类型的type
+export const fileType: { [key: string]: string } = {
+  pdf: 'application/pdf',
+  doc: 'application/doc',
+  docx: 'application/docx',
+  excel: 'application/excel',
+  ppt: 'application/vnd.ms-powerpoint',
+  dir: 'application/x-director',
+  js: 'application/x-javascript',
+  swf: 'application/x-shockwave-flash',
+  xhtml: 'application/xhtml+xml',
+  xht: 'application/xhtml+xml',
+  zip: 'application/zip',
+  mid: 'audio/midi',
+  midi: 'audio/midi',
+  mp3: 'audio/mpeg',
+  rm: 'audio/x-pn-realaudio',
+  rpm: 'audio/x-pn-realaudio-plugin',
+  wav: 'audio/x-wav',
+  bmp: 'image/bmp',
+  gif: 'image/gif',
+  jpeg: 'image/jpeg',
+  jpg: 'image/jpeg',
+  png: 'image/png',
+  css: 'text/css',
+  html: 'text/html',
+  htm: 'text/html',
+  txt: 'text/plain',
+  xsl: 'text/xml',
+  xml: 'text/xml',
+  mpeg: 'video/mpeg',
+  mpg: 'video/mpeg',
+  avi: 'video/x-msvideo',
+  movie: 'video/x-sgi-movie',
+}
+/**
+ * 将网络文件地址转化为文件对象
+ * @param url 文件地址
+ * @param fileName 文件名称
+ */
+export function getFileFromUrl(url: string, fileName: string) {
+  return new Promise((resolve, reject) => {
+    var blob = null
+    var xhr = new XMLHttpRequest()
+    xhr.open('GET', url)
+    const urlFileType = url.split('.')[url.split('.').length - 1]
+    xhr.setRequestHeader('Accept', fileType[urlFileType])
+    xhr.responseType = 'blob'
+    // 加载时处理
+    xhr.onload = () => {
+      // 获取返回结果
+      blob = xhr.response
+      const file = new File([blob], fileName, { type: fileType[urlFileType] })
+      // 返回结果
+      resolve(file)
+    }
+    xhr.onerror = (e) => {
+      reject(e)
+    }
+    // 发送
+    xhr.send()
+  })
+}
+/**
+ * 将网络地址转化为 blob地址 并下载
+ * @param url 文件地址
+ * @param fileName 文件名称
+ */
+export function urlToBlob(url: string, name: string) {
+  const xhr = new XMLHttpRequest()
+  xhr.open('get', url)
+  xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
+  xhr.onload = function () {
+    const path = URL.createObjectURL(xhr.response)
+    const link = document.createElement('a')
+    link.download = name
+    link.href = path
+    link.click()
+    link.remove()
+    window.URL.revokeObjectURL(link.href)
+  }
+  xhr.send()
+}
+
+/**
+ * 下载文件 各种文件
+ * @param url 网络文件地址
+ * @param name  文件名
+ */
+export function download(url: string, name: string) {
+  // 下载图片
+  const photo = ['jpg', 'jpeg', 'png']
+  const fileType = url.split('.')[url.split('.').length - 1]
+  console.log(fileType, 'fileType')
+  if (photo.includes(fileType)) {
+    // 图片 将服务器图片地址转化成本地地址
+    const image = new Image()
+    image.setAttribute('crossOrigin', 'anonymous')
+    image.src = url
+    image.onload = () => {
+      const canvas = document.createElement('canvas')
+      canvas.width = image.width
+      canvas.height = image.height
+      const ctx = canvas.getContext('2d');
+      (ctx as CanvasRenderingContext2D).drawImage(image, 0, 0, image.width, image.height)
+      canvas.toBlob((blob) => {
+        const url = URL.createObjectURL(blob as Blob)
+        downloadImg(url, name)
+        // 用完释放URL对象
+        URL.revokeObjectURL(url)
+      })
+    }
+  }
+  else {
+    // 预览一般都是用的a标签，文件下载用的window.open
+    // 1.pdf文件路径放到window.open里面，点击是进行在线预览
+    // 2.word文件和excel文件通过a标签打开时，是直接下载了
+    // 将网络地址转化为 blob地址 并下载
+    urlToBlob(url, name)
+  }
+}
diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue
index 628f3ca..92c45f1 100644
--- a/src/views/business/lab/components/distributeDialog.vue
+++ b/src/views/business/lab/components/distributeDialog.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts" name="DistributeDialog">
 import { Aim } from '@element-plus/icons-vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
+import { allocate, executiveDetail } from '@/api/business/schedule/task'
 // 实验室任务分发弹窗
 
 // 自定义方法：close关闭弹窗
@@ -18,14 +20,13 @@
     certificationTypes.value = response.data
   })
 }
-
-getDict()
 // 样品详情
 const sampleDetail = ref({
-  sampleName: '压力表',
-  mesureContent: '压力、ip68',
-  certifications: ['1', '2'],
-  remark: '这是备注',
+  sampleName: '',
+  measureContent: '',
+  certifications: [] as any,
+  remark: '',
+  laboratoryId: '',
 })
 
 const processNode = ref({
@@ -47,13 +48,23 @@
   distributeTime: '', // 分配时间
   startTime: '', // 检测开始时间
   overTime: '', // 检测结束时间
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', // 实验室id
 })
 
 // 初始化弹窗
-const initDialog = (sampleid: string, orderid: string) => {
+const initDialog = (id: string, sampleid: string, orderid: string) => {
   dialogVisible.value = true
   sampleId.value = sampleid
   orderId.value = orderid
+  executiveDetail({ orderId: orderid, sampleId: sampleid }).then((res) => {
+    if (res.data) {
+      sampleDetail.value = res.data
+      sampleDetail.value.laboratoryId = id
+      // 证书类别
+      sampleDetail.value.certifications = res.data.certifications.split(',')
+    }
+  })
 }
 
 // 选择人员
@@ -62,21 +73,39 @@
   choosePersonShow.value = true
 }
 // 人员选择完毕
-const choosePersonOver = (person: { id: string; name: string }) => {
+const choosePersonOver = (person: { id: string; name: string; measurePersonId: string; measureSegmentId: string }) => {
+  console.log(person)
   processNode.value.executivePerson = person.id
   processNode.value.executivePersonName = person.name
+  processNode.value.measurePersonId = person.measurePersonId
+  processNode.value.measureSegmentId = person.measureSegmentId
   choosePersonShow.value = false
 }
 
 // 流程配置组件
 const processConfigRef = ref()
-// 保存流程按钮点击
+// 保存流程按钮点击分配
 const saveProcess = () => {
+  // ctx.emit('fetchData') // fatherMethod 是想要调用父组件的一个方法
+
+  const postData = {
+    id: sampleDetail.value.laboratoryId, // 实验室检测id
+    measurePersonId: processNode.value.executivePerson, // 分配检定人员id（在本部门下的计量人员列表中选择）
+    requireCertifications: processNode.value.requireCertifications, // 应出具证书总数
+  }
+  allocate(postData).then((res: { code: number }) => {
+    if (res.code == 200) {
+      ElMessage.success('分配成功')
+    }
+  })
   emit('close')
 }
+
 function cancel() {
   dialogVisible.value = false
 }
+getDict()
+
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
 </script>
@@ -98,7 +127,7 @@
       </div>
       <div class="simple-info-line">
         <span class="label">检定项目:</span>
-        <el-input v-model="sampleDetail.mesureContent" disabled style="width: 480px;" />
+        <el-input v-model="sampleDetail.measureContent" disabled style="width: 480px;" />
       </div>
       <div class="simple-info-line">
         <span class="label">备注:</span>
@@ -119,7 +148,7 @@
     </div>
     <template #footer>
       <el-button type="primary" @click="saveProcess">
-        确定
+        分配
       </el-button>
       <el-button @click="cancel">
         取消
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index 553d2ec..0a7022a 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -47,7 +47,7 @@
 function initDialog(row: IlabMeasureList) {
   formData.id = row.id
   formData.measurePersonId = row.measurePersonId
-  formData.measureSegmentId = row.measureSegmentId
+  formData.measureSegmentId = row.currentSegmentId
   formData.orderId = row.orderId
   formData.sampleId = row.sampleId
   formData.operateReason = ''
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index eb4b260..e849fd3 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -135,7 +135,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index c604d3e..d998c13 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -10,9 +10,10 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { getMyMeasureList } from '@/api/business/schedule/task'
+import { getMyMeasureList, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -157,12 +158,12 @@
 
 // 导出
 const exportAll = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
   if (list.value.length > 0) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: '下载中请稍后',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     // const params = {
     //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
     //   customerName: listQuery.value.customerName, // 公司名称
@@ -174,11 +175,11 @@
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '任务分发列表.xlsx')
     // })
+    loading.close()
   }
   else {
-    ElMessage.warning('无数据可导出数据')
+    ElMessage.warning('无数据可导出')
   }
-  loading.close()
 }
 
 // 打印列表
@@ -222,6 +223,11 @@
     { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
   ).then(() => {
     // 收入样品
+    myExecutiveReceive([{ orderId: row.orderId, sampleId: row.sampleId }]).then((res) => {
+      if (res.code == 200) {
+        ElMessage.success('收入成功')
+      }
+    })
   })
 }
 
@@ -278,7 +284,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 as string // 待检测
   }
   nextTick(() => {
     fetchData(true)
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index aa481ea..6503a12 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -51,6 +51,7 @@
   requireCertifications: number // 应出具证书总数
   distributeState: string // 分发性质-初次分发、退回分发
   handOutProperty: string // 分发性质-初次分发、退回分发
+  id?: string // 实验室id
 }
 
 // 实验室检测/我的检测列表
@@ -58,6 +59,7 @@
   id: string // 实验室检测id
   measurePersonId: string // 检测人id
   measureSegmentId: string // 检测部门id
+  currentSegmentId: string // 检测部门id (新)
 }
 
 // 全部检测流程节点
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 44876b7..fb29410 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -299,18 +299,13 @@
         </search-item>
         <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2" placeholder="文件类别" clearable>
-            <el-option
-              v-for="item in fileTypeList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
+            <el-option v-for="item in fileTypeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="创建时间"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss" placeholder="创建时间"
           />
         </search-item>
         <search-item>
@@ -320,19 +315,17 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/file/approve/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button
+            v-if="proxy.hasPerm('/file/approve/export')" icon="icon-export" title="导出"
+            @click="exportExcelBtn"
+          />
           <icon-button v-if="proxy.hasPerm('/file/approve/print')" icon="icon-print" title="打印" @click="printList" />
         </template>
         <!-- 表格区域 -->
         <normal-table
-          id="print"
-          :data="list" :total="total" :columns="columns"
-          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-          :list-loading="loadingTable"
-          :is-showmulti-select="true"
-          :is-multi="true"
-          @change="changePage"
-          @multi-select="multiSelect"
+          id="print" :data="list" :total="total" :columns="columns"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
+          :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -347,27 +340,56 @@
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button v-if="proxy.hasPerm('/file/approve/edit') && ['草稿箱', '已取消'].includes(activeTitle)" size="small" type="primary" link @click="edit(row)">
+                <el-button
+                  v-if="proxy.buttonPerm.edit.if(row, '/file/approve/edit')"
+                  size="small" type="primary" link @click="edit(row)"
+                >
                   编辑
                 </el-button>
-                <el-button v-if="proxy.hasPerm('/file/approve/edit') && ['草稿箱', '已取消'].includes(activeTitle)" size="small" type="primary" link @click="submit(row)">
+                <el-button
+                  v-if="proxy.buttonPerm.submit.if(row)"
+                  @click="submit(row)"
+                >
                   提交
                 </el-button>
-                <template v-if="['全部', '待审批'].includes(activeTitle)">
-                  <el-button v-if="proxy.hasPerm('/file/approve/agree')" size="small" type="primary" link :disabled="row.approvalStatusName !== '待审批'" @click="approval('agree', row.taskId)">
-                    同意
-                  </el-button>
-                  <el-button v-if="proxy.hasPerm('/file/approve/reject')" size="small" type="primary" link :disabled="row.approvalStatusName !== '待审批' || row.decisionItem === 3" @click="approval('reject', row.taskId)">
-                    驳回
-                  </el-button>
-                  <el-button v-if="proxy.hasPerm('/file/approve/refuse')" size="small" type="primary" link :disabled="row.approvalStatusName !== '待审批' || row.decisionItem === 1 || row.decisionItem === 2" @click="approval('refuse', row.taskId)">
-                    拒绝
-                  </el-button>
-                </template>
-                <el-button v-if="proxy.hasPerm('/file/approve/cancle') && ['审批中', '全部'].includes(activeTitle)" size="small" type="primary" :disabled="row.approvalStatusName !== '审批中'" link @click="cancel(row)">
+                <el-button
+                  v-if="proxy.buttonPerm.agree.if(row, '/file/approve/agree')"
+                  size="small"
+                  type="primary" link :disabled="proxy.buttonPerm.agree.disabled(row)"
+                  @click="approval('agree', row.taskId)"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.reject.if(row, '/file/approve/reject')"
+                  size="small"
+                  type="primary" link
+                  :disabled="proxy.buttonPerm.reject.disabled(row)"
+                  @click="approval('reject', row.taskId)"
+                >
+                  驳回
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.refuse.if(row, '/file/approve/refuse')"
+                  size="small" type="primary" link
+                  :disabled="proxy.buttonPerm.refuse.disabled(row)"
+                  @click="approval('refuse', row.taskId)"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.cancel.if(row, '/file/approve/cancel')"
+                  :disabled="proxy.buttonPerm.cancel.disabled(row)"
+                  size="small" type="primary"
+                  link @click="cancel(row)"
+                >
                   取消
                 </el-button>
-                <el-button v-if="proxy.hasPerm('/file/approve/delete') && !['已通过', '未通过'].includes(activeTitle)" size="small" type="danger" link @click="remove(row)">
+                <el-button
+                  v-if="proxy.buttonPerm.delete.if(row, '/file/approve/delete')"
+                  :disabled="proxy.buttonPerm.delete.disabled(row)" size="small" type="danger" link
+                  @click="remove(row)"
+                >
                   删除
                 </el-button>
               </template>
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index e56f293..d856aff 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -92,7 +92,7 @@
     // })
   }
   ruleForm.templateType = row.templateType
-  getuser()
+  // getuser()
 }
 defineExpose({ initDialog })
 // 关闭弹窗
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index 14b11aa..c4ad507 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+import { download } from '@/utils/download'
 const { proxy } = getCurrentInstance() as any
 const createTime = ref()
 const searchQuery = reactive({
@@ -141,7 +142,8 @@
   if (row.minioFileName) {
     getPhotoUrl(row.minioFileName).then((res) => {
       fileUrl.value = res.data
-      fileUrl.value ? downRef.value.click() : ElMessage('无可下载内容')
+      // fileUrl.value ? downRef.value.click() : ElMessage('无可下载内容')
+      download(res.data, row.templateName as string)
     }).catch(() => {
       ElMessage.error('下载失败')
     })
diff --git a/src/views/system/tool/document/addDDialog.vue b/src/views/system/tool/document/addDDialog.vue
index cf7dec3..70840e2 100644
--- a/src/views/system/tool/document/addDDialog.vue
+++ b/src/views/system/tool/document/addDDialog.vue
@@ -92,7 +92,7 @@
     // })
   }
   ruleForm.templateType = row.templateType
-  getuser()
+  // getuser()
 }
 defineExpose({ initDialog })
 // 关闭弹窗

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index 4301f6f..92ad9b6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -23,6 +23,15 @@
   })
 }
 
+// 部门检测我的检测详情
+export function executiveDetail(data: { orderId: string; sampleId: string }) {
+  return request({
+    url: '/business/labExecutive/executive/detail',
+    method: 'post',
+    data,
+  })
+}
+
 // 导出列表
 export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
   return request({
@@ -63,7 +72,25 @@
 // 退回(待检测/检测中->退回)
 export function sendBackProcess(data: ISendBack) {
   return request({
-    url: `${prefix}/schedule/task/setSchedule`,
+    url: '/business/labExecutive/executive/sendBack',
+    method: 'post',
+    data,
+  })
+}
+
+// 收入（待检测->检测中）->收入)
+export function myExecutiveReceive(data: object) {
+  return request({
+    url: '/business/labExecutive/myExecutive/receive',
+    method: 'post',
+    data,
+  })
+}
+
+// 分配
+export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+  return request({
+    url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
     data,
   })
diff --git a/src/main.ts b/src/main.ts
index 695df5c..3cf24ef 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -16,13 +16,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
+import buttonPerm from '@/utils/buttonPerm'
 // 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
-
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.config.globalProperties.buttonPerm = buttonPerm
 app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
new file mode 100644
index 0000000..205d84a
--- /dev/null
+++ b/src/utils/buttonPerm.ts
@@ -0,0 +1,66 @@
+import { hasPermission } from '@/utils/composables/permission'
+
+function error(permPath: string) {
+  if (permPath === undefined) {
+    throw new Error('Button permission url is required!!!')
+  }
+}
+
+export default {
+  agree: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  reject: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  refuse: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
+    },
+  },
+  edit: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && (row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消')
+    },
+  },
+  submit: {
+    if: (row: any) => {
+      row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
+    },
+  },
+  cancel: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName === '审批中'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName !== '审批中'
+    },
+  },
+  delete: {
+    if: (row: any, permPath: string) => {
+      error(permPath)
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+    },
+    disabled: (row: any) => {
+      return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
+    },
+  },
+}
diff --git a/src/utils/download.ts b/src/utils/download.ts
new file mode 100644
index 0000000..d70f539
--- /dev/null
+++ b/src/utils/download.ts
@@ -0,0 +1,149 @@
+/**
+ * 下载本地图片 href为 127.0.0.1/xxxx
+ * @param href 图片地址
+ * @param name 图片名称
+ */
+function downloadImg(href: string, name: string) {
+  const eleLink = document.createElement('a')
+  eleLink.download = name
+  eleLink.href = href
+  eleLink.click()
+  eleLink.remove()
+}
+
+/**
+ * 下载文件
+ * @param file 文件对象
+ * @param name 图片名称
+ */
+export function downloadFile(file: File, name: string) {
+  console.log(new Blob([file]), 'new Blob([file])')
+  const objectUrl = URL.createObjectURL(new Blob([file]))
+  const link = document.createElement('a')
+  link.download = name
+  link.href = objectUrl
+  link.click()
+  link.remove()
+  window.URL.revokeObjectURL(link.href)
+}
+// 各种文件类型的type
+export const fileType: { [key: string]: string } = {
+  pdf: 'application/pdf',
+  doc: 'application/doc',
+  docx: 'application/docx',
+  excel: 'application/excel',
+  ppt: 'application/vnd.ms-powerpoint',
+  dir: 'application/x-director',
+  js: 'application/x-javascript',
+  swf: 'application/x-shockwave-flash',
+  xhtml: 'application/xhtml+xml',
+  xht: 'application/xhtml+xml',
+  zip: 'application/zip',
+  mid: 'audio/midi',
+  midi: 'audio/midi',
+  mp3: 'audio/mpeg',
+  rm: 'audio/x-pn-realaudio',
+  rpm: 'audio/x-pn-realaudio-plugin',
+  wav: 'audio/x-wav',
+  bmp: 'image/bmp',
+  gif: 'image/gif',
+  jpeg: 'image/jpeg',
+  jpg: 'image/jpeg',
+  png: 'image/png',
+  css: 'text/css',
+  html: 'text/html',
+  htm: 'text/html',
+  txt: 'text/plain',
+  xsl: 'text/xml',
+  xml: 'text/xml',
+  mpeg: 'video/mpeg',
+  mpg: 'video/mpeg',
+  avi: 'video/x-msvideo',
+  movie: 'video/x-sgi-movie',
+}
+/**
+ * 将网络文件地址转化为文件对象
+ * @param url 文件地址
+ * @param fileName 文件名称
+ */
+export function getFileFromUrl(url: string, fileName: string) {
+  return new Promise((resolve, reject) => {
+    var blob = null
+    var xhr = new XMLHttpRequest()
+    xhr.open('GET', url)
+    const urlFileType = url.split('.')[url.split('.').length - 1]
+    xhr.setRequestHeader('Accept', fileType[urlFileType])
+    xhr.responseType = 'blob'
+    // 加载时处理
+    xhr.onload = () => {
+      // 获取返回结果
+      blob = xhr.response
+      const file = new File([blob], fileName, { type: fileType[urlFileType] })
+      // 返回结果
+      resolve(file)
+    }
+    xhr.onerror = (e) => {
+      reject(e)
+    }
+    // 发送
+    xhr.send()
+  })
+}
+/**
+ * 将网络地址转化为 blob地址 并下载
+ * @param url 文件地址
+ * @param fileName 文件名称
+ */
+export function urlToBlob(url: string, name: string) {
+  const xhr = new XMLHttpRequest()
+  xhr.open('get', url)
+  xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
+  xhr.onload = function () {
+    const path = URL.createObjectURL(xhr.response)
+    const link = document.createElement('a')
+    link.download = name
+    link.href = path
+    link.click()
+    link.remove()
+    window.URL.revokeObjectURL(link.href)
+  }
+  xhr.send()
+}
+
+/**
+ * 下载文件 各种文件
+ * @param url 网络文件地址
+ * @param name  文件名
+ */
+export function download(url: string, name: string) {
+  // 下载图片
+  const photo = ['jpg', 'jpeg', 'png']
+  const fileType = url.split('.')[url.split('.').length - 1]
+  console.log(fileType, 'fileType')
+  if (photo.includes(fileType)) {
+    // 图片 将服务器图片地址转化成本地地址
+    const image = new Image()
+    image.setAttribute('crossOrigin', 'anonymous')
+    image.src = url
+    image.onload = () => {
+      const canvas = document.createElement('canvas')
+      canvas.width = image.width
+      canvas.height = image.height
+      const ctx = canvas.getContext('2d');
+      (ctx as CanvasRenderingContext2D).drawImage(image, 0, 0, image.width, image.height)
+      canvas.toBlob((blob) => {
+        const url = URL.createObjectURL(blob as Blob)
+        downloadImg(url, name)
+        // 用完释放URL对象
+        URL.revokeObjectURL(url)
+      })
+    }
+  }
+  else {
+    // 预览一般都是用的a标签，文件下载用的window.open
+    // 1.pdf文件路径放到window.open里面，点击是进行在线预览
+    // 2.word文件和excel文件通过a标签打开时，是直接下载了
+    // 将网络地址转化为 blob地址 并下载
+    urlToBlob(url, name)
+  }
+}
diff --git a/src/views/business/lab/components/distributeDialog.vue b/src/views/business/lab/components/distributeDialog.vue
index 628f3ca..92c45f1 100644
--- a/src/views/business/lab/components/distributeDialog.vue
+++ b/src/views/business/lab/components/distributeDialog.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts" name="DistributeDialog">
 import { Aim } from '@element-plus/icons-vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
+import { allocate, executiveDetail } from '@/api/business/schedule/task'
 // 实验室任务分发弹窗
 
 // 自定义方法：close关闭弹窗
@@ -18,14 +20,13 @@
     certificationTypes.value = response.data
   })
 }
-
-getDict()
 // 样品详情
 const sampleDetail = ref({
-  sampleName: '压力表',
-  mesureContent: '压力、ip68',
-  certifications: ['1', '2'],
-  remark: '这是备注',
+  sampleName: '',
+  measureContent: '',
+  certifications: [] as any,
+  remark: '',
+  laboratoryId: '',
 })
 
 const processNode = ref({
@@ -47,13 +48,23 @@
   distributeTime: '', // 分配时间
   startTime: '', // 检测开始时间
   overTime: '', // 检测结束时间
+  measurePersonId: '', // 检定人员id
+  measureSegmentId: '', // 实验室id
 })
 
 // 初始化弹窗
-const initDialog = (sampleid: string, orderid: string) => {
+const initDialog = (id: string, sampleid: string, orderid: string) => {
   dialogVisible.value = true
   sampleId.value = sampleid
   orderId.value = orderid
+  executiveDetail({ orderId: orderid, sampleId: sampleid }).then((res) => {
+    if (res.data) {
+      sampleDetail.value = res.data
+      sampleDetail.value.laboratoryId = id
+      // 证书类别
+      sampleDetail.value.certifications = res.data.certifications.split(',')
+    }
+  })
 }
 
 // 选择人员
@@ -62,21 +73,39 @@
   choosePersonShow.value = true
 }
 // 人员选择完毕
-const choosePersonOver = (person: { id: string; name: string }) => {
+const choosePersonOver = (person: { id: string; name: string; measurePersonId: string; measureSegmentId: string }) => {
+  console.log(person)
   processNode.value.executivePerson = person.id
   processNode.value.executivePersonName = person.name
+  processNode.value.measurePersonId = person.measurePersonId
+  processNode.value.measureSegmentId = person.measureSegmentId
   choosePersonShow.value = false
 }
 
 // 流程配置组件
 const processConfigRef = ref()
-// 保存流程按钮点击
+// 保存流程按钮点击分配
 const saveProcess = () => {
+  // ctx.emit('fetchData') // fatherMethod 是想要调用父组件的一个方法
+
+  const postData = {
+    id: sampleDetail.value.laboratoryId, // 实验室检测id
+    measurePersonId: processNode.value.executivePerson, // 分配检定人员id（在本部门下的计量人员列表中选择）
+    requireCertifications: processNode.value.requireCertifications, // 应出具证书总数
+  }
+  allocate(postData).then((res: { code: number }) => {
+    if (res.code == 200) {
+      ElMessage.success('分配成功')
+    }
+  })
   emit('close')
 }
+
 function cancel() {
   dialogVisible.value = false
 }
+getDict()
+
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
 </script>
@@ -98,7 +127,7 @@
       </div>
       <div class="simple-info-line">
         <span class="label">检定项目:</span>
-        <el-input v-model="sampleDetail.mesureContent" disabled style="width: 480px;" />
+        <el-input v-model="sampleDetail.measureContent" disabled style="width: 480px;" />
       </div>
       <div class="simple-info-line">
         <span class="label">备注:</span>
@@ -119,7 +148,7 @@
     </div>
     <template #footer>
       <el-button type="primary" @click="saveProcess">
-        确定
+        分配
       </el-button>
       <el-button @click="cancel">
         取消
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index 553d2ec..0a7022a 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -47,7 +47,7 @@
 function initDialog(row: IlabMeasureList) {
   formData.id = row.id
   formData.measurePersonId = row.measurePersonId
-  formData.measureSegmentId = row.measureSegmentId
+  formData.measureSegmentId = row.currentSegmentId
   formData.orderId = row.orderId
   formData.sampleId = row.sampleId
   formData.operateReason = ''
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index eb4b260..e849fd3 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -135,7 +135,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+  distributeDialogRef.value.initDialog(row.id, row.sampleId, row.orderId)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index c604d3e..d998c13 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -10,9 +10,10 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { getMyMeasureList } from '@/api/business/schedule/task'
+import { getMyMeasureList, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -157,12 +158,12 @@
 
 // 导出
 const exportAll = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
   if (list.value.length > 0) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: '下载中请稍后',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     // const params = {
     //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
     //   customerName: listQuery.value.customerName, // 公司名称
@@ -174,11 +175,11 @@
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '任务分发列表.xlsx')
     // })
+    loading.close()
   }
   else {
-    ElMessage.warning('无数据可导出数据')
+    ElMessage.warning('无数据可导出')
   }
-  loading.close()
 }
 
 // 打印列表
@@ -222,6 +223,11 @@
     { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
   ).then(() => {
     // 收入样品
+    myExecutiveReceive([{ orderId: row.orderId, sampleId: row.sampleId }]).then((res) => {
+      if (res.code == 200) {
+        ElMessage.success('收入成功')
+      }
+    })
   })
 }
 
@@ -278,7 +284,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 as string // 待检测
   }
   nextTick(() => {
     fetchData(true)
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index aa481ea..6503a12 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -51,6 +51,7 @@
   requireCertifications: number // 应出具证书总数
   distributeState: string // 分发性质-初次分发、退回分发
   handOutProperty: string // 分发性质-初次分发、退回分发
+  id?: string // 实验室id
 }
 
 // 实验室检测/我的检测列表
@@ -58,6 +59,7 @@
   id: string // 实验室检测id
   measurePersonId: string // 检测人id
   measureSegmentId: string // 检测部门id
+  currentSegmentId: string // 检测部门id (新)
 }
 
 // 全部检测流程节点
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 44876b7..fb29410 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -299,18 +299,13 @@
         </search-item>
         <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2" placeholder="文件类别" clearable>
-            <el-option
-              v-for="item in fileTypeList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
+            <el-option v-for="item in fileTypeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="创建时间"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss" placeholder="创建时间"
           />
         </search-item>
         <search-item>
@@ -320,19 +315,17 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/file/approve/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button
+            v-if="proxy.hasPerm('/file/approve/export')" icon="icon-export" title="导出"
+            @click="exportExcelBtn"
+          />
           <icon-button v-if="proxy.hasPerm('/file/approve/print')" icon="icon-print" title="打印" @click="printList" />
         </template>
         <!-- 表格区域 -->
         <normal-table
-          id="print"
-          :data="list" :total="total" :columns="columns"
-          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-          :list-loading="loadingTable"
-          :is-showmulti-select="true"
-          :is-multi="true"
-          @change="changePage"
-          @multi-select="multiSelect"
+          id="print" :data="list" :total="total" :columns="columns"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
+          :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -347,27 +340,56 @@
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button v-if="proxy.hasPerm('/file/approve/edit') && ['草稿箱', '已取消'].includes(activeTitle)" size="small" type="primary" link @click="edit(row)">
+                <el-button
+                  v-if="proxy.buttonPerm.edit.if(row, '/file/approve/edit')"
+                  size="small" type="primary" link @click="edit(row)"
+                >
                   编辑
                 </el-button>
-                <el-button v-if="proxy.hasPerm('/file/approve/edit') && ['草稿箱', '已取消'].includes(activeTitle)" size="small" type="primary" link @click="submit(row)">
+                <el-button
+                  v-if="proxy.buttonPerm.submit.if(row)"
+                  @click="submit(row)"
+                >
                   提交
                 </el-button>
-                <template v-if="['全部', '待审批'].includes(activeTitle)">
-                  <el-button v-if="proxy.hasPerm('/file/approve/agree')" size="small" type="primary" link :disabled="row.approvalStatusName !== '待审批'" @click="approval('agree', row.taskId)">
-                    同意
-                  </el-button>
-                  <el-button v-if="proxy.hasPerm('/file/approve/reject')" size="small" type="primary" link :disabled="row.approvalStatusName !== '待审批' || row.decisionItem === 3" @click="approval('reject', row.taskId)">
-                    驳回
-                  </el-button>
-                  <el-button v-if="proxy.hasPerm('/file/approve/refuse')" size="small" type="primary" link :disabled="row.approvalStatusName !== '待审批' || row.decisionItem === 1 || row.decisionItem === 2" @click="approval('refuse', row.taskId)">
-                    拒绝
-                  </el-button>
-                </template>
-                <el-button v-if="proxy.hasPerm('/file/approve/cancle') && ['审批中', '全部'].includes(activeTitle)" size="small" type="primary" :disabled="row.approvalStatusName !== '审批中'" link @click="cancel(row)">
+                <el-button
+                  v-if="proxy.buttonPerm.agree.if(row, '/file/approve/agree')"
+                  size="small"
+                  type="primary" link :disabled="proxy.buttonPerm.agree.disabled(row)"
+                  @click="approval('agree', row.taskId)"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.reject.if(row, '/file/approve/reject')"
+                  size="small"
+                  type="primary" link
+                  :disabled="proxy.buttonPerm.reject.disabled(row)"
+                  @click="approval('reject', row.taskId)"
+                >
+                  驳回
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.refuse.if(row, '/file/approve/refuse')"
+                  size="small" type="primary" link
+                  :disabled="proxy.buttonPerm.refuse.disabled(row)"
+                  @click="approval('refuse', row.taskId)"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.cancel.if(row, '/file/approve/cancel')"
+                  :disabled="proxy.buttonPerm.cancel.disabled(row)"
+                  size="small" type="primary"
+                  link @click="cancel(row)"
+                >
                   取消
                 </el-button>
-                <el-button v-if="proxy.hasPerm('/file/approve/delete') && !['已通过', '未通过'].includes(activeTitle)" size="small" type="danger" link @click="remove(row)">
+                <el-button
+                  v-if="proxy.buttonPerm.delete.if(row, '/file/approve/delete')"
+                  :disabled="proxy.buttonPerm.delete.disabled(row)" size="small" type="danger" link
+                  @click="remove(row)"
+                >
                   删除
                 </el-button>
               </template>
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index e56f293..d856aff 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -92,7 +92,7 @@
     // })
   }
   ruleForm.templateType = row.templateType
-  getuser()
+  // getuser()
 }
 defineExpose({ initDialog })
 // 关闭弹窗
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index 14b11aa..c4ad507 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+import { download } from '@/utils/download'
 const { proxy } = getCurrentInstance() as any
 const createTime = ref()
 const searchQuery = reactive({
@@ -141,7 +142,8 @@
   if (row.minioFileName) {
     getPhotoUrl(row.minioFileName).then((res) => {
       fileUrl.value = res.data
-      fileUrl.value ? downRef.value.click() : ElMessage('无可下载内容')
+      // fileUrl.value ? downRef.value.click() : ElMessage('无可下载内容')
+      download(res.data, row.templateName as string)
     }).catch(() => {
       ElMessage.error('下载失败')
     })
diff --git a/src/views/system/tool/document/addDDialog.vue b/src/views/system/tool/document/addDDialog.vue
index cf7dec3..70840e2 100644
--- a/src/views/system/tool/document/addDDialog.vue
+++ b/src/views/system/tool/document/addDDialog.vue
@@ -92,7 +92,7 @@
     // })
   }
   ruleForm.templateType = row.templateType
-  getuser()
+  // getuser()
 }
 defineExpose({ initDialog })
 // 关闭弹窗
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index c5732f4..0113b9e 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -9,6 +9,7 @@
 import { printJSON } from '@/utils/printUtils'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
+import { download } from '@/utils/download'
 const { proxy } = getCurrentInstance() as any
 const createTime = ref()
 const searchQuery = reactive({
@@ -138,8 +139,10 @@
 const exportSele = (row: templateType) => {
   if (row.minioFileName) {
     getPhotoUrl(row.minioFileName).then((res) => {
+      console.log(row, res.data, 'res.datares.datares.data')
       fileUrl.value = res.data
-      fileUrl.value ? downRef.value.click() : ElMessage('无可下载内容')
+      // fileUrl.value ? downRef.value.click() : ElMessage('无可下载内容')
+      download(res.data, row.templateName as string)
     }).catch(() => {
       ElMessage.error('下载失败')
     })