diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index 80d91b7..c7e8343 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -5,10 +5,10 @@
 import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
-// 列表查询
+// 任务分发列表查询
 export function getTaskList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/business/labExecutive/handOut/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index 80d91b7..c7e8343 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -5,10 +5,10 @@
 import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
-// 列表查询
+// 任务分发列表查询
 export function getTaskList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/business/labExecutive/handOut/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 8771c29..85334a4 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -16,6 +16,16 @@
     data,
   })
 }
+
+// 状态管理编辑
+export function updateStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/updateStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: object) {
   return request({
@@ -24,6 +34,22 @@
     data,
   })
 }
+// 状态管理取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 状态管理详情
 export function detailStatus(data: object) {
   return request({
@@ -32,3 +58,12 @@
     data,
   })
 }
+
+// 状态管理导出
+export function exportStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/exportStateManageList',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index 80d91b7..c7e8343 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -5,10 +5,10 @@
 import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
-// 列表查询
+// 任务分发列表查询
 export function getTaskList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/business/labExecutive/handOut/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 8771c29..85334a4 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -16,6 +16,16 @@
     data,
   })
 }
+
+// 状态管理编辑
+export function updateStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/updateStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: object) {
   return request({
@@ -24,6 +34,22 @@
     data,
   })
 }
+// 状态管理取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 状态管理详情
 export function detailStatus(data: object) {
   return request({
@@ -32,3 +58,12 @@
     data,
   })
 }
+
+// 状态管理导出
+export function exportStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/exportStateManageList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index c5cea4b..768c310 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -63,7 +63,7 @@
 // 导出
 export function exportFileApi(data: object) {
   return request({
-    url: 'file/listExport',
+    url: '/meter/file/listExport',
     method: 'post',
     data,
     responseType: 'blob',
@@ -86,6 +86,25 @@
     data,
   })
 }
+
+// 取消
+export function approvalCancel(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function approvalDelete(data: object) {
+  return request({
+    url: '/meter/file/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 保存草稿箱
 export function confirmDrafts(data: object) {
   return request({

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index 80d91b7..c7e8343 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -5,10 +5,10 @@
 import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
-// 列表查询
+// 任务分发列表查询
 export function getTaskList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/business/labExecutive/handOut/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 8771c29..85334a4 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -16,6 +16,16 @@
     data,
   })
 }
+
+// 状态管理编辑
+export function updateStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/updateStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: object) {
   return request({
@@ -24,6 +34,22 @@
     data,
   })
 }
+// 状态管理取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 状态管理详情
 export function detailStatus(data: object) {
   return request({
@@ -32,3 +58,12 @@
     data,
   })
 }
+
+// 状态管理导出
+export function exportStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/exportStateManageList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index c5cea4b..768c310 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -63,7 +63,7 @@
 // 导出
 export function exportFileApi(data: object) {
   return request({
-    url: 'file/listExport',
+    url: '/meter/file/listExport',
     method: 'post',
     data,
     responseType: 'blob',
@@ -86,6 +86,25 @@
     data,
   })
 }
+
+// 取消
+export function approvalCancel(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function approvalDelete(data: object) {
+  return request({
+    url: '/meter/file/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 保存草稿箱
 export function confirmDrafts(data: object) {
   return request({
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 7b538cf..1d02839 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -9,9 +9,7 @@
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
   sampleAttr: string // 样品属性
-  sendState: string // 分发状态
-  outState: string // 超期状态
-  formId: string // formId
+  sampleStatus: string // 分发状态
   limit: number
   offset: number
 }

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index 80d91b7..c7e8343 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -5,10 +5,10 @@
 import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
-// 列表查询
+// 任务分发列表查询
 export function getTaskList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/business/labExecutive/handOut/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 8771c29..85334a4 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -16,6 +16,16 @@
     data,
   })
 }
+
+// 状态管理编辑
+export function updateStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/updateStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: object) {
   return request({
@@ -24,6 +34,22 @@
     data,
   })
 }
+// 状态管理取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 状态管理详情
 export function detailStatus(data: object) {
   return request({
@@ -32,3 +58,12 @@
     data,
   })
 }
+
+// 状态管理导出
+export function exportStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/exportStateManageList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index c5cea4b..768c310 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -63,7 +63,7 @@
 // 导出
 export function exportFileApi(data: object) {
   return request({
-    url: 'file/listExport',
+    url: '/meter/file/listExport',
     method: 'post',
     data,
     responseType: 'blob',
@@ -86,6 +86,25 @@
     data,
   })
 }
+
+// 取消
+export function approvalCancel(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function approvalDelete(data: object) {
+  return request({
+    url: '/meter/file/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 保存草稿箱
 export function confirmDrafts(data: object) {
   return request({
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 7b538cf..1d02839 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -9,9 +9,7 @@
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
   sampleAttr: string // 样品属性
-  sendState: string // 分发状态
-  outState: string // 超期状态
-  formId: string // formId
+  sampleStatus: string // 分发状态
   limit: number
   offset: number
 }
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 799a420..f784804 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -16,12 +16,12 @@
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待分发', value: 'sendState;0' },
-  { name: '检测中', value: 'sendState;1' },
-  { name: '检测完', value: 'sendState;2' },
-  { name: '超期样品', value: 'outState;1' },
+  { name: '待分发', value: 'sampleStatus;2' },
+  { name: '检测中', value: 'sampleStatus;3' },
+  { name: '检测完', value: 'sampleStatus;4' },
+  { name: '超期样品', value: 'sampleStatus;8' },
 ]
-const currentMenu = ref('sendState;0') // 当前选中状态
+const currentMenu = ref('sampleStatus;2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 const listQuery: Ref<ITaskQuery> = ref({
@@ -34,9 +34,7 @@
   sampleAttr: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  sampleStatus: '2', // 样品状态:默认待分发
   offset: 1,
   limit: 20,
 })
@@ -82,18 +80,18 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  // // 模拟数据
+  // list.value = [
+  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
+  // ]
+  // loadingTable.value = false
+  // console.log(listQuery.value)
+  getTaskList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = response.data.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -114,9 +112,7 @@
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleStatus: '2', // 分发状态
     offset: 1,
     limit: 20,
   }
@@ -202,9 +198,7 @@
 watch(currentMenu, (val: string) => {
   const vals = val.split(';')
   if (vals.length > 1) {
-    listQuery.value.sendState = ''
-    listQuery.value.outState = ''
-    listQuery.value[vals[0] as 'sendState' | 'outState'] = vals[1]
+    listQuery.value.sampleStatus = vals[1]
   }
   fetchData(false)
 })
@@ -300,7 +294,7 @@
               <el-button size="small" link type="primary" @click="bindLabel(row)">
                 标签绑定
               </el-button>
-              <el-button v-if="listQuery.sendState !== '2'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.sampleStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 分发
               </el-button>
             </template>

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index 80d91b7..c7e8343 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -5,10 +5,10 @@
 import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
-// 列表查询
+// 任务分发列表查询
 export function getTaskList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/business/labExecutive/handOut/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 8771c29..85334a4 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -16,6 +16,16 @@
     data,
   })
 }
+
+// 状态管理编辑
+export function updateStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/updateStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: object) {
   return request({
@@ -24,6 +34,22 @@
     data,
   })
 }
+// 状态管理取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 状态管理详情
 export function detailStatus(data: object) {
   return request({
@@ -32,3 +58,12 @@
     data,
   })
 }
+
+// 状态管理导出
+export function exportStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/exportStateManageList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index c5cea4b..768c310 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -63,7 +63,7 @@
 // 导出
 export function exportFileApi(data: object) {
   return request({
-    url: 'file/listExport',
+    url: '/meter/file/listExport',
     method: 'post',
     data,
     responseType: 'blob',
@@ -86,6 +86,25 @@
     data,
   })
 }
+
+// 取消
+export function approvalCancel(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function approvalDelete(data: object) {
+  return request({
+    url: '/meter/file/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 保存草稿箱
 export function confirmDrafts(data: object) {
   return request({
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 7b538cf..1d02839 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -9,9 +9,7 @@
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
   sampleAttr: string // 样品属性
-  sendState: string // 分发状态
-  outState: string // 超期状态
-  formId: string // formId
+  sampleStatus: string // 分发状态
   limit: number
   offset: number
 }
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 799a420..f784804 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -16,12 +16,12 @@
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待分发', value: 'sendState;0' },
-  { name: '检测中', value: 'sendState;1' },
-  { name: '检测完', value: 'sendState;2' },
-  { name: '超期样品', value: 'outState;1' },
+  { name: '待分发', value: 'sampleStatus;2' },
+  { name: '检测中', value: 'sampleStatus;3' },
+  { name: '检测完', value: 'sampleStatus;4' },
+  { name: '超期样品', value: 'sampleStatus;8' },
 ]
-const currentMenu = ref('sendState;0') // 当前选中状态
+const currentMenu = ref('sampleStatus;2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 const listQuery: Ref<ITaskQuery> = ref({
@@ -34,9 +34,7 @@
   sampleAttr: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  sampleStatus: '2', // 样品状态:默认待分发
   offset: 1,
   limit: 20,
 })
@@ -82,18 +80,18 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  // // 模拟数据
+  // list.value = [
+  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
+  // ]
+  // loadingTable.value = false
+  // console.log(listQuery.value)
+  getTaskList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = response.data.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -114,9 +112,7 @@
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleStatus: '2', // 分发状态
     offset: 1,
     limit: 20,
   }
@@ -202,9 +198,7 @@
 watch(currentMenu, (val: string) => {
   const vals = val.split(';')
   if (vals.length > 1) {
-    listQuery.value.sendState = ''
-    listQuery.value.outState = ''
-    listQuery.value[vals[0] as 'sendState' | 'outState'] = vals[1]
+    listQuery.value.sampleStatus = vals[1]
   }
   fetchData(false)
 })
@@ -300,7 +294,7 @@
               <el-button size="small" link type="primary" @click="bindLabel(row)">
                 标签绑定
               </el-button>
-              <el-button v-if="listQuery.sendState !== '2'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.sampleStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 分发
               </el-button>
             </template>
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 7f8f5ce..97d660a 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -5,12 +5,14 @@
   applyPerson: string // 	申请人
   applyUnit: string // 	申请单位
   approvalStatus?: string // 	审批状态
-  createUser: string // 	创建人
-  processResult: string // 	处置结果
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
   time: string // 	申请日期
   limit?: number
   offset?: number
   ids?: string[]
+  formId?: string
 }
 // 借用设备类型
 export interface borrowDeviceType {
@@ -22,6 +24,8 @@
   useDept: string // 使用部门
   usePerson: string // 使用人
   validDate: string // 有效日期
+  approvalStatusName: string
+  applyName: string
   edit?: boolean
   equipmentName?: string
   id?: string

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index 80d91b7..c7e8343 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -5,10 +5,10 @@
 import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
-// 列表查询
+// 任务分发列表查询
 export function getTaskList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/business/labExecutive/handOut/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 8771c29..85334a4 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -16,6 +16,16 @@
     data,
   })
 }
+
+// 状态管理编辑
+export function updateStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/updateStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: object) {
   return request({
@@ -24,6 +34,22 @@
     data,
   })
 }
+// 状态管理取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 状态管理详情
 export function detailStatus(data: object) {
   return request({
@@ -32,3 +58,12 @@
     data,
   })
 }
+
+// 状态管理导出
+export function exportStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/exportStateManageList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index c5cea4b..768c310 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -63,7 +63,7 @@
 // 导出
 export function exportFileApi(data: object) {
   return request({
-    url: 'file/listExport',
+    url: '/meter/file/listExport',
     method: 'post',
     data,
     responseType: 'blob',
@@ -86,6 +86,25 @@
     data,
   })
 }
+
+// 取消
+export function approvalCancel(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function approvalDelete(data: object) {
+  return request({
+    url: '/meter/file/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 保存草稿箱
 export function confirmDrafts(data: object) {
   return request({
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 7b538cf..1d02839 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -9,9 +9,7 @@
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
   sampleAttr: string // 样品属性
-  sendState: string // 分发状态
-  outState: string // 超期状态
-  formId: string // formId
+  sampleStatus: string // 分发状态
   limit: number
   offset: number
 }
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 799a420..f784804 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -16,12 +16,12 @@
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待分发', value: 'sendState;0' },
-  { name: '检测中', value: 'sendState;1' },
-  { name: '检测完', value: 'sendState;2' },
-  { name: '超期样品', value: 'outState;1' },
+  { name: '待分发', value: 'sampleStatus;2' },
+  { name: '检测中', value: 'sampleStatus;3' },
+  { name: '检测完', value: 'sampleStatus;4' },
+  { name: '超期样品', value: 'sampleStatus;8' },
 ]
-const currentMenu = ref('sendState;0') // 当前选中状态
+const currentMenu = ref('sampleStatus;2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 const listQuery: Ref<ITaskQuery> = ref({
@@ -34,9 +34,7 @@
   sampleAttr: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  sampleStatus: '2', // 样品状态:默认待分发
   offset: 1,
   limit: 20,
 })
@@ -82,18 +80,18 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  // // 模拟数据
+  // list.value = [
+  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
+  // ]
+  // loadingTable.value = false
+  // console.log(listQuery.value)
+  getTaskList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = response.data.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -114,9 +112,7 @@
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleStatus: '2', // 分发状态
     offset: 1,
     limit: 20,
   }
@@ -202,9 +198,7 @@
 watch(currentMenu, (val: string) => {
   const vals = val.split(';')
   if (vals.length > 1) {
-    listQuery.value.sendState = ''
-    listQuery.value.outState = ''
-    listQuery.value[vals[0] as 'sendState' | 'outState'] = vals[1]
+    listQuery.value.sampleStatus = vals[1]
   }
   fetchData(false)
 })
@@ -300,7 +294,7 @@
               <el-button size="small" link type="primary" @click="bindLabel(row)">
                 标签绑定
               </el-button>
-              <el-button v-if="listQuery.sendState !== '2'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.sampleStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 分发
               </el-button>
             </template>
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 7f8f5ce..97d660a 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -5,12 +5,14 @@
   applyPerson: string // 	申请人
   applyUnit: string // 	申请单位
   approvalStatus?: string // 	审批状态
-  createUser: string // 	创建人
-  processResult: string // 	处置结果
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
   time: string // 	申请日期
   limit?: number
   offset?: number
   ids?: string[]
+  formId?: string
 }
 // 借用设备类型
 export interface borrowDeviceType {
@@ -22,6 +24,8 @@
   useDept: string // 使用部门
   usePerson: string // 使用人
   validDate: string // 有效日期
+  approvalStatusName: string
+  applyName: string
   edit?: boolean
   equipmentName?: string
   id?: string
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 470bad1..2f7a26f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -35,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :status="current" />
+    <component :is="currentComp" :status="current" apply-type="2" />
   </div>
 </template>
 

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index 80d91b7..c7e8343 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -5,10 +5,10 @@
 import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
-// 列表查询
+// 任务分发列表查询
 export function getTaskList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/business/labExecutive/handOut/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 8771c29..85334a4 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -16,6 +16,16 @@
     data,
   })
 }
+
+// 状态管理编辑
+export function updateStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/updateStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: object) {
   return request({
@@ -24,6 +34,22 @@
     data,
   })
 }
+// 状态管理取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 状态管理详情
 export function detailStatus(data: object) {
   return request({
@@ -32,3 +58,12 @@
     data,
   })
 }
+
+// 状态管理导出
+export function exportStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/exportStateManageList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index c5cea4b..768c310 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -63,7 +63,7 @@
 // 导出
 export function exportFileApi(data: object) {
   return request({
-    url: 'file/listExport',
+    url: '/meter/file/listExport',
     method: 'post',
     data,
     responseType: 'blob',
@@ -86,6 +86,25 @@
     data,
   })
 }
+
+// 取消
+export function approvalCancel(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function approvalDelete(data: object) {
+  return request({
+    url: '/meter/file/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 保存草稿箱
 export function confirmDrafts(data: object) {
   return request({
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 7b538cf..1d02839 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -9,9 +9,7 @@
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
   sampleAttr: string // 样品属性
-  sendState: string // 分发状态
-  outState: string // 超期状态
-  formId: string // formId
+  sampleStatus: string // 分发状态
   limit: number
   offset: number
 }
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 799a420..f784804 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -16,12 +16,12 @@
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待分发', value: 'sendState;0' },
-  { name: '检测中', value: 'sendState;1' },
-  { name: '检测完', value: 'sendState;2' },
-  { name: '超期样品', value: 'outState;1' },
+  { name: '待分发', value: 'sampleStatus;2' },
+  { name: '检测中', value: 'sampleStatus;3' },
+  { name: '检测完', value: 'sampleStatus;4' },
+  { name: '超期样品', value: 'sampleStatus;8' },
 ]
-const currentMenu = ref('sendState;0') // 当前选中状态
+const currentMenu = ref('sampleStatus;2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 const listQuery: Ref<ITaskQuery> = ref({
@@ -34,9 +34,7 @@
   sampleAttr: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  sampleStatus: '2', // 样品状态:默认待分发
   offset: 1,
   limit: 20,
 })
@@ -82,18 +80,18 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  // // 模拟数据
+  // list.value = [
+  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
+  // ]
+  // loadingTable.value = false
+  // console.log(listQuery.value)
+  getTaskList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = response.data.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -114,9 +112,7 @@
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleStatus: '2', // 分发状态
     offset: 1,
     limit: 20,
   }
@@ -202,9 +198,7 @@
 watch(currentMenu, (val: string) => {
   const vals = val.split(';')
   if (vals.length > 1) {
-    listQuery.value.sendState = ''
-    listQuery.value.outState = ''
-    listQuery.value[vals[0] as 'sendState' | 'outState'] = vals[1]
+    listQuery.value.sampleStatus = vals[1]
   }
   fetchData(false)
 })
@@ -300,7 +294,7 @@
               <el-button size="small" link type="primary" @click="bindLabel(row)">
                 标签绑定
               </el-button>
-              <el-button v-if="listQuery.sendState !== '2'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.sampleStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 分发
               </el-button>
             </template>
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 7f8f5ce..97d660a 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -5,12 +5,14 @@
   applyPerson: string // 	申请人
   applyUnit: string // 	申请单位
   approvalStatus?: string // 	审批状态
-  createUser: string // 	创建人
-  processResult: string // 	处置结果
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
   time: string // 	申请日期
   limit?: number
   offset?: number
   ids?: string[]
+  formId?: string
 }
 // 借用设备类型
 export interface borrowDeviceType {
@@ -22,6 +24,8 @@
   useDept: string // 使用部门
   usePerson: string // 使用人
   validDate: string // 有效日期
+  approvalStatusName: string
+  applyName: string
   edit?: boolean
   equipmentName?: string
   id?: string
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 470bad1..2f7a26f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -35,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :status="current" />
+    <component :is="currentComp" :status="current" apply-type="2" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 53046f0..6dc9628 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -56,7 +56,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" :type="type" />
+    <component :is="currentComp" :name="current" :type="type" apply-type="1" />
   </div>
 </template>
 

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index 80d91b7..c7e8343 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -5,10 +5,10 @@
 import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
-// 列表查询
+// 任务分发列表查询
 export function getTaskList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/business/labExecutive/handOut/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 8771c29..85334a4 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -16,6 +16,16 @@
     data,
   })
 }
+
+// 状态管理编辑
+export function updateStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/updateStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: object) {
   return request({
@@ -24,6 +34,22 @@
     data,
   })
 }
+// 状态管理取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 状态管理详情
 export function detailStatus(data: object) {
   return request({
@@ -32,3 +58,12 @@
     data,
   })
 }
+
+// 状态管理导出
+export function exportStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/exportStateManageList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index c5cea4b..768c310 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -63,7 +63,7 @@
 // 导出
 export function exportFileApi(data: object) {
   return request({
-    url: 'file/listExport',
+    url: '/meter/file/listExport',
     method: 'post',
     data,
     responseType: 'blob',
@@ -86,6 +86,25 @@
     data,
   })
 }
+
+// 取消
+export function approvalCancel(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function approvalDelete(data: object) {
+  return request({
+    url: '/meter/file/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 保存草稿箱
 export function confirmDrafts(data: object) {
   return request({
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 7b538cf..1d02839 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -9,9 +9,7 @@
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
   sampleAttr: string // 样品属性
-  sendState: string // 分发状态
-  outState: string // 超期状态
-  formId: string // formId
+  sampleStatus: string // 分发状态
   limit: number
   offset: number
 }
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 799a420..f784804 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -16,12 +16,12 @@
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待分发', value: 'sendState;0' },
-  { name: '检测中', value: 'sendState;1' },
-  { name: '检测完', value: 'sendState;2' },
-  { name: '超期样品', value: 'outState;1' },
+  { name: '待分发', value: 'sampleStatus;2' },
+  { name: '检测中', value: 'sampleStatus;3' },
+  { name: '检测完', value: 'sampleStatus;4' },
+  { name: '超期样品', value: 'sampleStatus;8' },
 ]
-const currentMenu = ref('sendState;0') // 当前选中状态
+const currentMenu = ref('sampleStatus;2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 const listQuery: Ref<ITaskQuery> = ref({
@@ -34,9 +34,7 @@
   sampleAttr: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  sampleStatus: '2', // 样品状态:默认待分发
   offset: 1,
   limit: 20,
 })
@@ -82,18 +80,18 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  // // 模拟数据
+  // list.value = [
+  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
+  // ]
+  // loadingTable.value = false
+  // console.log(listQuery.value)
+  getTaskList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = response.data.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -114,9 +112,7 @@
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleStatus: '2', // 分发状态
     offset: 1,
     limit: 20,
   }
@@ -202,9 +198,7 @@
 watch(currentMenu, (val: string) => {
   const vals = val.split(';')
   if (vals.length > 1) {
-    listQuery.value.sendState = ''
-    listQuery.value.outState = ''
-    listQuery.value[vals[0] as 'sendState' | 'outState'] = vals[1]
+    listQuery.value.sampleStatus = vals[1]
   }
   fetchData(false)
 })
@@ -300,7 +294,7 @@
               <el-button size="small" link type="primary" @click="bindLabel(row)">
                 标签绑定
               </el-button>
-              <el-button v-if="listQuery.sendState !== '2'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.sampleStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 分发
               </el-button>
             </template>
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 7f8f5ce..97d660a 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -5,12 +5,14 @@
   applyPerson: string // 	申请人
   applyUnit: string // 	申请单位
   approvalStatus?: string // 	审批状态
-  createUser: string // 	创建人
-  processResult: string // 	处置结果
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
   time: string // 	申请日期
   limit?: number
   offset?: number
   ids?: string[]
+  formId?: string
 }
 // 借用设备类型
 export interface borrowDeviceType {
@@ -22,6 +24,8 @@
   useDept: string // 使用部门
   usePerson: string // 使用人
   validDate: string // 有效日期
+  approvalStatusName: string
+  applyName: string
   edit?: boolean
   equipmentName?: string
   id?: string
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 470bad1..2f7a26f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -35,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :status="current" />
+    <component :is="currentComp" :status="current" apply-type="2" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 53046f0..6dc9628 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -56,7 +56,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" :type="type" />
+    <component :is="currentComp" :name="current" :type="type" apply-type="1" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index e43c46a..b863728 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,18 +1,25 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import approveAction from './approvalActionDialog.vue'
+import type { borrowDeviceType } from '../borrow-interface'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const props = defineProps({
   type: {
     type: String,
     required: true,
   },
+  applyType: {
+    type: String,
+    required: true,
+  },
 })
+const approvalDialog = ref() // 审批对话框显隐
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
@@ -21,13 +28,15 @@
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
   applyUnit: '', // 	申请单位
-  approvalStatus: '', // 	审批状态
+  approvalStatus: '0', // 	审批状态
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
+  applyType: props.applyType,
   time: '', // 	申请日期
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -94,12 +103,12 @@
   },
   {
     text: '申请部门',
-    value: 'applyUnit',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'applyPerson',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
@@ -167,7 +176,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: borrowDeviceType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -183,7 +192,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: borrowDeviceType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -197,7 +206,7 @@
   })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: borrowDeviceType) => {
   ElMessageBox.confirm(
     `确认删除${row.applyName}吗？`,
     '提示',
@@ -247,9 +256,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<borrowDeviceType[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: borrowDeviceType[]) => {
   selectList.value = row
 }
 // 导出
@@ -259,11 +268,12 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (selectList.value.length) {
-  //   selectList.value.forEach((item) => {
-  //     searchQuery.ids?.push(item.id as string)
-  //   })
-  // }
+  searchQuery.ids = []
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
@@ -292,27 +302,27 @@
     ElMessage('无可打印内容')
   }
 }
-const approveRef = ref()
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+  getList()
+}
 // 同意
-const agree = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '1',
-  })
-}
 // 驳回
-const reject = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '3',
-  })
-}
 // 拒绝
-const refuse = (row: any) => {
-  approveRef.value.initDialog(
-    {
-      radio: '2',
-    },
-  )
+const handleClick = (val: string, taskId: string) => {
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', taskId)
+  }
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', taskId)
+  }
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', taskId)
+  }
 }
+
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
@@ -376,10 +386,10 @@
 
 <template>
   <div>
+    <!-- 同意、驳回、拒绝对话框显示 -->
     <!-- 添加/编辑/查看 -->
     <app-container>
-      <!-- 审批操作 -->
-      <approve-action ref="approveRef" />
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -425,7 +435,7 @@
         <normal-table
           id="print"
           :key="Math.random()"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
@@ -447,15 +457,17 @@
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="agree(row)">
-                  同意
-                </el-button>
-                <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="reject(row)">
-                  驳回
-                </el-button>
-                <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="refuse(row)">
-                  拒绝
-                </el-button>
+                <temaplte v-if="row.approvalStatusName !== '审批中'">
+                  <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="handleClick('agree', row.taskId)">
+                    同意
+                  </el-button>
+                  <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="handleClick('reject', row.taskId)">
+                    驳回
+                  </el-button>
+                  <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="handleClick('refuse', row.taskId)">
+                    拒绝
+                  </el-button>
+                </temaplte>
                 <el-button size="small" type="primary" link @click="cancel(row)">
                   取消
                 </el-button>

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index 80d91b7..c7e8343 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -5,10 +5,10 @@
 import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
-// 列表查询
+// 任务分发列表查询
 export function getTaskList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/business/labExecutive/handOut/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 8771c29..85334a4 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -16,6 +16,16 @@
     data,
   })
 }
+
+// 状态管理编辑
+export function updateStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/updateStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: object) {
   return request({
@@ -24,6 +34,22 @@
     data,
   })
 }
+// 状态管理取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 状态管理详情
 export function detailStatus(data: object) {
   return request({
@@ -32,3 +58,12 @@
     data,
   })
 }
+
+// 状态管理导出
+export function exportStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/exportStateManageList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index c5cea4b..768c310 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -63,7 +63,7 @@
 // 导出
 export function exportFileApi(data: object) {
   return request({
-    url: 'file/listExport',
+    url: '/meter/file/listExport',
     method: 'post',
     data,
     responseType: 'blob',
@@ -86,6 +86,25 @@
     data,
   })
 }
+
+// 取消
+export function approvalCancel(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function approvalDelete(data: object) {
+  return request({
+    url: '/meter/file/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 保存草稿箱
 export function confirmDrafts(data: object) {
   return request({
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 7b538cf..1d02839 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -9,9 +9,7 @@
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
   sampleAttr: string // 样品属性
-  sendState: string // 分发状态
-  outState: string // 超期状态
-  formId: string // formId
+  sampleStatus: string // 分发状态
   limit: number
   offset: number
 }
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 799a420..f784804 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -16,12 +16,12 @@
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待分发', value: 'sendState;0' },
-  { name: '检测中', value: 'sendState;1' },
-  { name: '检测完', value: 'sendState;2' },
-  { name: '超期样品', value: 'outState;1' },
+  { name: '待分发', value: 'sampleStatus;2' },
+  { name: '检测中', value: 'sampleStatus;3' },
+  { name: '检测完', value: 'sampleStatus;4' },
+  { name: '超期样品', value: 'sampleStatus;8' },
 ]
-const currentMenu = ref('sendState;0') // 当前选中状态
+const currentMenu = ref('sampleStatus;2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 const listQuery: Ref<ITaskQuery> = ref({
@@ -34,9 +34,7 @@
   sampleAttr: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  sampleStatus: '2', // 样品状态:默认待分发
   offset: 1,
   limit: 20,
 })
@@ -82,18 +80,18 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  // // 模拟数据
+  // list.value = [
+  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
+  // ]
+  // loadingTable.value = false
+  // console.log(listQuery.value)
+  getTaskList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = response.data.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -114,9 +112,7 @@
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleStatus: '2', // 分发状态
     offset: 1,
     limit: 20,
   }
@@ -202,9 +198,7 @@
 watch(currentMenu, (val: string) => {
   const vals = val.split(';')
   if (vals.length > 1) {
-    listQuery.value.sendState = ''
-    listQuery.value.outState = ''
-    listQuery.value[vals[0] as 'sendState' | 'outState'] = vals[1]
+    listQuery.value.sampleStatus = vals[1]
   }
   fetchData(false)
 })
@@ -300,7 +294,7 @@
               <el-button size="small" link type="primary" @click="bindLabel(row)">
                 标签绑定
               </el-button>
-              <el-button v-if="listQuery.sendState !== '2'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.sampleStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 分发
               </el-button>
             </template>
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 7f8f5ce..97d660a 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -5,12 +5,14 @@
   applyPerson: string // 	申请人
   applyUnit: string // 	申请单位
   approvalStatus?: string // 	审批状态
-  createUser: string // 	创建人
-  processResult: string // 	处置结果
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
   time: string // 	申请日期
   limit?: number
   offset?: number
   ids?: string[]
+  formId?: string
 }
 // 借用设备类型
 export interface borrowDeviceType {
@@ -22,6 +24,8 @@
   useDept: string // 使用部门
   usePerson: string // 使用人
   validDate: string // 有效日期
+  approvalStatusName: string
+  applyName: string
   edit?: boolean
   equipmentName?: string
   id?: string
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 470bad1..2f7a26f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -35,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :status="current" />
+    <component :is="currentComp" :status="current" apply-type="2" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 53046f0..6dc9628 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -56,7 +56,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" :type="type" />
+    <component :is="currentComp" :name="current" :type="type" apply-type="1" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index e43c46a..b863728 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,18 +1,25 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import approveAction from './approvalActionDialog.vue'
+import type { borrowDeviceType } from '../borrow-interface'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const props = defineProps({
   type: {
     type: String,
     required: true,
   },
+  applyType: {
+    type: String,
+    required: true,
+  },
 })
+const approvalDialog = ref() // 审批对话框显隐
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
@@ -21,13 +28,15 @@
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
   applyUnit: '', // 	申请单位
-  approvalStatus: '', // 	审批状态
+  approvalStatus: '0', // 	审批状态
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
+  applyType: props.applyType,
   time: '', // 	申请日期
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -94,12 +103,12 @@
   },
   {
     text: '申请部门',
-    value: 'applyUnit',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'applyPerson',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
@@ -167,7 +176,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: borrowDeviceType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -183,7 +192,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: borrowDeviceType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -197,7 +206,7 @@
   })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: borrowDeviceType) => {
   ElMessageBox.confirm(
     `确认删除${row.applyName}吗？`,
     '提示',
@@ -247,9 +256,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<borrowDeviceType[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: borrowDeviceType[]) => {
   selectList.value = row
 }
 // 导出
@@ -259,11 +268,12 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (selectList.value.length) {
-  //   selectList.value.forEach((item) => {
-  //     searchQuery.ids?.push(item.id as string)
-  //   })
-  // }
+  searchQuery.ids = []
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
@@ -292,27 +302,27 @@
     ElMessage('无可打印内容')
   }
 }
-const approveRef = ref()
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+  getList()
+}
 // 同意
-const agree = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '1',
-  })
-}
 // 驳回
-const reject = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '3',
-  })
-}
 // 拒绝
-const refuse = (row: any) => {
-  approveRef.value.initDialog(
-    {
-      radio: '2',
-    },
-  )
+const handleClick = (val: string, taskId: string) => {
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', taskId)
+  }
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', taskId)
+  }
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', taskId)
+  }
 }
+
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
@@ -376,10 +386,10 @@
 
 <template>
   <div>
+    <!-- 同意、驳回、拒绝对话框显示 -->
     <!-- 添加/编辑/查看 -->
     <app-container>
-      <!-- 审批操作 -->
-      <approve-action ref="approveRef" />
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -425,7 +435,7 @@
         <normal-table
           id="print"
           :key="Math.random()"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
@@ -447,15 +457,17 @@
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="agree(row)">
-                  同意
-                </el-button>
-                <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="reject(row)">
-                  驳回
-                </el-button>
-                <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="refuse(row)">
-                  拒绝
-                </el-button>
+                <temaplte v-if="row.approvalStatusName !== '审批中'">
+                  <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="handleClick('agree', row.taskId)">
+                    同意
+                  </el-button>
+                  <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="handleClick('reject', row.taskId)">
+                    驳回
+                  </el-button>
+                  <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="handleClick('refuse', row.taskId)">
+                    拒绝
+                  </el-button>
+                </temaplte>
                 <el-button size="small" type="primary" link @click="cancel(row)">
                   取消
                 </el-button>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 7f3ea3e..293be0c 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,24 +1,37 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
     required: true,
   },
+  applyType: {
+    type: String,
+    required: true,
+  },
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
-const searchQuery = reactive({
-  applyNo: '',
-  applyName: '',
-  applyUnit: '',
-  applyPerson: '',
-  limit: 10,
+const searchQuery = reactive<searchType>({
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 	申请人
+  applyUnit: '', // 	申请单位
+  approvalStatus: '0', // 	审批状态
+  createUser: '', // 	创建人
+  processResult: '', // 	处置结果
+  applyType: props.applyType,
+  time: '', // 	申请日期
+  ids: [] as string[],
+  limit: 20,
   offset: 1,
-  ids: [],
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -68,35 +81,16 @@
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  // loadingTable.value = true
-  // listPageApi(searchQuery).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  //   loadingTable.value = false
-  // }).catch((_) => {
-  //   loadingTable.value = false
-  // })
-  // list.value = [
-  //   {
-  //     applyName: '借用测试设备',
-  //     applyNo: '1433223',
-  //     applyUnit: '顶级',
-  //     applyPerson: '张三',
-  //     time: '2020-12-12 00:00:00',
-  //     approvalStatusName: '审批中',
-  //   },
-  //   {
-  //     applyName: '借用电脑',
-  //     applyNo: '1433223',
-  //     applyUnit: '徐州分中心',
-  //     applyPerson: '里斯',
-  //     time: '2020-12-12 00:00:00',
-  //     approvalStatusName: '已通过',
-  //   },
-  // ] as any
-  // total.value = 2
+  loadingTable.value = true
+  getApplyList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -124,6 +118,7 @@
     query: {
       title: '详情',
       name: '设备借用处理',
+      // approvalStatusName: row.approvalStatusName,
     },
   })
 }
@@ -157,15 +152,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -174,7 +169,11 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
 // 模板下载

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index 80d91b7..c7e8343 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -5,10 +5,10 @@
 import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
-// 列表查询
+// 任务分发列表查询
 export function getTaskList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/business/labExecutive/handOut/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 8771c29..85334a4 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -16,6 +16,16 @@
     data,
   })
 }
+
+// 状态管理编辑
+export function updateStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/updateStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: object) {
   return request({
@@ -24,6 +34,22 @@
     data,
   })
 }
+// 状态管理取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 状态管理详情
 export function detailStatus(data: object) {
   return request({
@@ -32,3 +58,12 @@
     data,
   })
 }
+
+// 状态管理导出
+export function exportStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/exportStateManageList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index c5cea4b..768c310 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -63,7 +63,7 @@
 // 导出
 export function exportFileApi(data: object) {
   return request({
-    url: 'file/listExport',
+    url: '/meter/file/listExport',
     method: 'post',
     data,
     responseType: 'blob',
@@ -86,6 +86,25 @@
     data,
   })
 }
+
+// 取消
+export function approvalCancel(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function approvalDelete(data: object) {
+  return request({
+    url: '/meter/file/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 保存草稿箱
 export function confirmDrafts(data: object) {
   return request({
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 7b538cf..1d02839 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -9,9 +9,7 @@
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
   sampleAttr: string // 样品属性
-  sendState: string // 分发状态
-  outState: string // 超期状态
-  formId: string // formId
+  sampleStatus: string // 分发状态
   limit: number
   offset: number
 }
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 799a420..f784804 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -16,12 +16,12 @@
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待分发', value: 'sendState;0' },
-  { name: '检测中', value: 'sendState;1' },
-  { name: '检测完', value: 'sendState;2' },
-  { name: '超期样品', value: 'outState;1' },
+  { name: '待分发', value: 'sampleStatus;2' },
+  { name: '检测中', value: 'sampleStatus;3' },
+  { name: '检测完', value: 'sampleStatus;4' },
+  { name: '超期样品', value: 'sampleStatus;8' },
 ]
-const currentMenu = ref('sendState;0') // 当前选中状态
+const currentMenu = ref('sampleStatus;2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 const listQuery: Ref<ITaskQuery> = ref({
@@ -34,9 +34,7 @@
   sampleAttr: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  sampleStatus: '2', // 样品状态:默认待分发
   offset: 1,
   limit: 20,
 })
@@ -82,18 +80,18 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  // // 模拟数据
+  // list.value = [
+  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
+  // ]
+  // loadingTable.value = false
+  // console.log(listQuery.value)
+  getTaskList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = response.data.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -114,9 +112,7 @@
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleStatus: '2', // 分发状态
     offset: 1,
     limit: 20,
   }
@@ -202,9 +198,7 @@
 watch(currentMenu, (val: string) => {
   const vals = val.split(';')
   if (vals.length > 1) {
-    listQuery.value.sendState = ''
-    listQuery.value.outState = ''
-    listQuery.value[vals[0] as 'sendState' | 'outState'] = vals[1]
+    listQuery.value.sampleStatus = vals[1]
   }
   fetchData(false)
 })
@@ -300,7 +294,7 @@
               <el-button size="small" link type="primary" @click="bindLabel(row)">
                 标签绑定
               </el-button>
-              <el-button v-if="listQuery.sendState !== '2'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.sampleStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 分发
               </el-button>
             </template>
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 7f8f5ce..97d660a 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -5,12 +5,14 @@
   applyPerson: string // 	申请人
   applyUnit: string // 	申请单位
   approvalStatus?: string // 	审批状态
-  createUser: string // 	创建人
-  processResult: string // 	处置结果
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
   time: string // 	申请日期
   limit?: number
   offset?: number
   ids?: string[]
+  formId?: string
 }
 // 借用设备类型
 export interface borrowDeviceType {
@@ -22,6 +24,8 @@
   useDept: string // 使用部门
   usePerson: string // 使用人
   validDate: string // 有效日期
+  approvalStatusName: string
+  applyName: string
   edit?: boolean
   equipmentName?: string
   id?: string
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 470bad1..2f7a26f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -35,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :status="current" />
+    <component :is="currentComp" :status="current" apply-type="2" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 53046f0..6dc9628 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -56,7 +56,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" :type="type" />
+    <component :is="currentComp" :name="current" :type="type" apply-type="1" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index e43c46a..b863728 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,18 +1,25 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import approveAction from './approvalActionDialog.vue'
+import type { borrowDeviceType } from '../borrow-interface'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const props = defineProps({
   type: {
     type: String,
     required: true,
   },
+  applyType: {
+    type: String,
+    required: true,
+  },
 })
+const approvalDialog = ref() // 审批对话框显隐
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
@@ -21,13 +28,15 @@
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
   applyUnit: '', // 	申请单位
-  approvalStatus: '', // 	审批状态
+  approvalStatus: '0', // 	审批状态
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
+  applyType: props.applyType,
   time: '', // 	申请日期
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -94,12 +103,12 @@
   },
   {
     text: '申请部门',
-    value: 'applyUnit',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'applyPerson',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
@@ -167,7 +176,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: borrowDeviceType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -183,7 +192,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: borrowDeviceType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -197,7 +206,7 @@
   })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: borrowDeviceType) => {
   ElMessageBox.confirm(
     `确认删除${row.applyName}吗？`,
     '提示',
@@ -247,9 +256,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<borrowDeviceType[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: borrowDeviceType[]) => {
   selectList.value = row
 }
 // 导出
@@ -259,11 +268,12 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (selectList.value.length) {
-  //   selectList.value.forEach((item) => {
-  //     searchQuery.ids?.push(item.id as string)
-  //   })
-  // }
+  searchQuery.ids = []
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
@@ -292,27 +302,27 @@
     ElMessage('无可打印内容')
   }
 }
-const approveRef = ref()
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+  getList()
+}
 // 同意
-const agree = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '1',
-  })
-}
 // 驳回
-const reject = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '3',
-  })
-}
 // 拒绝
-const refuse = (row: any) => {
-  approveRef.value.initDialog(
-    {
-      radio: '2',
-    },
-  )
+const handleClick = (val: string, taskId: string) => {
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', taskId)
+  }
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', taskId)
+  }
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', taskId)
+  }
 }
+
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
@@ -376,10 +386,10 @@
 
 <template>
   <div>
+    <!-- 同意、驳回、拒绝对话框显示 -->
     <!-- 添加/编辑/查看 -->
     <app-container>
-      <!-- 审批操作 -->
-      <approve-action ref="approveRef" />
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -425,7 +435,7 @@
         <normal-table
           id="print"
           :key="Math.random()"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
@@ -447,15 +457,17 @@
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="agree(row)">
-                  同意
-                </el-button>
-                <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="reject(row)">
-                  驳回
-                </el-button>
-                <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="refuse(row)">
-                  拒绝
-                </el-button>
+                <temaplte v-if="row.approvalStatusName !== '审批中'">
+                  <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="handleClick('agree', row.taskId)">
+                    同意
+                  </el-button>
+                  <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="handleClick('reject', row.taskId)">
+                    驳回
+                  </el-button>
+                  <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="handleClick('refuse', row.taskId)">
+                    拒绝
+                  </el-button>
+                </temaplte>
                 <el-button size="small" type="primary" link @click="cancel(row)">
                   取消
                 </el-button>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 7f3ea3e..293be0c 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,24 +1,37 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
     required: true,
   },
+  applyType: {
+    type: String,
+    required: true,
+  },
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
-const searchQuery = reactive({
-  applyNo: '',
-  applyName: '',
-  applyUnit: '',
-  applyPerson: '',
-  limit: 10,
+const searchQuery = reactive<searchType>({
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 	申请人
+  applyUnit: '', // 	申请单位
+  approvalStatus: '0', // 	审批状态
+  createUser: '', // 	创建人
+  processResult: '', // 	处置结果
+  applyType: props.applyType,
+  time: '', // 	申请日期
+  ids: [] as string[],
+  limit: 20,
   offset: 1,
-  ids: [],
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -68,35 +81,16 @@
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  // loadingTable.value = true
-  // listPageApi(searchQuery).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  //   loadingTable.value = false
-  // }).catch((_) => {
-  //   loadingTable.value = false
-  // })
-  // list.value = [
-  //   {
-  //     applyName: '借用测试设备',
-  //     applyNo: '1433223',
-  //     applyUnit: '顶级',
-  //     applyPerson: '张三',
-  //     time: '2020-12-12 00:00:00',
-  //     approvalStatusName: '审批中',
-  //   },
-  //   {
-  //     applyName: '借用电脑',
-  //     applyNo: '1433223',
-  //     applyUnit: '徐州分中心',
-  //     applyPerson: '里斯',
-  //     time: '2020-12-12 00:00:00',
-  //     approvalStatusName: '已通过',
-  //   },
-  // ] as any
-  // total.value = 2
+  loadingTable.value = true
+  getApplyList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -124,6 +118,7 @@
     query: {
       title: '详情',
       name: '设备借用处理',
+      // approvalStatusName: row.approvalStatusName,
     },
   })
 }
@@ -157,15 +152,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -174,7 +169,11 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
 // 模板下载
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index ec522cf..0d33dfb 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -13,7 +13,7 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
-import { addStatus, detailStatus } from '@/api/device/stateManage'
+import { addStatus, detailStatus, updateStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
 import useUserStore from '@/store/modules/user'
 
@@ -30,7 +30,7 @@
 }
 const ruleForm1 = ref({
   applyType: $route.query.applyType, // 申请类型
-  applyDesc: '', // 申请说明
+  remark: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
   applyUnit: '', // 申请单位
@@ -41,6 +41,7 @@
   equipmentSpecifications: '', // 设备规格
   manufacturingNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
+  equipmentId: '',
   equipmentList: [] as EquipmentListRow[],
   id: '',
 }) // 表单
@@ -212,7 +213,7 @@
         ruleForm1.value = res.data
         ruleForm1.value.applyUnit = res.data.applyUnit
         ruleForm1.value.equipmentNo = res.data.applyNo
-        ruleForm1.value.equipmentName = res.data.applyTypeName
+        ruleForm1.value.equipmentName = res.data.equipmentName
         ruleForm1.value.time = res.data.time
       })
     }
@@ -304,15 +305,34 @@
             type: 'warning',
           },
         ).then((res) => {
-          addStatus(ruleForm1.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('操作成功!')
-              $router.go(-1)
+          if (title.value == '编辑') {
+            ruleForm1.value.applyPerson = ruleForm1.value.id
+            ruleForm1.value.applyUnit = ruleForm1.value.id
+            if (ruleForm1.value.equipmentList && ruleForm1.value.equipmentList[0]) {
+              ruleForm1.value.equipmentId = ruleForm1.value.equipmentList[0].equipmentId
+              delete ruleForm1.value.equipmentList
             }
-            else {
-              ElMessage.warning(res.message)
-            }
-          })
+            updateStatus(ruleForm1.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              }
+              else {
+                ElMessage.warning(res.message)
+              }
+            })
+          }
+          else {
+            addStatus(ruleForm1.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              }
+              else {
+                ElMessage.warning(res.message)
+              }
+            })
+          }
         })
       }
     })
@@ -680,8 +700,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="18">
-            <el-form-item label="申请理由" prop="applyDesc">
-              <el-input v-model.trim="ruleForm1.applyDesc" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
+            <el-form-item label="申请理由" prop="remark">
+              <el-input v-model.trim="ruleForm1.remark" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -760,7 +780,7 @@
           </el-table-column>
         </el-table>
       </detail-block>
-      <detail-block v-if="title !== '新建'" title="审批流程">
+      <!-- <detail-block v-if="title !== '新建'" title="审批流程">
         <el-timeline>
           <el-timeline-item timestamp="2018/4/12" placement="top">
             <el-card>
@@ -781,7 +801,7 @@
             </el-card>
           </el-timeline-item>
         </el-timeline>
-      </detail-block>
+      </detail-block> -->
     </div>
   </app-container>
 </template>

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index 80d91b7..c7e8343 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -5,10 +5,10 @@
 import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
-// 列表查询
+// 任务分发列表查询
 export function getTaskList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/business/labExecutive/handOut/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 8771c29..85334a4 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -16,6 +16,16 @@
     data,
   })
 }
+
+// 状态管理编辑
+export function updateStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/updateStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: object) {
   return request({
@@ -24,6 +34,22 @@
     data,
   })
 }
+// 状态管理取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 状态管理详情
 export function detailStatus(data: object) {
   return request({
@@ -32,3 +58,12 @@
     data,
   })
 }
+
+// 状态管理导出
+export function exportStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/exportStateManageList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index c5cea4b..768c310 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -63,7 +63,7 @@
 // 导出
 export function exportFileApi(data: object) {
   return request({
-    url: 'file/listExport',
+    url: '/meter/file/listExport',
     method: 'post',
     data,
     responseType: 'blob',
@@ -86,6 +86,25 @@
     data,
   })
 }
+
+// 取消
+export function approvalCancel(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function approvalDelete(data: object) {
+  return request({
+    url: '/meter/file/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 保存草稿箱
 export function confirmDrafts(data: object) {
   return request({
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 7b538cf..1d02839 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -9,9 +9,7 @@
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
   sampleAttr: string // 样品属性
-  sendState: string // 分发状态
-  outState: string // 超期状态
-  formId: string // formId
+  sampleStatus: string // 分发状态
   limit: number
   offset: number
 }
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 799a420..f784804 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -16,12 +16,12 @@
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待分发', value: 'sendState;0' },
-  { name: '检测中', value: 'sendState;1' },
-  { name: '检测完', value: 'sendState;2' },
-  { name: '超期样品', value: 'outState;1' },
+  { name: '待分发', value: 'sampleStatus;2' },
+  { name: '检测中', value: 'sampleStatus;3' },
+  { name: '检测完', value: 'sampleStatus;4' },
+  { name: '超期样品', value: 'sampleStatus;8' },
 ]
-const currentMenu = ref('sendState;0') // 当前选中状态
+const currentMenu = ref('sampleStatus;2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 const listQuery: Ref<ITaskQuery> = ref({
@@ -34,9 +34,7 @@
   sampleAttr: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  sampleStatus: '2', // 样品状态:默认待分发
   offset: 1,
   limit: 20,
 })
@@ -82,18 +80,18 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  // // 模拟数据
+  // list.value = [
+  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
+  // ]
+  // loadingTable.value = false
+  // console.log(listQuery.value)
+  getTaskList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = response.data.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -114,9 +112,7 @@
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleStatus: '2', // 分发状态
     offset: 1,
     limit: 20,
   }
@@ -202,9 +198,7 @@
 watch(currentMenu, (val: string) => {
   const vals = val.split(';')
   if (vals.length > 1) {
-    listQuery.value.sendState = ''
-    listQuery.value.outState = ''
-    listQuery.value[vals[0] as 'sendState' | 'outState'] = vals[1]
+    listQuery.value.sampleStatus = vals[1]
   }
   fetchData(false)
 })
@@ -300,7 +294,7 @@
               <el-button size="small" link type="primary" @click="bindLabel(row)">
                 标签绑定
               </el-button>
-              <el-button v-if="listQuery.sendState !== '2'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.sampleStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 分发
               </el-button>
             </template>
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 7f8f5ce..97d660a 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -5,12 +5,14 @@
   applyPerson: string // 	申请人
   applyUnit: string // 	申请单位
   approvalStatus?: string // 	审批状态
-  createUser: string // 	创建人
-  processResult: string // 	处置结果
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
   time: string // 	申请日期
   limit?: number
   offset?: number
   ids?: string[]
+  formId?: string
 }
 // 借用设备类型
 export interface borrowDeviceType {
@@ -22,6 +24,8 @@
   useDept: string // 使用部门
   usePerson: string // 使用人
   validDate: string // 有效日期
+  approvalStatusName: string
+  applyName: string
   edit?: boolean
   equipmentName?: string
   id?: string
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 470bad1..2f7a26f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -35,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :status="current" />
+    <component :is="currentComp" :status="current" apply-type="2" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 53046f0..6dc9628 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -56,7 +56,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" :type="type" />
+    <component :is="currentComp" :name="current" :type="type" apply-type="1" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index e43c46a..b863728 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,18 +1,25 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import approveAction from './approvalActionDialog.vue'
+import type { borrowDeviceType } from '../borrow-interface'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const props = defineProps({
   type: {
     type: String,
     required: true,
   },
+  applyType: {
+    type: String,
+    required: true,
+  },
 })
+const approvalDialog = ref() // 审批对话框显隐
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
@@ -21,13 +28,15 @@
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
   applyUnit: '', // 	申请单位
-  approvalStatus: '', // 	审批状态
+  approvalStatus: '0', // 	审批状态
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
+  applyType: props.applyType,
   time: '', // 	申请日期
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -94,12 +103,12 @@
   },
   {
     text: '申请部门',
-    value: 'applyUnit',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'applyPerson',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
@@ -167,7 +176,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: borrowDeviceType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -183,7 +192,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: borrowDeviceType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -197,7 +206,7 @@
   })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: borrowDeviceType) => {
   ElMessageBox.confirm(
     `确认删除${row.applyName}吗？`,
     '提示',
@@ -247,9 +256,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<borrowDeviceType[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: borrowDeviceType[]) => {
   selectList.value = row
 }
 // 导出
@@ -259,11 +268,12 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (selectList.value.length) {
-  //   selectList.value.forEach((item) => {
-  //     searchQuery.ids?.push(item.id as string)
-  //   })
-  // }
+  searchQuery.ids = []
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
@@ -292,27 +302,27 @@
     ElMessage('无可打印内容')
   }
 }
-const approveRef = ref()
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+  getList()
+}
 // 同意
-const agree = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '1',
-  })
-}
 // 驳回
-const reject = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '3',
-  })
-}
 // 拒绝
-const refuse = (row: any) => {
-  approveRef.value.initDialog(
-    {
-      radio: '2',
-    },
-  )
+const handleClick = (val: string, taskId: string) => {
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', taskId)
+  }
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', taskId)
+  }
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', taskId)
+  }
 }
+
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
@@ -376,10 +386,10 @@
 
 <template>
   <div>
+    <!-- 同意、驳回、拒绝对话框显示 -->
     <!-- 添加/编辑/查看 -->
     <app-container>
-      <!-- 审批操作 -->
-      <approve-action ref="approveRef" />
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -425,7 +435,7 @@
         <normal-table
           id="print"
           :key="Math.random()"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
@@ -447,15 +457,17 @@
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="agree(row)">
-                  同意
-                </el-button>
-                <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="reject(row)">
-                  驳回
-                </el-button>
-                <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="refuse(row)">
-                  拒绝
-                </el-button>
+                <temaplte v-if="row.approvalStatusName !== '审批中'">
+                  <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="handleClick('agree', row.taskId)">
+                    同意
+                  </el-button>
+                  <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="handleClick('reject', row.taskId)">
+                    驳回
+                  </el-button>
+                  <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="handleClick('refuse', row.taskId)">
+                    拒绝
+                  </el-button>
+                </temaplte>
                 <el-button size="small" type="primary" link @click="cancel(row)">
                   取消
                 </el-button>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 7f3ea3e..293be0c 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,24 +1,37 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
     required: true,
   },
+  applyType: {
+    type: String,
+    required: true,
+  },
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
-const searchQuery = reactive({
-  applyNo: '',
-  applyName: '',
-  applyUnit: '',
-  applyPerson: '',
-  limit: 10,
+const searchQuery = reactive<searchType>({
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 	申请人
+  applyUnit: '', // 	申请单位
+  approvalStatus: '0', // 	审批状态
+  createUser: '', // 	创建人
+  processResult: '', // 	处置结果
+  applyType: props.applyType,
+  time: '', // 	申请日期
+  ids: [] as string[],
+  limit: 20,
   offset: 1,
-  ids: [],
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -68,35 +81,16 @@
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  // loadingTable.value = true
-  // listPageApi(searchQuery).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  //   loadingTable.value = false
-  // }).catch((_) => {
-  //   loadingTable.value = false
-  // })
-  // list.value = [
-  //   {
-  //     applyName: '借用测试设备',
-  //     applyNo: '1433223',
-  //     applyUnit: '顶级',
-  //     applyPerson: '张三',
-  //     time: '2020-12-12 00:00:00',
-  //     approvalStatusName: '审批中',
-  //   },
-  //   {
-  //     applyName: '借用电脑',
-  //     applyNo: '1433223',
-  //     applyUnit: '徐州分中心',
-  //     applyPerson: '里斯',
-  //     time: '2020-12-12 00:00:00',
-  //     approvalStatusName: '已通过',
-  //   },
-  // ] as any
-  // total.value = 2
+  loadingTable.value = true
+  getApplyList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -124,6 +118,7 @@
     query: {
       title: '详情',
       name: '设备借用处理',
+      // approvalStatusName: row.approvalStatusName,
     },
   })
 }
@@ -157,15 +152,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -174,7 +169,11 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
 // 模板下载
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index ec522cf..0d33dfb 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -13,7 +13,7 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
-import { addStatus, detailStatus } from '@/api/device/stateManage'
+import { addStatus, detailStatus, updateStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
 import useUserStore from '@/store/modules/user'
 
@@ -30,7 +30,7 @@
 }
 const ruleForm1 = ref({
   applyType: $route.query.applyType, // 申请类型
-  applyDesc: '', // 申请说明
+  remark: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
   applyUnit: '', // 申请单位
@@ -41,6 +41,7 @@
   equipmentSpecifications: '', // 设备规格
   manufacturingNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
+  equipmentId: '',
   equipmentList: [] as EquipmentListRow[],
   id: '',
 }) // 表单
@@ -212,7 +213,7 @@
         ruleForm1.value = res.data
         ruleForm1.value.applyUnit = res.data.applyUnit
         ruleForm1.value.equipmentNo = res.data.applyNo
-        ruleForm1.value.equipmentName = res.data.applyTypeName
+        ruleForm1.value.equipmentName = res.data.equipmentName
         ruleForm1.value.time = res.data.time
       })
     }
@@ -304,15 +305,34 @@
             type: 'warning',
           },
         ).then((res) => {
-          addStatus(ruleForm1.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('操作成功!')
-              $router.go(-1)
+          if (title.value == '编辑') {
+            ruleForm1.value.applyPerson = ruleForm1.value.id
+            ruleForm1.value.applyUnit = ruleForm1.value.id
+            if (ruleForm1.value.equipmentList && ruleForm1.value.equipmentList[0]) {
+              ruleForm1.value.equipmentId = ruleForm1.value.equipmentList[0].equipmentId
+              delete ruleForm1.value.equipmentList
             }
-            else {
-              ElMessage.warning(res.message)
-            }
-          })
+            updateStatus(ruleForm1.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              }
+              else {
+                ElMessage.warning(res.message)
+              }
+            })
+          }
+          else {
+            addStatus(ruleForm1.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              }
+              else {
+                ElMessage.warning(res.message)
+              }
+            })
+          }
         })
       }
     })
@@ -680,8 +700,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="18">
-            <el-form-item label="申请理由" prop="applyDesc">
-              <el-input v-model.trim="ruleForm1.applyDesc" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
+            <el-form-item label="申请理由" prop="remark">
+              <el-input v-model.trim="ruleForm1.remark" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -760,7 +780,7 @@
           </el-table-column>
         </el-table>
       </detail-block>
-      <detail-block v-if="title !== '新建'" title="审批流程">
+      <!-- <detail-block v-if="title !== '新建'" title="审批流程">
         <el-timeline>
           <el-timeline-item timestamp="2018/4/12" placement="top">
             <el-card>
@@ -781,7 +801,7 @@
             </el-card>
           </el-timeline-item>
         </el-timeline>
-      </detail-block>
+      </detail-block> -->
     </div>
   </app-container>
 </template>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 1cc56b2..5a4aad6 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,14 +1,20 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { TableRow } from './status-interface'
-import { getStatusList } from '@/api/device/stateManage'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import {
+  cancelStatus,
+  deleteStatus,
+  exportStatus,
+  getStatusList,
+  submitStatus,
+} from '@/api/device/stateManage'
 import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
-
+// 选中的按钮
 const props = defineProps({
   name: {
     type: String,
@@ -18,28 +24,53 @@
     type: String,
     default: '',
   },
-  type: { // 当前状态
+  type: {
+    // 当前状态
     type: String,
     default: '',
   },
-  applyType: { // 设备申请类型
+  applyType: {
+    // 设备申请类型
     type: String,
     default: '',
   },
-})
+}); const active = ref('0')// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
+
 const formIdList = ref({
   设备闲置申请: 'DEVICE_UNUSED_APPROVAL',
   设备封存申请: 'DEVICE_SEALED_APPROVAL',
   设备启封申请: 'DEVICE_UNSEALED_APPROVAL',
   设备报废申请: 'DEVICE_SCRAPPED_ROVAL',
   设备处置申请: 'DEVICE_HANDLE_APPROVAL',
+  设备借用申请: 'DEVICE_BORROW_APPROVAL',
 })
 const $router = useRouter()
 const searchQuery = reactive({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
   applyUnit: '', // 申请单位
-  approvalStatus: '', // 审批状态
+  approvalStatus: '0', // 审批状态
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
@@ -104,28 +135,53 @@
   },
 ]) // 表格
 const list = ref([]) // 表格数据
+const managerStateList = ref([]) // 状态数据
 const approvalDialog = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const { proxy } = getCurrentInstance() as any
+
+const clearSearch = () => {
+  searchQuery.equipmentName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyStatus = ''
+  searchQuery.applyUnit = ''
+  searchQuery.approvalStatus = ''
+  searchQuery.createUser = ''
+  searchQuery.equipmentNo = ''
+  searchQuery.ids = [] as string[]
+  searchQuery.limit = 20
+  searchQuery.offset = 1
+  searchQuery.applyType = props.applyType
+  searchQuery.formId = SCHEDULE[formIdList.value[props.name]]
+}
+
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  getDictByCode('managerState').then((response) => {
-    if (response.code === 200) {
-      console.log(response.data, 'response') // 状态
-
-      // 根据闲置，封存，启封等状态获取不同的列表
-      // 接口未写好
-      getStatusList(searchQuery).then((res) => {
-        if (res.code === 200) {
-          list.value = res.data.rows
-          total.value = res.data.total
-        }
-        loadingTable.value = false
-      })
-    }
-  }).catch((_) => {
-    loadingTable.value = false
-  })
+  getDictByCode('managerState')
+    .then((response) => {
+      if (response.code === 200) {
+        console.log(response.data, 'response') // 状态
+        managerStateList.value = response.data
+        // searchQuery.approvalStatus = active.value
+        // 根据闲置，封存，启封等状态获取不同的列表
+        getStatusList(searchQuery).then((res) => {
+          if (res.code === 200) {
+            list.value = res.data.rows.map((item: TableRow) => {
+              return {
+                ...item,
+                approvalStatus: approvalStatusMap[item.approvalStatus],
+              }
+            })
+            total.value = res.data.total
+          }
+          loadingTable.value = false
+        })
+      }
+    })
+    .catch((_) => {
+      loadingTable.value = false
+    })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -158,6 +214,7 @@
     name: 'stateManageDetail',
     params: {
       type: 'edit',
+      id: row.id,
     },
     query: {
       title: '编辑',
@@ -168,39 +225,74 @@
 }
 // 删除
 const remove = (row: TableRow) => {
-  ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
+  const { id } = row
+  ElMessageBox.confirm(`确认删除${row.equipmentName}吗？`, '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    deleteStatus({ id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 同意
 const agree = (row: TableRow) => {
-  approvalDialog.value.initDialog('agree', row.taskId)
+  approvalDialog.value.initDialog('agree', row.processId)
 }
 // 驳回
 const reject = (row: TableRow) => {
-  approvalDialog.value.initDialog('reject', row.taskId)
+  approvalDialog.value.initDialog('reject', row.processId)
 }
 // 拒绝
 const refuse = (row: TableRow) => {
-  approvalDialog.value.initDialog('refuse', row.taskId)
+  approvalDialog.value.initDialog('refuse', row.processId)
 }
 // 取消
-const cancel = (rowrow: TableRow) => {
-  ElMessageBox.confirm(
-    '确认取消吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
+const cancel = (row: TableRow) => {
+  const { processId } = row
+  ElMessageBox.confirm('确认取消吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    cancelStatus({ processInstanceId: processId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+
+// 提交
+const submit = (row: TableRow) => {
+  // 流程id为空
+  const { id } = row
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitStatus({ id, formId: searchQuery.formId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 搜索
 const search = () => {
@@ -208,16 +300,13 @@
 }
 // 重置
 const reset = () => {
+  clearSearch()
   getList()
 }
 // 模板下载
-const templateDownload = () => {
-
-}
+const templateDownload = () => {}
 // 标签识别
-const identify = () => {
-
-}
+const identify = () => {}
 // 新增
 const add = () => {
   $router.push({
@@ -251,7 +340,9 @@
     printJSON(list.value, properties, props.name)
   }
   else if (selectIds.length > 0) {
-    const printList = list.value.filter((item: TableRow) => selectIds.includes(item.id))
+    const printList = list.value.filter((item: TableRow) =>
+      selectIds.includes(item.id),
+    )
     printJSON(printList, properties, props.name)
   }
   else {
@@ -260,11 +351,37 @@
 }
 // 导出
 const exportExcelBtn = () => {
+  // const params: supplierExportQuery = {
+  //   approvalStatus: listQuery.value.approvalStatus,
+  //   businessContent: listQuery.value.businessContent,
+  //   companyArea: listQuery.value.companyArea,
+  //   companyCity: listQuery.value.companyCity,
+  //   companyProvince: listQuery.value.companyProvince,
+  //   formId: listQuery.value.formId,
+  //   supplierName: listQuery.value.supplierName,
+  //   supplierNo: listQuery.value.supplierNo,
+  // }
+  // if (checkoutList.value.length > 0) {
+  //   params.ids = checkoutList.value
+  // }
+  const postData = {
+    applyType: searchQuery.applyType,
+    approvalStatus: searchQuery.approvalStatus,
+    createUser: searchQuery.createUser,
+    ids: [] as number[],
+  }
+  postData.ids = selectList.value.map((item) => {
+    return item.id
+  })
+  exportStatus(postData).then((res) => {
+
+  })
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  loading.close()
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -284,18 +401,22 @@
   getList()
   dialogVisible.value = false
 }
-watch(() => props.type, (newValue) => {
-  if (newValue === '0') {
-    searchQuery.approvalStatus = ''
-  }
-  else {
-    searchQuery.approvalStatus = newValue
-  }
-  getList()
-}, {
-  immediate: true,
-  deep: true,
-})
+watch(
+  () => props.type,
+  (newValue) => {
+    if (newValue === '0') {
+      searchQuery.approvalStatus = ''
+    }
+    else {
+      searchQuery.approvalStatus = newValue
+    }
+    getList()
+  },
+  {
+    immediate: true,
+    deep: true,
+  },
+)
 </script>
 
 <template>
@@ -307,68 +428,197 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input
+            v-model="searchQuery.applyNo"
+            placeholder="申请编号"
+            clearable
+            class="w-50 m-2"
+          />
         </search-item>
         <search-item>
-          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input
+            v-model="searchQuery.equipmentNo"
+            placeholder="设备编号"
+            clearable
+            class="w-50 m-2"
+          />
         </search-item>
         <search-item>
-          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input
+            v-model="searchQuery.equipmentName"
+            placeholder="设备名称"
+            clearable
+            class="w-50 m-2"
+          />
         </search-item>
         <search-item>
-          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input
+            v-model="searchQuery.applyUnit"
+            placeholder="申请单位"
+            clearable
+            class="w-50 m-2"
+          />
         </search-item>
         <search-item>
-          <el-select placeholder="申请状态" clearable />
+          <el-select
+            v-model="searchQuery.applyStatus"
+            placeholder="申请状态"
+            clearable
+          >
+            <el-option
+              v-for="manager of managerStateList"
+              :key="manager.id"
+              :label="manager.name"
+              :value="manager.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <input
+            v-show="searchQuery.limit === 0"
+            ref="fileRef"
+            type="file"
+            multiple
+            @change="onFileChange"
+          >
           <icon-button icon="icon-add" title="新建" @click="add" />
-          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button
+            icon="icon-export"
+            title="导出"
+            @click="exportExcelBtn"
+          />
           <icon-button icon="icon-print" title="打印" @click="printList" />
         </template>
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns"
+          :data="list"
+          :total="total"
+          :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           :is-multi="true"
-          @change="changePage" @multi-select="multiSelect"
+          @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
               <template #default="scope">
-                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+                {{
+                  (searchQuery.offset - 1) * searchQuery.limit
+                    + scope.$index
+                    + 1
+                }}
               </template>
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="230" fixed="right">
+            <el-table-column
+              label="操作"
+              align="center"
+              width="230"
+              fixed="right"
+            >
               <template #default="{ row }">
-                <!-- <el-button size="small" type="primary" link @click="update(row)">
-                  编辑
-                </el-button> -->
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="detail(row)"
+                >
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="agree(row)">
+                <el-button
+                  v-if="
+                    props.type !== '0' && props.type !== '3'
+                      && props.type !== '6' && props.type !== '2'
+                  "
+                  size="small"
+                  type="primary"
+                  link
+                  @click="update(row)"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="
+                    props.type !== '0' && props.type !== '3'
+                      && props.type !== '6' && props.type !== '2'
+                  "
+                  size="small"
+                  type="primary"
+                  link
+                  @click="submit(row)"
+                >
+                  提交
+                </el-button>
+                <el-button
+                  v-if="(props.type === '0' || props.type === '2')"
+                  size="small"
+                  type="primary"
+                  link
+                  :disabled="
+                    row.approvalStatus !== '待审批'
+                      && row.approvalStatus !== '审批中'
+                  "
+                  @click="agree(row)"
+                >
                   同意
                 </el-button>
-                <el-button size="small" type="primary" link @click="reject(row)">
+                <el-button
+                  v-if="(props.type === '0' || props.type === '2')"
+                  size="small"
+                  type="primary"
+                  link
+                  :disabled="
+                    row.approvalStatus !== '待审批'
+                      && row.approvalStatus !== '审批中'
+                  "
+                  @click="reject(row)"
+                >
                   驳回
                 </el-button>
-                <el-button size="small" type="primary" link @click="refuse(row)">
+                <el-button
+                  v-if="(props.type === '0' || props.type === '2')"
+                  size="small"
+                  type="danger"
+                  link
+                  :disabled="
+                    row.approvalStatus !== '待审批'
+                      && row.approvalStatus !== '审批中'
+                  "
+                  @click="refuse(row)"
+                >
                   拒绝
                 </el-button>
-                <el-button size="small" type="primary" link @click="cancel(row)">
+                <el-button
+                  v-if="
+                    props.type !== '1'
+                      && props.type !== '2'
+                  "
+                  size="small"
+                  type="text"
+                  link
+                  :disabled="row.approvalStatus !== '审批中'"
+                  @click="cancel(row)"
+                >
                   取消
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button
+                  v-if="
+                    props.type !== '4'
+                      && props.type !== '5'
+                  "
+                  :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                  size="small"
+                  type="danger"
+                  link
+                  @click="remove(row)"
+                >
                   删除
                 </el-button>
               </template>

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index 80d91b7..c7e8343 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -5,10 +5,10 @@
 import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
-// 列表查询
+// 任务分发列表查询
 export function getTaskList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/business/labExecutive/handOut/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 8771c29..85334a4 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -16,6 +16,16 @@
     data,
   })
 }
+
+// 状态管理编辑
+export function updateStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/updateStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: object) {
   return request({
@@ -24,6 +34,22 @@
     data,
   })
 }
+// 状态管理取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 状态管理详情
 export function detailStatus(data: object) {
   return request({
@@ -32,3 +58,12 @@
     data,
   })
 }
+
+// 状态管理导出
+export function exportStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/exportStateManageList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index c5cea4b..768c310 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -63,7 +63,7 @@
 // 导出
 export function exportFileApi(data: object) {
   return request({
-    url: 'file/listExport',
+    url: '/meter/file/listExport',
     method: 'post',
     data,
     responseType: 'blob',
@@ -86,6 +86,25 @@
     data,
   })
 }
+
+// 取消
+export function approvalCancel(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function approvalDelete(data: object) {
+  return request({
+    url: '/meter/file/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 保存草稿箱
 export function confirmDrafts(data: object) {
   return request({
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 7b538cf..1d02839 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -9,9 +9,7 @@
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
   sampleAttr: string // 样品属性
-  sendState: string // 分发状态
-  outState: string // 超期状态
-  formId: string // formId
+  sampleStatus: string // 分发状态
   limit: number
   offset: number
 }
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 799a420..f784804 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -16,12 +16,12 @@
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待分发', value: 'sendState;0' },
-  { name: '检测中', value: 'sendState;1' },
-  { name: '检测完', value: 'sendState;2' },
-  { name: '超期样品', value: 'outState;1' },
+  { name: '待分发', value: 'sampleStatus;2' },
+  { name: '检测中', value: 'sampleStatus;3' },
+  { name: '检测完', value: 'sampleStatus;4' },
+  { name: '超期样品', value: 'sampleStatus;8' },
 ]
-const currentMenu = ref('sendState;0') // 当前选中状态
+const currentMenu = ref('sampleStatus;2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 const listQuery: Ref<ITaskQuery> = ref({
@@ -34,9 +34,7 @@
   sampleAttr: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  sampleStatus: '2', // 样品状态:默认待分发
   offset: 1,
   limit: 20,
 })
@@ -82,18 +80,18 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  // // 模拟数据
+  // list.value = [
+  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
+  // ]
+  // loadingTable.value = false
+  // console.log(listQuery.value)
+  getTaskList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = response.data.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -114,9 +112,7 @@
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleStatus: '2', // 分发状态
     offset: 1,
     limit: 20,
   }
@@ -202,9 +198,7 @@
 watch(currentMenu, (val: string) => {
   const vals = val.split(';')
   if (vals.length > 1) {
-    listQuery.value.sendState = ''
-    listQuery.value.outState = ''
-    listQuery.value[vals[0] as 'sendState' | 'outState'] = vals[1]
+    listQuery.value.sampleStatus = vals[1]
   }
   fetchData(false)
 })
@@ -300,7 +294,7 @@
               <el-button size="small" link type="primary" @click="bindLabel(row)">
                 标签绑定
               </el-button>
-              <el-button v-if="listQuery.sendState !== '2'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.sampleStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 分发
               </el-button>
             </template>
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 7f8f5ce..97d660a 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -5,12 +5,14 @@
   applyPerson: string // 	申请人
   applyUnit: string // 	申请单位
   approvalStatus?: string // 	审批状态
-  createUser: string // 	创建人
-  processResult: string // 	处置结果
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
   time: string // 	申请日期
   limit?: number
   offset?: number
   ids?: string[]
+  formId?: string
 }
 // 借用设备类型
 export interface borrowDeviceType {
@@ -22,6 +24,8 @@
   useDept: string // 使用部门
   usePerson: string // 使用人
   validDate: string // 有效日期
+  approvalStatusName: string
+  applyName: string
   edit?: boolean
   equipmentName?: string
   id?: string
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 470bad1..2f7a26f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -35,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :status="current" />
+    <component :is="currentComp" :status="current" apply-type="2" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 53046f0..6dc9628 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -56,7 +56,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" :type="type" />
+    <component :is="currentComp" :name="current" :type="type" apply-type="1" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index e43c46a..b863728 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,18 +1,25 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import approveAction from './approvalActionDialog.vue'
+import type { borrowDeviceType } from '../borrow-interface'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const props = defineProps({
   type: {
     type: String,
     required: true,
   },
+  applyType: {
+    type: String,
+    required: true,
+  },
 })
+const approvalDialog = ref() // 审批对话框显隐
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
@@ -21,13 +28,15 @@
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
   applyUnit: '', // 	申请单位
-  approvalStatus: '', // 	审批状态
+  approvalStatus: '0', // 	审批状态
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
+  applyType: props.applyType,
   time: '', // 	申请日期
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -94,12 +103,12 @@
   },
   {
     text: '申请部门',
-    value: 'applyUnit',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'applyPerson',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
@@ -167,7 +176,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: borrowDeviceType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -183,7 +192,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: borrowDeviceType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -197,7 +206,7 @@
   })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: borrowDeviceType) => {
   ElMessageBox.confirm(
     `确认删除${row.applyName}吗？`,
     '提示',
@@ -247,9 +256,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<borrowDeviceType[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: borrowDeviceType[]) => {
   selectList.value = row
 }
 // 导出
@@ -259,11 +268,12 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (selectList.value.length) {
-  //   selectList.value.forEach((item) => {
-  //     searchQuery.ids?.push(item.id as string)
-  //   })
-  // }
+  searchQuery.ids = []
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
@@ -292,27 +302,27 @@
     ElMessage('无可打印内容')
   }
 }
-const approveRef = ref()
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+  getList()
+}
 // 同意
-const agree = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '1',
-  })
-}
 // 驳回
-const reject = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '3',
-  })
-}
 // 拒绝
-const refuse = (row: any) => {
-  approveRef.value.initDialog(
-    {
-      radio: '2',
-    },
-  )
+const handleClick = (val: string, taskId: string) => {
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', taskId)
+  }
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', taskId)
+  }
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', taskId)
+  }
 }
+
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
@@ -376,10 +386,10 @@
 
 <template>
   <div>
+    <!-- 同意、驳回、拒绝对话框显示 -->
     <!-- 添加/编辑/查看 -->
     <app-container>
-      <!-- 审批操作 -->
-      <approve-action ref="approveRef" />
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -425,7 +435,7 @@
         <normal-table
           id="print"
           :key="Math.random()"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
@@ -447,15 +457,17 @@
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="agree(row)">
-                  同意
-                </el-button>
-                <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="reject(row)">
-                  驳回
-                </el-button>
-                <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="refuse(row)">
-                  拒绝
-                </el-button>
+                <temaplte v-if="row.approvalStatusName !== '审批中'">
+                  <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="handleClick('agree', row.taskId)">
+                    同意
+                  </el-button>
+                  <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="handleClick('reject', row.taskId)">
+                    驳回
+                  </el-button>
+                  <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="handleClick('refuse', row.taskId)">
+                    拒绝
+                  </el-button>
+                </temaplte>
                 <el-button size="small" type="primary" link @click="cancel(row)">
                   取消
                 </el-button>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 7f3ea3e..293be0c 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,24 +1,37 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
     required: true,
   },
+  applyType: {
+    type: String,
+    required: true,
+  },
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
-const searchQuery = reactive({
-  applyNo: '',
-  applyName: '',
-  applyUnit: '',
-  applyPerson: '',
-  limit: 10,
+const searchQuery = reactive<searchType>({
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 	申请人
+  applyUnit: '', // 	申请单位
+  approvalStatus: '0', // 	审批状态
+  createUser: '', // 	创建人
+  processResult: '', // 	处置结果
+  applyType: props.applyType,
+  time: '', // 	申请日期
+  ids: [] as string[],
+  limit: 20,
   offset: 1,
-  ids: [],
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -68,35 +81,16 @@
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  // loadingTable.value = true
-  // listPageApi(searchQuery).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  //   loadingTable.value = false
-  // }).catch((_) => {
-  //   loadingTable.value = false
-  // })
-  // list.value = [
-  //   {
-  //     applyName: '借用测试设备',
-  //     applyNo: '1433223',
-  //     applyUnit: '顶级',
-  //     applyPerson: '张三',
-  //     time: '2020-12-12 00:00:00',
-  //     approvalStatusName: '审批中',
-  //   },
-  //   {
-  //     applyName: '借用电脑',
-  //     applyNo: '1433223',
-  //     applyUnit: '徐州分中心',
-  //     applyPerson: '里斯',
-  //     time: '2020-12-12 00:00:00',
-  //     approvalStatusName: '已通过',
-  //   },
-  // ] as any
-  // total.value = 2
+  loadingTable.value = true
+  getApplyList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -124,6 +118,7 @@
     query: {
       title: '详情',
       name: '设备借用处理',
+      // approvalStatusName: row.approvalStatusName,
     },
   })
 }
@@ -157,15 +152,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -174,7 +169,11 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
 // 模板下载
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index ec522cf..0d33dfb 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -13,7 +13,7 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
-import { addStatus, detailStatus } from '@/api/device/stateManage'
+import { addStatus, detailStatus, updateStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
 import useUserStore from '@/store/modules/user'
 
@@ -30,7 +30,7 @@
 }
 const ruleForm1 = ref({
   applyType: $route.query.applyType, // 申请类型
-  applyDesc: '', // 申请说明
+  remark: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
   applyUnit: '', // 申请单位
@@ -41,6 +41,7 @@
   equipmentSpecifications: '', // 设备规格
   manufacturingNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
+  equipmentId: '',
   equipmentList: [] as EquipmentListRow[],
   id: '',
 }) // 表单
@@ -212,7 +213,7 @@
         ruleForm1.value = res.data
         ruleForm1.value.applyUnit = res.data.applyUnit
         ruleForm1.value.equipmentNo = res.data.applyNo
-        ruleForm1.value.equipmentName = res.data.applyTypeName
+        ruleForm1.value.equipmentName = res.data.equipmentName
         ruleForm1.value.time = res.data.time
       })
     }
@@ -304,15 +305,34 @@
             type: 'warning',
           },
         ).then((res) => {
-          addStatus(ruleForm1.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('操作成功!')
-              $router.go(-1)
+          if (title.value == '编辑') {
+            ruleForm1.value.applyPerson = ruleForm1.value.id
+            ruleForm1.value.applyUnit = ruleForm1.value.id
+            if (ruleForm1.value.equipmentList && ruleForm1.value.equipmentList[0]) {
+              ruleForm1.value.equipmentId = ruleForm1.value.equipmentList[0].equipmentId
+              delete ruleForm1.value.equipmentList
             }
-            else {
-              ElMessage.warning(res.message)
-            }
-          })
+            updateStatus(ruleForm1.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              }
+              else {
+                ElMessage.warning(res.message)
+              }
+            })
+          }
+          else {
+            addStatus(ruleForm1.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              }
+              else {
+                ElMessage.warning(res.message)
+              }
+            })
+          }
         })
       }
     })
@@ -680,8 +700,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="18">
-            <el-form-item label="申请理由" prop="applyDesc">
-              <el-input v-model.trim="ruleForm1.applyDesc" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
+            <el-form-item label="申请理由" prop="remark">
+              <el-input v-model.trim="ruleForm1.remark" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -760,7 +780,7 @@
           </el-table-column>
         </el-table>
       </detail-block>
-      <detail-block v-if="title !== '新建'" title="审批流程">
+      <!-- <detail-block v-if="title !== '新建'" title="审批流程">
         <el-timeline>
           <el-timeline-item timestamp="2018/4/12" placement="top">
             <el-card>
@@ -781,7 +801,7 @@
             </el-card>
           </el-timeline-item>
         </el-timeline>
-      </detail-block>
+      </detail-block> -->
     </div>
   </app-container>
 </template>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 1cc56b2..5a4aad6 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,14 +1,20 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { TableRow } from './status-interface'
-import { getStatusList } from '@/api/device/stateManage'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import {
+  cancelStatus,
+  deleteStatus,
+  exportStatus,
+  getStatusList,
+  submitStatus,
+} from '@/api/device/stateManage'
 import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
-
+// 选中的按钮
 const props = defineProps({
   name: {
     type: String,
@@ -18,28 +24,53 @@
     type: String,
     default: '',
   },
-  type: { // 当前状态
+  type: {
+    // 当前状态
     type: String,
     default: '',
   },
-  applyType: { // 设备申请类型
+  applyType: {
+    // 设备申请类型
     type: String,
     default: '',
   },
-})
+}); const active = ref('0')// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
+
 const formIdList = ref({
   设备闲置申请: 'DEVICE_UNUSED_APPROVAL',
   设备封存申请: 'DEVICE_SEALED_APPROVAL',
   设备启封申请: 'DEVICE_UNSEALED_APPROVAL',
   设备报废申请: 'DEVICE_SCRAPPED_ROVAL',
   设备处置申请: 'DEVICE_HANDLE_APPROVAL',
+  设备借用申请: 'DEVICE_BORROW_APPROVAL',
 })
 const $router = useRouter()
 const searchQuery = reactive({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
   applyUnit: '', // 申请单位
-  approvalStatus: '', // 审批状态
+  approvalStatus: '0', // 审批状态
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
@@ -104,28 +135,53 @@
   },
 ]) // 表格
 const list = ref([]) // 表格数据
+const managerStateList = ref([]) // 状态数据
 const approvalDialog = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const { proxy } = getCurrentInstance() as any
+
+const clearSearch = () => {
+  searchQuery.equipmentName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyStatus = ''
+  searchQuery.applyUnit = ''
+  searchQuery.approvalStatus = ''
+  searchQuery.createUser = ''
+  searchQuery.equipmentNo = ''
+  searchQuery.ids = [] as string[]
+  searchQuery.limit = 20
+  searchQuery.offset = 1
+  searchQuery.applyType = props.applyType
+  searchQuery.formId = SCHEDULE[formIdList.value[props.name]]
+}
+
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  getDictByCode('managerState').then((response) => {
-    if (response.code === 200) {
-      console.log(response.data, 'response') // 状态
-
-      // 根据闲置，封存，启封等状态获取不同的列表
-      // 接口未写好
-      getStatusList(searchQuery).then((res) => {
-        if (res.code === 200) {
-          list.value = res.data.rows
-          total.value = res.data.total
-        }
-        loadingTable.value = false
-      })
-    }
-  }).catch((_) => {
-    loadingTable.value = false
-  })
+  getDictByCode('managerState')
+    .then((response) => {
+      if (response.code === 200) {
+        console.log(response.data, 'response') // 状态
+        managerStateList.value = response.data
+        // searchQuery.approvalStatus = active.value
+        // 根据闲置，封存，启封等状态获取不同的列表
+        getStatusList(searchQuery).then((res) => {
+          if (res.code === 200) {
+            list.value = res.data.rows.map((item: TableRow) => {
+              return {
+                ...item,
+                approvalStatus: approvalStatusMap[item.approvalStatus],
+              }
+            })
+            total.value = res.data.total
+          }
+          loadingTable.value = false
+        })
+      }
+    })
+    .catch((_) => {
+      loadingTable.value = false
+    })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -158,6 +214,7 @@
     name: 'stateManageDetail',
     params: {
       type: 'edit',
+      id: row.id,
     },
     query: {
       title: '编辑',
@@ -168,39 +225,74 @@
 }
 // 删除
 const remove = (row: TableRow) => {
-  ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
+  const { id } = row
+  ElMessageBox.confirm(`确认删除${row.equipmentName}吗？`, '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    deleteStatus({ id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 同意
 const agree = (row: TableRow) => {
-  approvalDialog.value.initDialog('agree', row.taskId)
+  approvalDialog.value.initDialog('agree', row.processId)
 }
 // 驳回
 const reject = (row: TableRow) => {
-  approvalDialog.value.initDialog('reject', row.taskId)
+  approvalDialog.value.initDialog('reject', row.processId)
 }
 // 拒绝
 const refuse = (row: TableRow) => {
-  approvalDialog.value.initDialog('refuse', row.taskId)
+  approvalDialog.value.initDialog('refuse', row.processId)
 }
 // 取消
-const cancel = (rowrow: TableRow) => {
-  ElMessageBox.confirm(
-    '确认取消吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
+const cancel = (row: TableRow) => {
+  const { processId } = row
+  ElMessageBox.confirm('确认取消吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    cancelStatus({ processInstanceId: processId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+
+// 提交
+const submit = (row: TableRow) => {
+  // 流程id为空
+  const { id } = row
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitStatus({ id, formId: searchQuery.formId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 搜索
 const search = () => {
@@ -208,16 +300,13 @@
 }
 // 重置
 const reset = () => {
+  clearSearch()
   getList()
 }
 // 模板下载
-const templateDownload = () => {
-
-}
+const templateDownload = () => {}
 // 标签识别
-const identify = () => {
-
-}
+const identify = () => {}
 // 新增
 const add = () => {
   $router.push({
@@ -251,7 +340,9 @@
     printJSON(list.value, properties, props.name)
   }
   else if (selectIds.length > 0) {
-    const printList = list.value.filter((item: TableRow) => selectIds.includes(item.id))
+    const printList = list.value.filter((item: TableRow) =>
+      selectIds.includes(item.id),
+    )
     printJSON(printList, properties, props.name)
   }
   else {
@@ -260,11 +351,37 @@
 }
 // 导出
 const exportExcelBtn = () => {
+  // const params: supplierExportQuery = {
+  //   approvalStatus: listQuery.value.approvalStatus,
+  //   businessContent: listQuery.value.businessContent,
+  //   companyArea: listQuery.value.companyArea,
+  //   companyCity: listQuery.value.companyCity,
+  //   companyProvince: listQuery.value.companyProvince,
+  //   formId: listQuery.value.formId,
+  //   supplierName: listQuery.value.supplierName,
+  //   supplierNo: listQuery.value.supplierNo,
+  // }
+  // if (checkoutList.value.length > 0) {
+  //   params.ids = checkoutList.value
+  // }
+  const postData = {
+    applyType: searchQuery.applyType,
+    approvalStatus: searchQuery.approvalStatus,
+    createUser: searchQuery.createUser,
+    ids: [] as number[],
+  }
+  postData.ids = selectList.value.map((item) => {
+    return item.id
+  })
+  exportStatus(postData).then((res) => {
+
+  })
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  loading.close()
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -284,18 +401,22 @@
   getList()
   dialogVisible.value = false
 }
-watch(() => props.type, (newValue) => {
-  if (newValue === '0') {
-    searchQuery.approvalStatus = ''
-  }
-  else {
-    searchQuery.approvalStatus = newValue
-  }
-  getList()
-}, {
-  immediate: true,
-  deep: true,
-})
+watch(
+  () => props.type,
+  (newValue) => {
+    if (newValue === '0') {
+      searchQuery.approvalStatus = ''
+    }
+    else {
+      searchQuery.approvalStatus = newValue
+    }
+    getList()
+  },
+  {
+    immediate: true,
+    deep: true,
+  },
+)
 </script>
 
 <template>
@@ -307,68 +428,197 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input
+            v-model="searchQuery.applyNo"
+            placeholder="申请编号"
+            clearable
+            class="w-50 m-2"
+          />
         </search-item>
         <search-item>
-          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input
+            v-model="searchQuery.equipmentNo"
+            placeholder="设备编号"
+            clearable
+            class="w-50 m-2"
+          />
         </search-item>
         <search-item>
-          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input
+            v-model="searchQuery.equipmentName"
+            placeholder="设备名称"
+            clearable
+            class="w-50 m-2"
+          />
         </search-item>
         <search-item>
-          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input
+            v-model="searchQuery.applyUnit"
+            placeholder="申请单位"
+            clearable
+            class="w-50 m-2"
+          />
         </search-item>
         <search-item>
-          <el-select placeholder="申请状态" clearable />
+          <el-select
+            v-model="searchQuery.applyStatus"
+            placeholder="申请状态"
+            clearable
+          >
+            <el-option
+              v-for="manager of managerStateList"
+              :key="manager.id"
+              :label="manager.name"
+              :value="manager.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <input
+            v-show="searchQuery.limit === 0"
+            ref="fileRef"
+            type="file"
+            multiple
+            @change="onFileChange"
+          >
           <icon-button icon="icon-add" title="新建" @click="add" />
-          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button
+            icon="icon-export"
+            title="导出"
+            @click="exportExcelBtn"
+          />
           <icon-button icon="icon-print" title="打印" @click="printList" />
         </template>
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns"
+          :data="list"
+          :total="total"
+          :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           :is-multi="true"
-          @change="changePage" @multi-select="multiSelect"
+          @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
               <template #default="scope">
-                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+                {{
+                  (searchQuery.offset - 1) * searchQuery.limit
+                    + scope.$index
+                    + 1
+                }}
               </template>
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="230" fixed="right">
+            <el-table-column
+              label="操作"
+              align="center"
+              width="230"
+              fixed="right"
+            >
               <template #default="{ row }">
-                <!-- <el-button size="small" type="primary" link @click="update(row)">
-                  编辑
-                </el-button> -->
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="detail(row)"
+                >
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="agree(row)">
+                <el-button
+                  v-if="
+                    props.type !== '0' && props.type !== '3'
+                      && props.type !== '6' && props.type !== '2'
+                  "
+                  size="small"
+                  type="primary"
+                  link
+                  @click="update(row)"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="
+                    props.type !== '0' && props.type !== '3'
+                      && props.type !== '6' && props.type !== '2'
+                  "
+                  size="small"
+                  type="primary"
+                  link
+                  @click="submit(row)"
+                >
+                  提交
+                </el-button>
+                <el-button
+                  v-if="(props.type === '0' || props.type === '2')"
+                  size="small"
+                  type="primary"
+                  link
+                  :disabled="
+                    row.approvalStatus !== '待审批'
+                      && row.approvalStatus !== '审批中'
+                  "
+                  @click="agree(row)"
+                >
                   同意
                 </el-button>
-                <el-button size="small" type="primary" link @click="reject(row)">
+                <el-button
+                  v-if="(props.type === '0' || props.type === '2')"
+                  size="small"
+                  type="primary"
+                  link
+                  :disabled="
+                    row.approvalStatus !== '待审批'
+                      && row.approvalStatus !== '审批中'
+                  "
+                  @click="reject(row)"
+                >
                   驳回
                 </el-button>
-                <el-button size="small" type="primary" link @click="refuse(row)">
+                <el-button
+                  v-if="(props.type === '0' || props.type === '2')"
+                  size="small"
+                  type="danger"
+                  link
+                  :disabled="
+                    row.approvalStatus !== '待审批'
+                      && row.approvalStatus !== '审批中'
+                  "
+                  @click="refuse(row)"
+                >
                   拒绝
                 </el-button>
-                <el-button size="small" type="primary" link @click="cancel(row)">
+                <el-button
+                  v-if="
+                    props.type !== '1'
+                      && props.type !== '2'
+                  "
+                  size="small"
+                  type="text"
+                  link
+                  :disabled="row.approvalStatus !== '审批中'"
+                  @click="cancel(row)"
+                >
                   取消
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button
+                  v-if="
+                    props.type !== '4'
+                      && props.type !== '5'
+                  "
+                  :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                  size="small"
+                  type="danger"
+                  link
+                  @click="remove(row)"
+                >
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 27faff8..531fe0d 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -80,7 +80,7 @@
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
-    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    // ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
   else if (row.title === '详情') {
     ruleForm.createUserId = row.createUserId
@@ -107,10 +107,8 @@
   ruleForm.minioFileName = ''
   ruleForm.publishTime = ''
   ruleForm.remark = ''
-  ruleForm.publishTime = ''
   ruleForm.effectiveTime = ''
   ruleForm.effectiveStatus = ''
-  ruleForm.publishTime = ''
   ruleForm.createUserId = ''
   effectiveStatusName.value = ''
 }
@@ -128,9 +126,9 @@
       type: 'warning',
     },
       ).then((res) => {
-        if (flag == '提交') {
+        if (flag === '提交') {
           confirmDrafts(ruleForm).then((res) => {
-            if (res.code == 200) {
+            if (res.code === 200) {
               console.log(res.data, '保存成功')
               submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
                 formEl?.resetFields()
@@ -199,7 +197,7 @@
       effectiveStatusName.value = '在使用'
       ruleForm.effectiveStatus = '1'
     }
-    else if (diffDat == 0) {
+    else if (diffDat === 0) {
     // ruleForm.effectiveStatusName = '在使用'
       effectiveStatusName.value = '在使用'
       ruleForm.effectiveStatus = '1'

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index 80d91b7..c7e8343 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -5,10 +5,10 @@
 import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
-// 列表查询
+// 任务分发列表查询
 export function getTaskList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/business/labExecutive/handOut/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 8771c29..85334a4 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -16,6 +16,16 @@
     data,
   })
 }
+
+// 状态管理编辑
+export function updateStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/updateStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: object) {
   return request({
@@ -24,6 +34,22 @@
     data,
   })
 }
+// 状态管理取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 状态管理详情
 export function detailStatus(data: object) {
   return request({
@@ -32,3 +58,12 @@
     data,
   })
 }
+
+// 状态管理导出
+export function exportStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/exportStateManageList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index c5cea4b..768c310 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -63,7 +63,7 @@
 // 导出
 export function exportFileApi(data: object) {
   return request({
-    url: 'file/listExport',
+    url: '/meter/file/listExport',
     method: 'post',
     data,
     responseType: 'blob',
@@ -86,6 +86,25 @@
     data,
   })
 }
+
+// 取消
+export function approvalCancel(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function approvalDelete(data: object) {
+  return request({
+    url: '/meter/file/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 保存草稿箱
 export function confirmDrafts(data: object) {
   return request({
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 7b538cf..1d02839 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -9,9 +9,7 @@
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
   sampleAttr: string // 样品属性
-  sendState: string // 分发状态
-  outState: string // 超期状态
-  formId: string // formId
+  sampleStatus: string // 分发状态
   limit: number
   offset: number
 }
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 799a420..f784804 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -16,12 +16,12 @@
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待分发', value: 'sendState;0' },
-  { name: '检测中', value: 'sendState;1' },
-  { name: '检测完', value: 'sendState;2' },
-  { name: '超期样品', value: 'outState;1' },
+  { name: '待分发', value: 'sampleStatus;2' },
+  { name: '检测中', value: 'sampleStatus;3' },
+  { name: '检测完', value: 'sampleStatus;4' },
+  { name: '超期样品', value: 'sampleStatus;8' },
 ]
-const currentMenu = ref('sendState;0') // 当前选中状态
+const currentMenu = ref('sampleStatus;2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 const listQuery: Ref<ITaskQuery> = ref({
@@ -34,9 +34,7 @@
   sampleAttr: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  sampleStatus: '2', // 样品状态:默认待分发
   offset: 1,
   limit: 20,
 })
@@ -82,18 +80,18 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  // // 模拟数据
+  // list.value = [
+  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
+  // ]
+  // loadingTable.value = false
+  // console.log(listQuery.value)
+  getTaskList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = response.data.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -114,9 +112,7 @@
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleStatus: '2', // 分发状态
     offset: 1,
     limit: 20,
   }
@@ -202,9 +198,7 @@
 watch(currentMenu, (val: string) => {
   const vals = val.split(';')
   if (vals.length > 1) {
-    listQuery.value.sendState = ''
-    listQuery.value.outState = ''
-    listQuery.value[vals[0] as 'sendState' | 'outState'] = vals[1]
+    listQuery.value.sampleStatus = vals[1]
   }
   fetchData(false)
 })
@@ -300,7 +294,7 @@
               <el-button size="small" link type="primary" @click="bindLabel(row)">
                 标签绑定
               </el-button>
-              <el-button v-if="listQuery.sendState !== '2'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.sampleStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 分发
               </el-button>
             </template>
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 7f8f5ce..97d660a 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -5,12 +5,14 @@
   applyPerson: string // 	申请人
   applyUnit: string // 	申请单位
   approvalStatus?: string // 	审批状态
-  createUser: string // 	创建人
-  processResult: string // 	处置结果
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
   time: string // 	申请日期
   limit?: number
   offset?: number
   ids?: string[]
+  formId?: string
 }
 // 借用设备类型
 export interface borrowDeviceType {
@@ -22,6 +24,8 @@
   useDept: string // 使用部门
   usePerson: string // 使用人
   validDate: string // 有效日期
+  approvalStatusName: string
+  applyName: string
   edit?: boolean
   equipmentName?: string
   id?: string
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 470bad1..2f7a26f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -35,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :status="current" />
+    <component :is="currentComp" :status="current" apply-type="2" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 53046f0..6dc9628 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -56,7 +56,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" :type="type" />
+    <component :is="currentComp" :name="current" :type="type" apply-type="1" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index e43c46a..b863728 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,18 +1,25 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import approveAction from './approvalActionDialog.vue'
+import type { borrowDeviceType } from '../borrow-interface'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const props = defineProps({
   type: {
     type: String,
     required: true,
   },
+  applyType: {
+    type: String,
+    required: true,
+  },
 })
+const approvalDialog = ref() // 审批对话框显隐
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
@@ -21,13 +28,15 @@
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
   applyUnit: '', // 	申请单位
-  approvalStatus: '', // 	审批状态
+  approvalStatus: '0', // 	审批状态
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
+  applyType: props.applyType,
   time: '', // 	申请日期
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -94,12 +103,12 @@
   },
   {
     text: '申请部门',
-    value: 'applyUnit',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'applyPerson',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
@@ -167,7 +176,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: borrowDeviceType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -183,7 +192,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: borrowDeviceType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -197,7 +206,7 @@
   })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: borrowDeviceType) => {
   ElMessageBox.confirm(
     `确认删除${row.applyName}吗？`,
     '提示',
@@ -247,9 +256,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<borrowDeviceType[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: borrowDeviceType[]) => {
   selectList.value = row
 }
 // 导出
@@ -259,11 +268,12 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (selectList.value.length) {
-  //   selectList.value.forEach((item) => {
-  //     searchQuery.ids?.push(item.id as string)
-  //   })
-  // }
+  searchQuery.ids = []
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
@@ -292,27 +302,27 @@
     ElMessage('无可打印内容')
   }
 }
-const approveRef = ref()
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+  getList()
+}
 // 同意
-const agree = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '1',
-  })
-}
 // 驳回
-const reject = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '3',
-  })
-}
 // 拒绝
-const refuse = (row: any) => {
-  approveRef.value.initDialog(
-    {
-      radio: '2',
-    },
-  )
+const handleClick = (val: string, taskId: string) => {
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', taskId)
+  }
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', taskId)
+  }
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', taskId)
+  }
 }
+
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
@@ -376,10 +386,10 @@
 
 <template>
   <div>
+    <!-- 同意、驳回、拒绝对话框显示 -->
     <!-- 添加/编辑/查看 -->
     <app-container>
-      <!-- 审批操作 -->
-      <approve-action ref="approveRef" />
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -425,7 +435,7 @@
         <normal-table
           id="print"
           :key="Math.random()"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
@@ -447,15 +457,17 @@
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="agree(row)">
-                  同意
-                </el-button>
-                <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="reject(row)">
-                  驳回
-                </el-button>
-                <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="refuse(row)">
-                  拒绝
-                </el-button>
+                <temaplte v-if="row.approvalStatusName !== '审批中'">
+                  <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="handleClick('agree', row.taskId)">
+                    同意
+                  </el-button>
+                  <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="handleClick('reject', row.taskId)">
+                    驳回
+                  </el-button>
+                  <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="handleClick('refuse', row.taskId)">
+                    拒绝
+                  </el-button>
+                </temaplte>
                 <el-button size="small" type="primary" link @click="cancel(row)">
                   取消
                 </el-button>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 7f3ea3e..293be0c 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,24 +1,37 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
     required: true,
   },
+  applyType: {
+    type: String,
+    required: true,
+  },
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
-const searchQuery = reactive({
-  applyNo: '',
-  applyName: '',
-  applyUnit: '',
-  applyPerson: '',
-  limit: 10,
+const searchQuery = reactive<searchType>({
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 	申请人
+  applyUnit: '', // 	申请单位
+  approvalStatus: '0', // 	审批状态
+  createUser: '', // 	创建人
+  processResult: '', // 	处置结果
+  applyType: props.applyType,
+  time: '', // 	申请日期
+  ids: [] as string[],
+  limit: 20,
   offset: 1,
-  ids: [],
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -68,35 +81,16 @@
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  // loadingTable.value = true
-  // listPageApi(searchQuery).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  //   loadingTable.value = false
-  // }).catch((_) => {
-  //   loadingTable.value = false
-  // })
-  // list.value = [
-  //   {
-  //     applyName: '借用测试设备',
-  //     applyNo: '1433223',
-  //     applyUnit: '顶级',
-  //     applyPerson: '张三',
-  //     time: '2020-12-12 00:00:00',
-  //     approvalStatusName: '审批中',
-  //   },
-  //   {
-  //     applyName: '借用电脑',
-  //     applyNo: '1433223',
-  //     applyUnit: '徐州分中心',
-  //     applyPerson: '里斯',
-  //     time: '2020-12-12 00:00:00',
-  //     approvalStatusName: '已通过',
-  //   },
-  // ] as any
-  // total.value = 2
+  loadingTable.value = true
+  getApplyList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -124,6 +118,7 @@
     query: {
       title: '详情',
       name: '设备借用处理',
+      // approvalStatusName: row.approvalStatusName,
     },
   })
 }
@@ -157,15 +152,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -174,7 +169,11 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
 // 模板下载
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index ec522cf..0d33dfb 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -13,7 +13,7 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
-import { addStatus, detailStatus } from '@/api/device/stateManage'
+import { addStatus, detailStatus, updateStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
 import useUserStore from '@/store/modules/user'
 
@@ -30,7 +30,7 @@
 }
 const ruleForm1 = ref({
   applyType: $route.query.applyType, // 申请类型
-  applyDesc: '', // 申请说明
+  remark: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
   applyUnit: '', // 申请单位
@@ -41,6 +41,7 @@
   equipmentSpecifications: '', // 设备规格
   manufacturingNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
+  equipmentId: '',
   equipmentList: [] as EquipmentListRow[],
   id: '',
 }) // 表单
@@ -212,7 +213,7 @@
         ruleForm1.value = res.data
         ruleForm1.value.applyUnit = res.data.applyUnit
         ruleForm1.value.equipmentNo = res.data.applyNo
-        ruleForm1.value.equipmentName = res.data.applyTypeName
+        ruleForm1.value.equipmentName = res.data.equipmentName
         ruleForm1.value.time = res.data.time
       })
     }
@@ -304,15 +305,34 @@
             type: 'warning',
           },
         ).then((res) => {
-          addStatus(ruleForm1.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('操作成功!')
-              $router.go(-1)
+          if (title.value == '编辑') {
+            ruleForm1.value.applyPerson = ruleForm1.value.id
+            ruleForm1.value.applyUnit = ruleForm1.value.id
+            if (ruleForm1.value.equipmentList && ruleForm1.value.equipmentList[0]) {
+              ruleForm1.value.equipmentId = ruleForm1.value.equipmentList[0].equipmentId
+              delete ruleForm1.value.equipmentList
             }
-            else {
-              ElMessage.warning(res.message)
-            }
-          })
+            updateStatus(ruleForm1.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              }
+              else {
+                ElMessage.warning(res.message)
+              }
+            })
+          }
+          else {
+            addStatus(ruleForm1.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              }
+              else {
+                ElMessage.warning(res.message)
+              }
+            })
+          }
         })
       }
     })
@@ -680,8 +700,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="18">
-            <el-form-item label="申请理由" prop="applyDesc">
-              <el-input v-model.trim="ruleForm1.applyDesc" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
+            <el-form-item label="申请理由" prop="remark">
+              <el-input v-model.trim="ruleForm1.remark" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -760,7 +780,7 @@
           </el-table-column>
         </el-table>
       </detail-block>
-      <detail-block v-if="title !== '新建'" title="审批流程">
+      <!-- <detail-block v-if="title !== '新建'" title="审批流程">
         <el-timeline>
           <el-timeline-item timestamp="2018/4/12" placement="top">
             <el-card>
@@ -781,7 +801,7 @@
             </el-card>
           </el-timeline-item>
         </el-timeline>
-      </detail-block>
+      </detail-block> -->
     </div>
   </app-container>
 </template>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 1cc56b2..5a4aad6 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,14 +1,20 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { TableRow } from './status-interface'
-import { getStatusList } from '@/api/device/stateManage'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import {
+  cancelStatus,
+  deleteStatus,
+  exportStatus,
+  getStatusList,
+  submitStatus,
+} from '@/api/device/stateManage'
 import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
-
+// 选中的按钮
 const props = defineProps({
   name: {
     type: String,
@@ -18,28 +24,53 @@
     type: String,
     default: '',
   },
-  type: { // 当前状态
+  type: {
+    // 当前状态
     type: String,
     default: '',
   },
-  applyType: { // 设备申请类型
+  applyType: {
+    // 设备申请类型
     type: String,
     default: '',
   },
-})
+}); const active = ref('0')// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
+
 const formIdList = ref({
   设备闲置申请: 'DEVICE_UNUSED_APPROVAL',
   设备封存申请: 'DEVICE_SEALED_APPROVAL',
   设备启封申请: 'DEVICE_UNSEALED_APPROVAL',
   设备报废申请: 'DEVICE_SCRAPPED_ROVAL',
   设备处置申请: 'DEVICE_HANDLE_APPROVAL',
+  设备借用申请: 'DEVICE_BORROW_APPROVAL',
 })
 const $router = useRouter()
 const searchQuery = reactive({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
   applyUnit: '', // 申请单位
-  approvalStatus: '', // 审批状态
+  approvalStatus: '0', // 审批状态
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
@@ -104,28 +135,53 @@
   },
 ]) // 表格
 const list = ref([]) // 表格数据
+const managerStateList = ref([]) // 状态数据
 const approvalDialog = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const { proxy } = getCurrentInstance() as any
+
+const clearSearch = () => {
+  searchQuery.equipmentName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyStatus = ''
+  searchQuery.applyUnit = ''
+  searchQuery.approvalStatus = ''
+  searchQuery.createUser = ''
+  searchQuery.equipmentNo = ''
+  searchQuery.ids = [] as string[]
+  searchQuery.limit = 20
+  searchQuery.offset = 1
+  searchQuery.applyType = props.applyType
+  searchQuery.formId = SCHEDULE[formIdList.value[props.name]]
+}
+
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  getDictByCode('managerState').then((response) => {
-    if (response.code === 200) {
-      console.log(response.data, 'response') // 状态
-
-      // 根据闲置，封存，启封等状态获取不同的列表
-      // 接口未写好
-      getStatusList(searchQuery).then((res) => {
-        if (res.code === 200) {
-          list.value = res.data.rows
-          total.value = res.data.total
-        }
-        loadingTable.value = false
-      })
-    }
-  }).catch((_) => {
-    loadingTable.value = false
-  })
+  getDictByCode('managerState')
+    .then((response) => {
+      if (response.code === 200) {
+        console.log(response.data, 'response') // 状态
+        managerStateList.value = response.data
+        // searchQuery.approvalStatus = active.value
+        // 根据闲置，封存，启封等状态获取不同的列表
+        getStatusList(searchQuery).then((res) => {
+          if (res.code === 200) {
+            list.value = res.data.rows.map((item: TableRow) => {
+              return {
+                ...item,
+                approvalStatus: approvalStatusMap[item.approvalStatus],
+              }
+            })
+            total.value = res.data.total
+          }
+          loadingTable.value = false
+        })
+      }
+    })
+    .catch((_) => {
+      loadingTable.value = false
+    })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -158,6 +214,7 @@
     name: 'stateManageDetail',
     params: {
       type: 'edit',
+      id: row.id,
     },
     query: {
       title: '编辑',
@@ -168,39 +225,74 @@
 }
 // 删除
 const remove = (row: TableRow) => {
-  ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
+  const { id } = row
+  ElMessageBox.confirm(`确认删除${row.equipmentName}吗？`, '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    deleteStatus({ id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 同意
 const agree = (row: TableRow) => {
-  approvalDialog.value.initDialog('agree', row.taskId)
+  approvalDialog.value.initDialog('agree', row.processId)
 }
 // 驳回
 const reject = (row: TableRow) => {
-  approvalDialog.value.initDialog('reject', row.taskId)
+  approvalDialog.value.initDialog('reject', row.processId)
 }
 // 拒绝
 const refuse = (row: TableRow) => {
-  approvalDialog.value.initDialog('refuse', row.taskId)
+  approvalDialog.value.initDialog('refuse', row.processId)
 }
 // 取消
-const cancel = (rowrow: TableRow) => {
-  ElMessageBox.confirm(
-    '确认取消吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
+const cancel = (row: TableRow) => {
+  const { processId } = row
+  ElMessageBox.confirm('确认取消吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    cancelStatus({ processInstanceId: processId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+
+// 提交
+const submit = (row: TableRow) => {
+  // 流程id为空
+  const { id } = row
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitStatus({ id, formId: searchQuery.formId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 搜索
 const search = () => {
@@ -208,16 +300,13 @@
 }
 // 重置
 const reset = () => {
+  clearSearch()
   getList()
 }
 // 模板下载
-const templateDownload = () => {
-
-}
+const templateDownload = () => {}
 // 标签识别
-const identify = () => {
-
-}
+const identify = () => {}
 // 新增
 const add = () => {
   $router.push({
@@ -251,7 +340,9 @@
     printJSON(list.value, properties, props.name)
   }
   else if (selectIds.length > 0) {
-    const printList = list.value.filter((item: TableRow) => selectIds.includes(item.id))
+    const printList = list.value.filter((item: TableRow) =>
+      selectIds.includes(item.id),
+    )
     printJSON(printList, properties, props.name)
   }
   else {
@@ -260,11 +351,37 @@
 }
 // 导出
 const exportExcelBtn = () => {
+  // const params: supplierExportQuery = {
+  //   approvalStatus: listQuery.value.approvalStatus,
+  //   businessContent: listQuery.value.businessContent,
+  //   companyArea: listQuery.value.companyArea,
+  //   companyCity: listQuery.value.companyCity,
+  //   companyProvince: listQuery.value.companyProvince,
+  //   formId: listQuery.value.formId,
+  //   supplierName: listQuery.value.supplierName,
+  //   supplierNo: listQuery.value.supplierNo,
+  // }
+  // if (checkoutList.value.length > 0) {
+  //   params.ids = checkoutList.value
+  // }
+  const postData = {
+    applyType: searchQuery.applyType,
+    approvalStatus: searchQuery.approvalStatus,
+    createUser: searchQuery.createUser,
+    ids: [] as number[],
+  }
+  postData.ids = selectList.value.map((item) => {
+    return item.id
+  })
+  exportStatus(postData).then((res) => {
+
+  })
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  loading.close()
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -284,18 +401,22 @@
   getList()
   dialogVisible.value = false
 }
-watch(() => props.type, (newValue) => {
-  if (newValue === '0') {
-    searchQuery.approvalStatus = ''
-  }
-  else {
-    searchQuery.approvalStatus = newValue
-  }
-  getList()
-}, {
-  immediate: true,
-  deep: true,
-})
+watch(
+  () => props.type,
+  (newValue) => {
+    if (newValue === '0') {
+      searchQuery.approvalStatus = ''
+    }
+    else {
+      searchQuery.approvalStatus = newValue
+    }
+    getList()
+  },
+  {
+    immediate: true,
+    deep: true,
+  },
+)
 </script>
 
 <template>
@@ -307,68 +428,197 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input
+            v-model="searchQuery.applyNo"
+            placeholder="申请编号"
+            clearable
+            class="w-50 m-2"
+          />
         </search-item>
         <search-item>
-          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input
+            v-model="searchQuery.equipmentNo"
+            placeholder="设备编号"
+            clearable
+            class="w-50 m-2"
+          />
         </search-item>
         <search-item>
-          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input
+            v-model="searchQuery.equipmentName"
+            placeholder="设备名称"
+            clearable
+            class="w-50 m-2"
+          />
         </search-item>
         <search-item>
-          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input
+            v-model="searchQuery.applyUnit"
+            placeholder="申请单位"
+            clearable
+            class="w-50 m-2"
+          />
         </search-item>
         <search-item>
-          <el-select placeholder="申请状态" clearable />
+          <el-select
+            v-model="searchQuery.applyStatus"
+            placeholder="申请状态"
+            clearable
+          >
+            <el-option
+              v-for="manager of managerStateList"
+              :key="manager.id"
+              :label="manager.name"
+              :value="manager.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <input
+            v-show="searchQuery.limit === 0"
+            ref="fileRef"
+            type="file"
+            multiple
+            @change="onFileChange"
+          >
           <icon-button icon="icon-add" title="新建" @click="add" />
-          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button
+            icon="icon-export"
+            title="导出"
+            @click="exportExcelBtn"
+          />
           <icon-button icon="icon-print" title="打印" @click="printList" />
         </template>
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns"
+          :data="list"
+          :total="total"
+          :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           :is-multi="true"
-          @change="changePage" @multi-select="multiSelect"
+          @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
               <template #default="scope">
-                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+                {{
+                  (searchQuery.offset - 1) * searchQuery.limit
+                    + scope.$index
+                    + 1
+                }}
               </template>
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="230" fixed="right">
+            <el-table-column
+              label="操作"
+              align="center"
+              width="230"
+              fixed="right"
+            >
               <template #default="{ row }">
-                <!-- <el-button size="small" type="primary" link @click="update(row)">
-                  编辑
-                </el-button> -->
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="detail(row)"
+                >
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="agree(row)">
+                <el-button
+                  v-if="
+                    props.type !== '0' && props.type !== '3'
+                      && props.type !== '6' && props.type !== '2'
+                  "
+                  size="small"
+                  type="primary"
+                  link
+                  @click="update(row)"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="
+                    props.type !== '0' && props.type !== '3'
+                      && props.type !== '6' && props.type !== '2'
+                  "
+                  size="small"
+                  type="primary"
+                  link
+                  @click="submit(row)"
+                >
+                  提交
+                </el-button>
+                <el-button
+                  v-if="(props.type === '0' || props.type === '2')"
+                  size="small"
+                  type="primary"
+                  link
+                  :disabled="
+                    row.approvalStatus !== '待审批'
+                      && row.approvalStatus !== '审批中'
+                  "
+                  @click="agree(row)"
+                >
                   同意
                 </el-button>
-                <el-button size="small" type="primary" link @click="reject(row)">
+                <el-button
+                  v-if="(props.type === '0' || props.type === '2')"
+                  size="small"
+                  type="primary"
+                  link
+                  :disabled="
+                    row.approvalStatus !== '待审批'
+                      && row.approvalStatus !== '审批中'
+                  "
+                  @click="reject(row)"
+                >
                   驳回
                 </el-button>
-                <el-button size="small" type="primary" link @click="refuse(row)">
+                <el-button
+                  v-if="(props.type === '0' || props.type === '2')"
+                  size="small"
+                  type="danger"
+                  link
+                  :disabled="
+                    row.approvalStatus !== '待审批'
+                      && row.approvalStatus !== '审批中'
+                  "
+                  @click="refuse(row)"
+                >
                   拒绝
                 </el-button>
-                <el-button size="small" type="primary" link @click="cancel(row)">
+                <el-button
+                  v-if="
+                    props.type !== '1'
+                      && props.type !== '2'
+                  "
+                  size="small"
+                  type="text"
+                  link
+                  :disabled="row.approvalStatus !== '审批中'"
+                  @click="cancel(row)"
+                >
                   取消
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button
+                  v-if="
+                    props.type !== '4'
+                      && props.type !== '5'
+                  "
+                  :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                  size="small"
+                  type="danger"
+                  link
+                  @click="remove(row)"
+                >
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 27faff8..531fe0d 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -80,7 +80,7 @@
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
-    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    // ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
   else if (row.title === '详情') {
     ruleForm.createUserId = row.createUserId
@@ -107,10 +107,8 @@
   ruleForm.minioFileName = ''
   ruleForm.publishTime = ''
   ruleForm.remark = ''
-  ruleForm.publishTime = ''
   ruleForm.effectiveTime = ''
   ruleForm.effectiveStatus = ''
-  ruleForm.publishTime = ''
   ruleForm.createUserId = ''
   effectiveStatusName.value = ''
 }
@@ -128,9 +126,9 @@
       type: 'warning',
     },
       ).then((res) => {
-        if (flag == '提交') {
+        if (flag === '提交') {
           confirmDrafts(ruleForm).then((res) => {
-            if (res.code == 200) {
+            if (res.code === 200) {
               console.log(res.data, '保存成功')
               submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
                 formEl?.resetFields()
@@ -199,7 +197,7 @@
       effectiveStatusName.value = '在使用'
       ruleForm.effectiveStatus = '1'
     }
-    else if (diffDat == 0) {
+    else if (diffDat === 0) {
     // ruleForm.effectiveStatusName = '在使用'
       effectiveStatusName.value = '在使用'
       ruleForm.effectiveStatus = '1'
diff --git a/src/views/measure/file/components/approve/addDialog.vue b/src/views/measure/file/components/approve/addDialog.vue
index f7f9b42..6e66400 100644
--- a/src/views/measure/file/components/approve/addDialog.vue
+++ b/src/views/measure/file/components/approve/addDialog.vue
@@ -4,16 +4,18 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../../file-interface'
+import type { TableRow } from './approve-interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
 import { toTreeList } from '@/utils/structure'
 import { printHtml } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi, confirmDrafts, submitFile } from '@/api/measure/file'
+import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -75,7 +77,6 @@
   fileList.value = []
   formDataRow.value = row
   getuser()
-  getuser()
   getPubList()
   if (row.title === '新建') {
     // 默认发布人和发布单位
@@ -83,9 +84,10 @@
     ruleForm.publisher = userInfo.$state.deptId
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '详情') {
+  else if (row.title === '详情' || row.title === '编辑') {
     ruleForm.createUserId = row.createUserId
     ruleForm.fileNo = row.fileNo
+    ruleForm.id = row.id
     ruleForm.fileName = row.fileName
     ruleForm.fileCode = row.fileCode
     fileTypeName.value = row.fileTypeName
@@ -127,25 +129,37 @@
       type: 'warning',
     },
   ).then((res) => {
-    console.log('提交')
+    if (approvalStatusName.value !== '草稿箱') {
+      confirmDrafts(ruleForm).then((res) => {
+        if (res.code === 200) {
+          console.log(res.data, '保存成功')
+          submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
+            ElMessage.success('提交成功')
+            $router.go(-1)
+            close()
+          })
+        }
+      })
+    }
+    else {
+      // 保存（草稿箱）
+      updateDrafts(ruleForm).then((res) => {
+        ElMessage.success('保存成功')
+        $router.go(-1)
+        close()
+      })
+    }
   })
 }
 // 编辑
-const update = (row) => {
-  // $router.push({
-  //   name: 'approveDetail',
-  //   query: {
-  //     ...row,
-  //     title: '编辑',
-  //   },
-  // })
+const update = (row: TableRow) => {
   initDialog({
     ...row,
     title: '编辑',
   })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: TableRow) => {
   ElMessageBox.confirm(
     '确认删除吗？',
     '提示',
@@ -156,7 +170,28 @@
     },
   )
     .then(() => {
-      console.log('确认删除')
+      if (row.approvalStatusName === '待审批') {
+        approvalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            $router.go(-1)
+          }
+        })
+      }
+      else {
+        deleteApi({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            $router.go(-1)
+          }
+        })
+      }
     })
 }
 // 取消
@@ -172,8 +207,8 @@
 }
 const approvalDialog = ref()
 // 审批操作
-const approval = (type: string, taskId: string) => {
-  approvalDialog.value.initDialog(type, taskId)
+const approval = (type: string, processId: string) => {
+  approvalDialog.value.initDialog(type, processId)
 }
 // 打印
 const print = () => {
@@ -217,7 +252,7 @@
       effectiveStatusName.value = '在使用'
       ruleForm.effectiveStatus = '1'
     }
-    else if (diffDat == 0) {
+    else if (diffDat === 0) {
     // ruleForm.effectiveStatusName = '在使用'
       effectiveStatusName.value = '在使用'
       ruleForm.effectiveStatus = '1'
@@ -236,12 +271,12 @@
     <detail-page :title="`文件审批-${title}`">
       <template #btns>
         <div v-if="approvalStatusName === '草稿箱' || approvalStatusName === '已取消'">
-          <el-button type="primary" @click="submitForm">
-            提交
-          </el-button>
           <el-button v-if="title !== '编辑'" type="primary" @click="update(formDataRow)">
             编辑
           </el-button>
+          <el-button v-else type="primary" @click="submitForm">
+            {{ approvalStatusName === '草稿箱' ? '保存' : '提交' }}
+          </el-button>
           <el-button type="primary" @click="remove(formDataRow)">
             删除
           </el-button>
@@ -249,7 +284,7 @@
             关闭
           </el-button>
         </div>
-        <div v-if="approvalStatusName === '待审批' || approvalStatusName === '审批中'">
+        <div v-if="approvalStatusName === '待审批'">
           <el-button type="primary" @click="approval('agree', formDataRow.taskId)">
             同意
           </el-button>

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index 80d91b7..c7e8343 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -5,10 +5,10 @@
 import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
-// 列表查询
+// 任务分发列表查询
 export function getTaskList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/business/labExecutive/handOut/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 8771c29..85334a4 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -16,6 +16,16 @@
     data,
   })
 }
+
+// 状态管理编辑
+export function updateStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/updateStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: object) {
   return request({
@@ -24,6 +34,22 @@
     data,
   })
 }
+// 状态管理取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 状态管理详情
 export function detailStatus(data: object) {
   return request({
@@ -32,3 +58,12 @@
     data,
   })
 }
+
+// 状态管理导出
+export function exportStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/exportStateManageList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index c5cea4b..768c310 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -63,7 +63,7 @@
 // 导出
 export function exportFileApi(data: object) {
   return request({
-    url: 'file/listExport',
+    url: '/meter/file/listExport',
     method: 'post',
     data,
     responseType: 'blob',
@@ -86,6 +86,25 @@
     data,
   })
 }
+
+// 取消
+export function approvalCancel(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function approvalDelete(data: object) {
+  return request({
+    url: '/meter/file/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 保存草稿箱
 export function confirmDrafts(data: object) {
   return request({
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 7b538cf..1d02839 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -9,9 +9,7 @@
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
   sampleAttr: string // 样品属性
-  sendState: string // 分发状态
-  outState: string // 超期状态
-  formId: string // formId
+  sampleStatus: string // 分发状态
   limit: number
   offset: number
 }
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 799a420..f784804 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -16,12 +16,12 @@
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待分发', value: 'sendState;0' },
-  { name: '检测中', value: 'sendState;1' },
-  { name: '检测完', value: 'sendState;2' },
-  { name: '超期样品', value: 'outState;1' },
+  { name: '待分发', value: 'sampleStatus;2' },
+  { name: '检测中', value: 'sampleStatus;3' },
+  { name: '检测完', value: 'sampleStatus;4' },
+  { name: '超期样品', value: 'sampleStatus;8' },
 ]
-const currentMenu = ref('sendState;0') // 当前选中状态
+const currentMenu = ref('sampleStatus;2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 const listQuery: Ref<ITaskQuery> = ref({
@@ -34,9 +34,7 @@
   sampleAttr: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  sampleStatus: '2', // 样品状态:默认待分发
   offset: 1,
   limit: 20,
 })
@@ -82,18 +80,18 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  // // 模拟数据
+  // list.value = [
+  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
+  // ]
+  // loadingTable.value = false
+  // console.log(listQuery.value)
+  getTaskList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = response.data.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -114,9 +112,7 @@
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleStatus: '2', // 分发状态
     offset: 1,
     limit: 20,
   }
@@ -202,9 +198,7 @@
 watch(currentMenu, (val: string) => {
   const vals = val.split(';')
   if (vals.length > 1) {
-    listQuery.value.sendState = ''
-    listQuery.value.outState = ''
-    listQuery.value[vals[0] as 'sendState' | 'outState'] = vals[1]
+    listQuery.value.sampleStatus = vals[1]
   }
   fetchData(false)
 })
@@ -300,7 +294,7 @@
               <el-button size="small" link type="primary" @click="bindLabel(row)">
                 标签绑定
               </el-button>
-              <el-button v-if="listQuery.sendState !== '2'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.sampleStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 分发
               </el-button>
             </template>
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 7f8f5ce..97d660a 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -5,12 +5,14 @@
   applyPerson: string // 	申请人
   applyUnit: string // 	申请单位
   approvalStatus?: string // 	审批状态
-  createUser: string // 	创建人
-  processResult: string // 	处置结果
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
   time: string // 	申请日期
   limit?: number
   offset?: number
   ids?: string[]
+  formId?: string
 }
 // 借用设备类型
 export interface borrowDeviceType {
@@ -22,6 +24,8 @@
   useDept: string // 使用部门
   usePerson: string // 使用人
   validDate: string // 有效日期
+  approvalStatusName: string
+  applyName: string
   edit?: boolean
   equipmentName?: string
   id?: string
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 470bad1..2f7a26f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -35,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :status="current" />
+    <component :is="currentComp" :status="current" apply-type="2" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 53046f0..6dc9628 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -56,7 +56,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" :type="type" />
+    <component :is="currentComp" :name="current" :type="type" apply-type="1" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index e43c46a..b863728 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,18 +1,25 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import approveAction from './approvalActionDialog.vue'
+import type { borrowDeviceType } from '../borrow-interface'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const props = defineProps({
   type: {
     type: String,
     required: true,
   },
+  applyType: {
+    type: String,
+    required: true,
+  },
 })
+const approvalDialog = ref() // 审批对话框显隐
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
@@ -21,13 +28,15 @@
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
   applyUnit: '', // 	申请单位
-  approvalStatus: '', // 	审批状态
+  approvalStatus: '0', // 	审批状态
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
+  applyType: props.applyType,
   time: '', // 	申请日期
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -94,12 +103,12 @@
   },
   {
     text: '申请部门',
-    value: 'applyUnit',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'applyPerson',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
@@ -167,7 +176,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: borrowDeviceType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -183,7 +192,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: borrowDeviceType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -197,7 +206,7 @@
   })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: borrowDeviceType) => {
   ElMessageBox.confirm(
     `确认删除${row.applyName}吗？`,
     '提示',
@@ -247,9 +256,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<borrowDeviceType[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: borrowDeviceType[]) => {
   selectList.value = row
 }
 // 导出
@@ -259,11 +268,12 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (selectList.value.length) {
-  //   selectList.value.forEach((item) => {
-  //     searchQuery.ids?.push(item.id as string)
-  //   })
-  // }
+  searchQuery.ids = []
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
@@ -292,27 +302,27 @@
     ElMessage('无可打印内容')
   }
 }
-const approveRef = ref()
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+  getList()
+}
 // 同意
-const agree = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '1',
-  })
-}
 // 驳回
-const reject = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '3',
-  })
-}
 // 拒绝
-const refuse = (row: any) => {
-  approveRef.value.initDialog(
-    {
-      radio: '2',
-    },
-  )
+const handleClick = (val: string, taskId: string) => {
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', taskId)
+  }
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', taskId)
+  }
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', taskId)
+  }
 }
+
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
@@ -376,10 +386,10 @@
 
 <template>
   <div>
+    <!-- 同意、驳回、拒绝对话框显示 -->
     <!-- 添加/编辑/查看 -->
     <app-container>
-      <!-- 审批操作 -->
-      <approve-action ref="approveRef" />
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -425,7 +435,7 @@
         <normal-table
           id="print"
           :key="Math.random()"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
@@ -447,15 +457,17 @@
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="agree(row)">
-                  同意
-                </el-button>
-                <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="reject(row)">
-                  驳回
-                </el-button>
-                <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="refuse(row)">
-                  拒绝
-                </el-button>
+                <temaplte v-if="row.approvalStatusName !== '审批中'">
+                  <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="handleClick('agree', row.taskId)">
+                    同意
+                  </el-button>
+                  <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="handleClick('reject', row.taskId)">
+                    驳回
+                  </el-button>
+                  <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="handleClick('refuse', row.taskId)">
+                    拒绝
+                  </el-button>
+                </temaplte>
                 <el-button size="small" type="primary" link @click="cancel(row)">
                   取消
                 </el-button>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 7f3ea3e..293be0c 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,24 +1,37 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
     required: true,
   },
+  applyType: {
+    type: String,
+    required: true,
+  },
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
-const searchQuery = reactive({
-  applyNo: '',
-  applyName: '',
-  applyUnit: '',
-  applyPerson: '',
-  limit: 10,
+const searchQuery = reactive<searchType>({
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 	申请人
+  applyUnit: '', // 	申请单位
+  approvalStatus: '0', // 	审批状态
+  createUser: '', // 	创建人
+  processResult: '', // 	处置结果
+  applyType: props.applyType,
+  time: '', // 	申请日期
+  ids: [] as string[],
+  limit: 20,
   offset: 1,
-  ids: [],
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -68,35 +81,16 @@
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  // loadingTable.value = true
-  // listPageApi(searchQuery).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  //   loadingTable.value = false
-  // }).catch((_) => {
-  //   loadingTable.value = false
-  // })
-  // list.value = [
-  //   {
-  //     applyName: '借用测试设备',
-  //     applyNo: '1433223',
-  //     applyUnit: '顶级',
-  //     applyPerson: '张三',
-  //     time: '2020-12-12 00:00:00',
-  //     approvalStatusName: '审批中',
-  //   },
-  //   {
-  //     applyName: '借用电脑',
-  //     applyNo: '1433223',
-  //     applyUnit: '徐州分中心',
-  //     applyPerson: '里斯',
-  //     time: '2020-12-12 00:00:00',
-  //     approvalStatusName: '已通过',
-  //   },
-  // ] as any
-  // total.value = 2
+  loadingTable.value = true
+  getApplyList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -124,6 +118,7 @@
     query: {
       title: '详情',
       name: '设备借用处理',
+      // approvalStatusName: row.approvalStatusName,
     },
   })
 }
@@ -157,15 +152,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -174,7 +169,11 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
 // 模板下载
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index ec522cf..0d33dfb 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -13,7 +13,7 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
-import { addStatus, detailStatus } from '@/api/device/stateManage'
+import { addStatus, detailStatus, updateStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
 import useUserStore from '@/store/modules/user'
 
@@ -30,7 +30,7 @@
 }
 const ruleForm1 = ref({
   applyType: $route.query.applyType, // 申请类型
-  applyDesc: '', // 申请说明
+  remark: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
   applyUnit: '', // 申请单位
@@ -41,6 +41,7 @@
   equipmentSpecifications: '', // 设备规格
   manufacturingNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
+  equipmentId: '',
   equipmentList: [] as EquipmentListRow[],
   id: '',
 }) // 表单
@@ -212,7 +213,7 @@
         ruleForm1.value = res.data
         ruleForm1.value.applyUnit = res.data.applyUnit
         ruleForm1.value.equipmentNo = res.data.applyNo
-        ruleForm1.value.equipmentName = res.data.applyTypeName
+        ruleForm1.value.equipmentName = res.data.equipmentName
         ruleForm1.value.time = res.data.time
       })
     }
@@ -304,15 +305,34 @@
             type: 'warning',
           },
         ).then((res) => {
-          addStatus(ruleForm1.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('操作成功!')
-              $router.go(-1)
+          if (title.value == '编辑') {
+            ruleForm1.value.applyPerson = ruleForm1.value.id
+            ruleForm1.value.applyUnit = ruleForm1.value.id
+            if (ruleForm1.value.equipmentList && ruleForm1.value.equipmentList[0]) {
+              ruleForm1.value.equipmentId = ruleForm1.value.equipmentList[0].equipmentId
+              delete ruleForm1.value.equipmentList
             }
-            else {
-              ElMessage.warning(res.message)
-            }
-          })
+            updateStatus(ruleForm1.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              }
+              else {
+                ElMessage.warning(res.message)
+              }
+            })
+          }
+          else {
+            addStatus(ruleForm1.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              }
+              else {
+                ElMessage.warning(res.message)
+              }
+            })
+          }
         })
       }
     })
@@ -680,8 +700,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="18">
-            <el-form-item label="申请理由" prop="applyDesc">
-              <el-input v-model.trim="ruleForm1.applyDesc" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
+            <el-form-item label="申请理由" prop="remark">
+              <el-input v-model.trim="ruleForm1.remark" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -760,7 +780,7 @@
           </el-table-column>
         </el-table>
       </detail-block>
-      <detail-block v-if="title !== '新建'" title="审批流程">
+      <!-- <detail-block v-if="title !== '新建'" title="审批流程">
         <el-timeline>
           <el-timeline-item timestamp="2018/4/12" placement="top">
             <el-card>
@@ -781,7 +801,7 @@
             </el-card>
           </el-timeline-item>
         </el-timeline>
-      </detail-block>
+      </detail-block> -->
     </div>
   </app-container>
 </template>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 1cc56b2..5a4aad6 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,14 +1,20 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { TableRow } from './status-interface'
-import { getStatusList } from '@/api/device/stateManage'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import {
+  cancelStatus,
+  deleteStatus,
+  exportStatus,
+  getStatusList,
+  submitStatus,
+} from '@/api/device/stateManage'
 import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
-
+// 选中的按钮
 const props = defineProps({
   name: {
     type: String,
@@ -18,28 +24,53 @@
     type: String,
     default: '',
   },
-  type: { // 当前状态
+  type: {
+    // 当前状态
     type: String,
     default: '',
   },
-  applyType: { // 设备申请类型
+  applyType: {
+    // 设备申请类型
     type: String,
     default: '',
   },
-})
+}); const active = ref('0')// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
+
 const formIdList = ref({
   设备闲置申请: 'DEVICE_UNUSED_APPROVAL',
   设备封存申请: 'DEVICE_SEALED_APPROVAL',
   设备启封申请: 'DEVICE_UNSEALED_APPROVAL',
   设备报废申请: 'DEVICE_SCRAPPED_ROVAL',
   设备处置申请: 'DEVICE_HANDLE_APPROVAL',
+  设备借用申请: 'DEVICE_BORROW_APPROVAL',
 })
 const $router = useRouter()
 const searchQuery = reactive({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
   applyUnit: '', // 申请单位
-  approvalStatus: '', // 审批状态
+  approvalStatus: '0', // 审批状态
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
@@ -104,28 +135,53 @@
   },
 ]) // 表格
 const list = ref([]) // 表格数据
+const managerStateList = ref([]) // 状态数据
 const approvalDialog = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const { proxy } = getCurrentInstance() as any
+
+const clearSearch = () => {
+  searchQuery.equipmentName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyStatus = ''
+  searchQuery.applyUnit = ''
+  searchQuery.approvalStatus = ''
+  searchQuery.createUser = ''
+  searchQuery.equipmentNo = ''
+  searchQuery.ids = [] as string[]
+  searchQuery.limit = 20
+  searchQuery.offset = 1
+  searchQuery.applyType = props.applyType
+  searchQuery.formId = SCHEDULE[formIdList.value[props.name]]
+}
+
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  getDictByCode('managerState').then((response) => {
-    if (response.code === 200) {
-      console.log(response.data, 'response') // 状态
-
-      // 根据闲置，封存，启封等状态获取不同的列表
-      // 接口未写好
-      getStatusList(searchQuery).then((res) => {
-        if (res.code === 200) {
-          list.value = res.data.rows
-          total.value = res.data.total
-        }
-        loadingTable.value = false
-      })
-    }
-  }).catch((_) => {
-    loadingTable.value = false
-  })
+  getDictByCode('managerState')
+    .then((response) => {
+      if (response.code === 200) {
+        console.log(response.data, 'response') // 状态
+        managerStateList.value = response.data
+        // searchQuery.approvalStatus = active.value
+        // 根据闲置，封存，启封等状态获取不同的列表
+        getStatusList(searchQuery).then((res) => {
+          if (res.code === 200) {
+            list.value = res.data.rows.map((item: TableRow) => {
+              return {
+                ...item,
+                approvalStatus: approvalStatusMap[item.approvalStatus],
+              }
+            })
+            total.value = res.data.total
+          }
+          loadingTable.value = false
+        })
+      }
+    })
+    .catch((_) => {
+      loadingTable.value = false
+    })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -158,6 +214,7 @@
     name: 'stateManageDetail',
     params: {
       type: 'edit',
+      id: row.id,
     },
     query: {
       title: '编辑',
@@ -168,39 +225,74 @@
 }
 // 删除
 const remove = (row: TableRow) => {
-  ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
+  const { id } = row
+  ElMessageBox.confirm(`确认删除${row.equipmentName}吗？`, '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    deleteStatus({ id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 同意
 const agree = (row: TableRow) => {
-  approvalDialog.value.initDialog('agree', row.taskId)
+  approvalDialog.value.initDialog('agree', row.processId)
 }
 // 驳回
 const reject = (row: TableRow) => {
-  approvalDialog.value.initDialog('reject', row.taskId)
+  approvalDialog.value.initDialog('reject', row.processId)
 }
 // 拒绝
 const refuse = (row: TableRow) => {
-  approvalDialog.value.initDialog('refuse', row.taskId)
+  approvalDialog.value.initDialog('refuse', row.processId)
 }
 // 取消
-const cancel = (rowrow: TableRow) => {
-  ElMessageBox.confirm(
-    '确认取消吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
+const cancel = (row: TableRow) => {
+  const { processId } = row
+  ElMessageBox.confirm('确认取消吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    cancelStatus({ processInstanceId: processId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+
+// 提交
+const submit = (row: TableRow) => {
+  // 流程id为空
+  const { id } = row
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitStatus({ id, formId: searchQuery.formId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 搜索
 const search = () => {
@@ -208,16 +300,13 @@
 }
 // 重置
 const reset = () => {
+  clearSearch()
   getList()
 }
 // 模板下载
-const templateDownload = () => {
-
-}
+const templateDownload = () => {}
 // 标签识别
-const identify = () => {
-
-}
+const identify = () => {}
 // 新增
 const add = () => {
   $router.push({
@@ -251,7 +340,9 @@
     printJSON(list.value, properties, props.name)
   }
   else if (selectIds.length > 0) {
-    const printList = list.value.filter((item: TableRow) => selectIds.includes(item.id))
+    const printList = list.value.filter((item: TableRow) =>
+      selectIds.includes(item.id),
+    )
     printJSON(printList, properties, props.name)
   }
   else {
@@ -260,11 +351,37 @@
 }
 // 导出
 const exportExcelBtn = () => {
+  // const params: supplierExportQuery = {
+  //   approvalStatus: listQuery.value.approvalStatus,
+  //   businessContent: listQuery.value.businessContent,
+  //   companyArea: listQuery.value.companyArea,
+  //   companyCity: listQuery.value.companyCity,
+  //   companyProvince: listQuery.value.companyProvince,
+  //   formId: listQuery.value.formId,
+  //   supplierName: listQuery.value.supplierName,
+  //   supplierNo: listQuery.value.supplierNo,
+  // }
+  // if (checkoutList.value.length > 0) {
+  //   params.ids = checkoutList.value
+  // }
+  const postData = {
+    applyType: searchQuery.applyType,
+    approvalStatus: searchQuery.approvalStatus,
+    createUser: searchQuery.createUser,
+    ids: [] as number[],
+  }
+  postData.ids = selectList.value.map((item) => {
+    return item.id
+  })
+  exportStatus(postData).then((res) => {
+
+  })
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  loading.close()
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -284,18 +401,22 @@
   getList()
   dialogVisible.value = false
 }
-watch(() => props.type, (newValue) => {
-  if (newValue === '0') {
-    searchQuery.approvalStatus = ''
-  }
-  else {
-    searchQuery.approvalStatus = newValue
-  }
-  getList()
-}, {
-  immediate: true,
-  deep: true,
-})
+watch(
+  () => props.type,
+  (newValue) => {
+    if (newValue === '0') {
+      searchQuery.approvalStatus = ''
+    }
+    else {
+      searchQuery.approvalStatus = newValue
+    }
+    getList()
+  },
+  {
+    immediate: true,
+    deep: true,
+  },
+)
 </script>
 
 <template>
@@ -307,68 +428,197 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input
+            v-model="searchQuery.applyNo"
+            placeholder="申请编号"
+            clearable
+            class="w-50 m-2"
+          />
         </search-item>
         <search-item>
-          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input
+            v-model="searchQuery.equipmentNo"
+            placeholder="设备编号"
+            clearable
+            class="w-50 m-2"
+          />
         </search-item>
         <search-item>
-          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input
+            v-model="searchQuery.equipmentName"
+            placeholder="设备名称"
+            clearable
+            class="w-50 m-2"
+          />
         </search-item>
         <search-item>
-          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input
+            v-model="searchQuery.applyUnit"
+            placeholder="申请单位"
+            clearable
+            class="w-50 m-2"
+          />
         </search-item>
         <search-item>
-          <el-select placeholder="申请状态" clearable />
+          <el-select
+            v-model="searchQuery.applyStatus"
+            placeholder="申请状态"
+            clearable
+          >
+            <el-option
+              v-for="manager of managerStateList"
+              :key="manager.id"
+              :label="manager.name"
+              :value="manager.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <input
+            v-show="searchQuery.limit === 0"
+            ref="fileRef"
+            type="file"
+            multiple
+            @change="onFileChange"
+          >
           <icon-button icon="icon-add" title="新建" @click="add" />
-          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button
+            icon="icon-export"
+            title="导出"
+            @click="exportExcelBtn"
+          />
           <icon-button icon="icon-print" title="打印" @click="printList" />
         </template>
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns"
+          :data="list"
+          :total="total"
+          :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           :is-multi="true"
-          @change="changePage" @multi-select="multiSelect"
+          @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
               <template #default="scope">
-                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+                {{
+                  (searchQuery.offset - 1) * searchQuery.limit
+                    + scope.$index
+                    + 1
+                }}
               </template>
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="230" fixed="right">
+            <el-table-column
+              label="操作"
+              align="center"
+              width="230"
+              fixed="right"
+            >
               <template #default="{ row }">
-                <!-- <el-button size="small" type="primary" link @click="update(row)">
-                  编辑
-                </el-button> -->
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="detail(row)"
+                >
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="agree(row)">
+                <el-button
+                  v-if="
+                    props.type !== '0' && props.type !== '3'
+                      && props.type !== '6' && props.type !== '2'
+                  "
+                  size="small"
+                  type="primary"
+                  link
+                  @click="update(row)"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="
+                    props.type !== '0' && props.type !== '3'
+                      && props.type !== '6' && props.type !== '2'
+                  "
+                  size="small"
+                  type="primary"
+                  link
+                  @click="submit(row)"
+                >
+                  提交
+                </el-button>
+                <el-button
+                  v-if="(props.type === '0' || props.type === '2')"
+                  size="small"
+                  type="primary"
+                  link
+                  :disabled="
+                    row.approvalStatus !== '待审批'
+                      && row.approvalStatus !== '审批中'
+                  "
+                  @click="agree(row)"
+                >
                   同意
                 </el-button>
-                <el-button size="small" type="primary" link @click="reject(row)">
+                <el-button
+                  v-if="(props.type === '0' || props.type === '2')"
+                  size="small"
+                  type="primary"
+                  link
+                  :disabled="
+                    row.approvalStatus !== '待审批'
+                      && row.approvalStatus !== '审批中'
+                  "
+                  @click="reject(row)"
+                >
                   驳回
                 </el-button>
-                <el-button size="small" type="primary" link @click="refuse(row)">
+                <el-button
+                  v-if="(props.type === '0' || props.type === '2')"
+                  size="small"
+                  type="danger"
+                  link
+                  :disabled="
+                    row.approvalStatus !== '待审批'
+                      && row.approvalStatus !== '审批中'
+                  "
+                  @click="refuse(row)"
+                >
                   拒绝
                 </el-button>
-                <el-button size="small" type="primary" link @click="cancel(row)">
+                <el-button
+                  v-if="
+                    props.type !== '1'
+                      && props.type !== '2'
+                  "
+                  size="small"
+                  type="text"
+                  link
+                  :disabled="row.approvalStatus !== '审批中'"
+                  @click="cancel(row)"
+                >
                   取消
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button
+                  v-if="
+                    props.type !== '4'
+                      && props.type !== '5'
+                  "
+                  :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                  size="small"
+                  type="danger"
+                  link
+                  @click="remove(row)"
+                >
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 27faff8..531fe0d 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -80,7 +80,7 @@
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
-    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    // ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
   else if (row.title === '详情') {
     ruleForm.createUserId = row.createUserId
@@ -107,10 +107,8 @@
   ruleForm.minioFileName = ''
   ruleForm.publishTime = ''
   ruleForm.remark = ''
-  ruleForm.publishTime = ''
   ruleForm.effectiveTime = ''
   ruleForm.effectiveStatus = ''
-  ruleForm.publishTime = ''
   ruleForm.createUserId = ''
   effectiveStatusName.value = ''
 }
@@ -128,9 +126,9 @@
       type: 'warning',
     },
       ).then((res) => {
-        if (flag == '提交') {
+        if (flag === '提交') {
           confirmDrafts(ruleForm).then((res) => {
-            if (res.code == 200) {
+            if (res.code === 200) {
               console.log(res.data, '保存成功')
               submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
                 formEl?.resetFields()
@@ -199,7 +197,7 @@
       effectiveStatusName.value = '在使用'
       ruleForm.effectiveStatus = '1'
     }
-    else if (diffDat == 0) {
+    else if (diffDat === 0) {
     // ruleForm.effectiveStatusName = '在使用'
       effectiveStatusName.value = '在使用'
       ruleForm.effectiveStatus = '1'
diff --git a/src/views/measure/file/components/approve/addDialog.vue b/src/views/measure/file/components/approve/addDialog.vue
index f7f9b42..6e66400 100644
--- a/src/views/measure/file/components/approve/addDialog.vue
+++ b/src/views/measure/file/components/approve/addDialog.vue
@@ -4,16 +4,18 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../../file-interface'
+import type { TableRow } from './approve-interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
 import { toTreeList } from '@/utils/structure'
 import { printHtml } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi, confirmDrafts, submitFile } from '@/api/measure/file'
+import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -75,7 +77,6 @@
   fileList.value = []
   formDataRow.value = row
   getuser()
-  getuser()
   getPubList()
   if (row.title === '新建') {
     // 默认发布人和发布单位
@@ -83,9 +84,10 @@
     ruleForm.publisher = userInfo.$state.deptId
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '详情') {
+  else if (row.title === '详情' || row.title === '编辑') {
     ruleForm.createUserId = row.createUserId
     ruleForm.fileNo = row.fileNo
+    ruleForm.id = row.id
     ruleForm.fileName = row.fileName
     ruleForm.fileCode = row.fileCode
     fileTypeName.value = row.fileTypeName
@@ -127,25 +129,37 @@
       type: 'warning',
     },
   ).then((res) => {
-    console.log('提交')
+    if (approvalStatusName.value !== '草稿箱') {
+      confirmDrafts(ruleForm).then((res) => {
+        if (res.code === 200) {
+          console.log(res.data, '保存成功')
+          submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
+            ElMessage.success('提交成功')
+            $router.go(-1)
+            close()
+          })
+        }
+      })
+    }
+    else {
+      // 保存（草稿箱）
+      updateDrafts(ruleForm).then((res) => {
+        ElMessage.success('保存成功')
+        $router.go(-1)
+        close()
+      })
+    }
   })
 }
 // 编辑
-const update = (row) => {
-  // $router.push({
-  //   name: 'approveDetail',
-  //   query: {
-  //     ...row,
-  //     title: '编辑',
-  //   },
-  // })
+const update = (row: TableRow) => {
   initDialog({
     ...row,
     title: '编辑',
   })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: TableRow) => {
   ElMessageBox.confirm(
     '确认删除吗？',
     '提示',
@@ -156,7 +170,28 @@
     },
   )
     .then(() => {
-      console.log('确认删除')
+      if (row.approvalStatusName === '待审批') {
+        approvalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            $router.go(-1)
+          }
+        })
+      }
+      else {
+        deleteApi({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            $router.go(-1)
+          }
+        })
+      }
     })
 }
 // 取消
@@ -172,8 +207,8 @@
 }
 const approvalDialog = ref()
 // 审批操作
-const approval = (type: string, taskId: string) => {
-  approvalDialog.value.initDialog(type, taskId)
+const approval = (type: string, processId: string) => {
+  approvalDialog.value.initDialog(type, processId)
 }
 // 打印
 const print = () => {
@@ -217,7 +252,7 @@
       effectiveStatusName.value = '在使用'
       ruleForm.effectiveStatus = '1'
     }
-    else if (diffDat == 0) {
+    else if (diffDat === 0) {
     // ruleForm.effectiveStatusName = '在使用'
       effectiveStatusName.value = '在使用'
       ruleForm.effectiveStatus = '1'
@@ -236,12 +271,12 @@
     <detail-page :title="`文件审批-${title}`">
       <template #btns>
         <div v-if="approvalStatusName === '草稿箱' || approvalStatusName === '已取消'">
-          <el-button type="primary" @click="submitForm">
-            提交
-          </el-button>
           <el-button v-if="title !== '编辑'" type="primary" @click="update(formDataRow)">
             编辑
           </el-button>
+          <el-button v-else type="primary" @click="submitForm">
+            {{ approvalStatusName === '草稿箱' ? '保存' : '提交' }}
+          </el-button>
           <el-button type="primary" @click="remove(formDataRow)">
             删除
           </el-button>
@@ -249,7 +284,7 @@
             关闭
           </el-button>
         </div>
-        <div v-if="approvalStatusName === '待审批' || approvalStatusName === '审批中'">
+        <div v-if="approvalStatusName === '待审批'">
           <el-button type="primary" @click="approval('agree', formDataRow.taskId)">
             同意
           </el-button>
diff --git a/src/views/measure/file/components/approve/approve-interface.ts b/src/views/measure/file/components/approve/approve-interface.ts
new file mode 100644
index 0000000..7a1b06d
--- /dev/null
+++ b/src/views/measure/file/components/approve/approve-interface.ts
@@ -0,0 +1,20 @@
+// 计量文件表格行
+export interface TableRow {
+  createUser: string
+  effectiveStatus: string
+  effectiveStatusName: string
+  approvalStatusName: string
+  effectiveTime: string
+  fileCode: string
+  fileName: string
+  fileNo: string
+  fileType: string
+  fileTypeName: string
+  id: string
+  taskId: string
+  minioFileName: string
+  processId: string
+  publishTime: string
+  publisher: string
+  remark: string
+}

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index 80d91b7..c7e8343 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -5,10 +5,10 @@
 import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
-// 列表查询
+// 任务分发列表查询
 export function getTaskList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/business/labExecutive/handOut/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 8771c29..85334a4 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -16,6 +16,16 @@
     data,
   })
 }
+
+// 状态管理编辑
+export function updateStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/updateStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: object) {
   return request({
@@ -24,6 +34,22 @@
     data,
   })
 }
+// 状态管理取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 状态管理详情
 export function detailStatus(data: object) {
   return request({
@@ -32,3 +58,12 @@
     data,
   })
 }
+
+// 状态管理导出
+export function exportStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/exportStateManageList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index c5cea4b..768c310 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -63,7 +63,7 @@
 // 导出
 export function exportFileApi(data: object) {
   return request({
-    url: 'file/listExport',
+    url: '/meter/file/listExport',
     method: 'post',
     data,
     responseType: 'blob',
@@ -86,6 +86,25 @@
     data,
   })
 }
+
+// 取消
+export function approvalCancel(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function approvalDelete(data: object) {
+  return request({
+    url: '/meter/file/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 保存草稿箱
 export function confirmDrafts(data: object) {
   return request({
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 7b538cf..1d02839 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -9,9 +9,7 @@
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
   sampleAttr: string // 样品属性
-  sendState: string // 分发状态
-  outState: string // 超期状态
-  formId: string // formId
+  sampleStatus: string // 分发状态
   limit: number
   offset: number
 }
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 799a420..f784804 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -16,12 +16,12 @@
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待分发', value: 'sendState;0' },
-  { name: '检测中', value: 'sendState;1' },
-  { name: '检测完', value: 'sendState;2' },
-  { name: '超期样品', value: 'outState;1' },
+  { name: '待分发', value: 'sampleStatus;2' },
+  { name: '检测中', value: 'sampleStatus;3' },
+  { name: '检测完', value: 'sampleStatus;4' },
+  { name: '超期样品', value: 'sampleStatus;8' },
 ]
-const currentMenu = ref('sendState;0') // 当前选中状态
+const currentMenu = ref('sampleStatus;2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 const listQuery: Ref<ITaskQuery> = ref({
@@ -34,9 +34,7 @@
   sampleAttr: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  sampleStatus: '2', // 样品状态:默认待分发
   offset: 1,
   limit: 20,
 })
@@ -82,18 +80,18 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  // // 模拟数据
+  // list.value = [
+  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
+  // ]
+  // loadingTable.value = false
+  // console.log(listQuery.value)
+  getTaskList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = response.data.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -114,9 +112,7 @@
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleStatus: '2', // 分发状态
     offset: 1,
     limit: 20,
   }
@@ -202,9 +198,7 @@
 watch(currentMenu, (val: string) => {
   const vals = val.split(';')
   if (vals.length > 1) {
-    listQuery.value.sendState = ''
-    listQuery.value.outState = ''
-    listQuery.value[vals[0] as 'sendState' | 'outState'] = vals[1]
+    listQuery.value.sampleStatus = vals[1]
   }
   fetchData(false)
 })
@@ -300,7 +294,7 @@
               <el-button size="small" link type="primary" @click="bindLabel(row)">
                 标签绑定
               </el-button>
-              <el-button v-if="listQuery.sendState !== '2'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.sampleStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 分发
               </el-button>
             </template>
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 7f8f5ce..97d660a 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -5,12 +5,14 @@
   applyPerson: string // 	申请人
   applyUnit: string // 	申请单位
   approvalStatus?: string // 	审批状态
-  createUser: string // 	创建人
-  processResult: string // 	处置结果
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
   time: string // 	申请日期
   limit?: number
   offset?: number
   ids?: string[]
+  formId?: string
 }
 // 借用设备类型
 export interface borrowDeviceType {
@@ -22,6 +24,8 @@
   useDept: string // 使用部门
   usePerson: string // 使用人
   validDate: string // 有效日期
+  approvalStatusName: string
+  applyName: string
   edit?: boolean
   equipmentName?: string
   id?: string
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 470bad1..2f7a26f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -35,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :status="current" />
+    <component :is="currentComp" :status="current" apply-type="2" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 53046f0..6dc9628 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -56,7 +56,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" :type="type" />
+    <component :is="currentComp" :name="current" :type="type" apply-type="1" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index e43c46a..b863728 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,18 +1,25 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import approveAction from './approvalActionDialog.vue'
+import type { borrowDeviceType } from '../borrow-interface'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const props = defineProps({
   type: {
     type: String,
     required: true,
   },
+  applyType: {
+    type: String,
+    required: true,
+  },
 })
+const approvalDialog = ref() // 审批对话框显隐
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
@@ -21,13 +28,15 @@
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
   applyUnit: '', // 	申请单位
-  approvalStatus: '', // 	审批状态
+  approvalStatus: '0', // 	审批状态
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
+  applyType: props.applyType,
   time: '', // 	申请日期
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -94,12 +103,12 @@
   },
   {
     text: '申请部门',
-    value: 'applyUnit',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'applyPerson',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
@@ -167,7 +176,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: borrowDeviceType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -183,7 +192,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: borrowDeviceType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -197,7 +206,7 @@
   })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: borrowDeviceType) => {
   ElMessageBox.confirm(
     `确认删除${row.applyName}吗？`,
     '提示',
@@ -247,9 +256,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<borrowDeviceType[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: borrowDeviceType[]) => {
   selectList.value = row
 }
 // 导出
@@ -259,11 +268,12 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (selectList.value.length) {
-  //   selectList.value.forEach((item) => {
-  //     searchQuery.ids?.push(item.id as string)
-  //   })
-  // }
+  searchQuery.ids = []
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
@@ -292,27 +302,27 @@
     ElMessage('无可打印内容')
   }
 }
-const approveRef = ref()
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+  getList()
+}
 // 同意
-const agree = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '1',
-  })
-}
 // 驳回
-const reject = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '3',
-  })
-}
 // 拒绝
-const refuse = (row: any) => {
-  approveRef.value.initDialog(
-    {
-      radio: '2',
-    },
-  )
+const handleClick = (val: string, taskId: string) => {
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', taskId)
+  }
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', taskId)
+  }
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', taskId)
+  }
 }
+
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
@@ -376,10 +386,10 @@
 
 <template>
   <div>
+    <!-- 同意、驳回、拒绝对话框显示 -->
     <!-- 添加/编辑/查看 -->
     <app-container>
-      <!-- 审批操作 -->
-      <approve-action ref="approveRef" />
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -425,7 +435,7 @@
         <normal-table
           id="print"
           :key="Math.random()"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
@@ -447,15 +457,17 @@
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="agree(row)">
-                  同意
-                </el-button>
-                <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="reject(row)">
-                  驳回
-                </el-button>
-                <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="refuse(row)">
-                  拒绝
-                </el-button>
+                <temaplte v-if="row.approvalStatusName !== '审批中'">
+                  <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="handleClick('agree', row.taskId)">
+                    同意
+                  </el-button>
+                  <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="handleClick('reject', row.taskId)">
+                    驳回
+                  </el-button>
+                  <el-button size="small" type="primary" link :disabled="!(row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批')" @click="handleClick('refuse', row.taskId)">
+                    拒绝
+                  </el-button>
+                </temaplte>
                 <el-button size="small" type="primary" link @click="cancel(row)">
                   取消
                 </el-button>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 7f3ea3e..293be0c 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,24 +1,37 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
     required: true,
   },
+  applyType: {
+    type: String,
+    required: true,
+  },
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
-const searchQuery = reactive({
-  applyNo: '',
-  applyName: '',
-  applyUnit: '',
-  applyPerson: '',
-  limit: 10,
+const searchQuery = reactive<searchType>({
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 	申请人
+  applyUnit: '', // 	申请单位
+  approvalStatus: '0', // 	审批状态
+  createUser: '', // 	创建人
+  processResult: '', // 	处置结果
+  applyType: props.applyType,
+  time: '', // 	申请日期
+  ids: [] as string[],
+  limit: 20,
   offset: 1,
-  ids: [],
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -68,35 +81,16 @@
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  // loadingTable.value = true
-  // listPageApi(searchQuery).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  //   loadingTable.value = false
-  // }).catch((_) => {
-  //   loadingTable.value = false
-  // })
-  // list.value = [
-  //   {
-  //     applyName: '借用测试设备',
-  //     applyNo: '1433223',
-  //     applyUnit: '顶级',
-  //     applyPerson: '张三',
-  //     time: '2020-12-12 00:00:00',
-  //     approvalStatusName: '审批中',
-  //   },
-  //   {
-  //     applyName: '借用电脑',
-  //     applyNo: '1433223',
-  //     applyUnit: '徐州分中心',
-  //     applyPerson: '里斯',
-  //     time: '2020-12-12 00:00:00',
-  //     approvalStatusName: '已通过',
-  //   },
-  // ] as any
-  // total.value = 2
+  loadingTable.value = true
+  getApplyList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -124,6 +118,7 @@
     query: {
       title: '详情',
       name: '设备借用处理',
+      // approvalStatusName: row.approvalStatusName,
     },
   })
 }
@@ -157,15 +152,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -174,7 +169,11 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
 // 模板下载
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index ec522cf..0d33dfb 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -13,7 +13,7 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
-import { addStatus, detailStatus } from '@/api/device/stateManage'
+import { addStatus, detailStatus, updateStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
 import useUserStore from '@/store/modules/user'
 
@@ -30,7 +30,7 @@
 }
 const ruleForm1 = ref({
   applyType: $route.query.applyType, // 申请类型
-  applyDesc: '', // 申请说明
+  remark: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
   applyUnit: '', // 申请单位
@@ -41,6 +41,7 @@
   equipmentSpecifications: '', // 设备规格
   manufacturingNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
+  equipmentId: '',
   equipmentList: [] as EquipmentListRow[],
   id: '',
 }) // 表单
@@ -212,7 +213,7 @@
         ruleForm1.value = res.data
         ruleForm1.value.applyUnit = res.data.applyUnit
         ruleForm1.value.equipmentNo = res.data.applyNo
-        ruleForm1.value.equipmentName = res.data.applyTypeName
+        ruleForm1.value.equipmentName = res.data.equipmentName
         ruleForm1.value.time = res.data.time
       })
     }
@@ -304,15 +305,34 @@
             type: 'warning',
           },
         ).then((res) => {
-          addStatus(ruleForm1.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('操作成功!')
-              $router.go(-1)
+          if (title.value == '编辑') {
+            ruleForm1.value.applyPerson = ruleForm1.value.id
+            ruleForm1.value.applyUnit = ruleForm1.value.id
+            if (ruleForm1.value.equipmentList && ruleForm1.value.equipmentList[0]) {
+              ruleForm1.value.equipmentId = ruleForm1.value.equipmentList[0].equipmentId
+              delete ruleForm1.value.equipmentList
             }
-            else {
-              ElMessage.warning(res.message)
-            }
-          })
+            updateStatus(ruleForm1.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              }
+              else {
+                ElMessage.warning(res.message)
+              }
+            })
+          }
+          else {
+            addStatus(ruleForm1.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              }
+              else {
+                ElMessage.warning(res.message)
+              }
+            })
+          }
         })
       }
     })
@@ -680,8 +700,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="18">
-            <el-form-item label="申请理由" prop="applyDesc">
-              <el-input v-model.trim="ruleForm1.applyDesc" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
+            <el-form-item label="申请理由" prop="remark">
+              <el-input v-model.trim="ruleForm1.remark" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -760,7 +780,7 @@
           </el-table-column>
         </el-table>
       </detail-block>
-      <detail-block v-if="title !== '新建'" title="审批流程">
+      <!-- <detail-block v-if="title !== '新建'" title="审批流程">
         <el-timeline>
           <el-timeline-item timestamp="2018/4/12" placement="top">
             <el-card>
@@ -781,7 +801,7 @@
             </el-card>
           </el-timeline-item>
         </el-timeline>
-      </detail-block>
+      </detail-block> -->
     </div>
   </app-container>
 </template>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 1cc56b2..5a4aad6 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,14 +1,20 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { TableRow } from './status-interface'
-import { getStatusList } from '@/api/device/stateManage'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import {
+  cancelStatus,
+  deleteStatus,
+  exportStatus,
+  getStatusList,
+  submitStatus,
+} from '@/api/device/stateManage'
 import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
-
+// 选中的按钮
 const props = defineProps({
   name: {
     type: String,
@@ -18,28 +24,53 @@
     type: String,
     default: '',
   },
-  type: { // 当前状态
+  type: {
+    // 当前状态
     type: String,
     default: '',
   },
-  applyType: { // 设备申请类型
+  applyType: {
+    // 设备申请类型
     type: String,
     default: '',
   },
-})
+}); const active = ref('0')// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
+
 const formIdList = ref({
   设备闲置申请: 'DEVICE_UNUSED_APPROVAL',
   设备封存申请: 'DEVICE_SEALED_APPROVAL',
   设备启封申请: 'DEVICE_UNSEALED_APPROVAL',
   设备报废申请: 'DEVICE_SCRAPPED_ROVAL',
   设备处置申请: 'DEVICE_HANDLE_APPROVAL',
+  设备借用申请: 'DEVICE_BORROW_APPROVAL',
 })
 const $router = useRouter()
 const searchQuery = reactive({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
   applyUnit: '', // 申请单位
-  approvalStatus: '', // 审批状态
+  approvalStatus: '0', // 审批状态
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
@@ -104,28 +135,53 @@
   },
 ]) // 表格
 const list = ref([]) // 表格数据
+const managerStateList = ref([]) // 状态数据
 const approvalDialog = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const { proxy } = getCurrentInstance() as any
+
+const clearSearch = () => {
+  searchQuery.equipmentName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyStatus = ''
+  searchQuery.applyUnit = ''
+  searchQuery.approvalStatus = ''
+  searchQuery.createUser = ''
+  searchQuery.equipmentNo = ''
+  searchQuery.ids = [] as string[]
+  searchQuery.limit = 20
+  searchQuery.offset = 1
+  searchQuery.applyType = props.applyType
+  searchQuery.formId = SCHEDULE[formIdList.value[props.name]]
+}
+
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  getDictByCode('managerState').then((response) => {
-    if (response.code === 200) {
-      console.log(response.data, 'response') // 状态
-
-      // 根据闲置，封存，启封等状态获取不同的列表
-      // 接口未写好
-      getStatusList(searchQuery).then((res) => {
-        if (res.code === 200) {
-          list.value = res.data.rows
-          total.value = res.data.total
-        }
-        loadingTable.value = false
-      })
-    }
-  }).catch((_) => {
-    loadingTable.value = false
-  })
+  getDictByCode('managerState')
+    .then((response) => {
+      if (response.code === 200) {
+        console.log(response.data, 'response') // 状态
+        managerStateList.value = response.data
+        // searchQuery.approvalStatus = active.value
+        // 根据闲置，封存，启封等状态获取不同的列表
+        getStatusList(searchQuery).then((res) => {
+          if (res.code === 200) {
+            list.value = res.data.rows.map((item: TableRow) => {
+              return {
+                ...item,
+                approvalStatus: approvalStatusMap[item.approvalStatus],
+              }
+            })
+            total.value = res.data.total
+          }
+          loadingTable.value = false
+        })
+      }
+    })
+    .catch((_) => {
+      loadingTable.value = false
+    })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -158,6 +214,7 @@
     name: 'stateManageDetail',
     params: {
       type: 'edit',
+      id: row.id,
     },
     query: {
       title: '编辑',
@@ -168,39 +225,74 @@
 }
 // 删除
 const remove = (row: TableRow) => {
-  ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
+  const { id } = row
+  ElMessageBox.confirm(`确认删除${row.equipmentName}吗？`, '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    deleteStatus({ id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 同意
 const agree = (row: TableRow) => {
-  approvalDialog.value.initDialog('agree', row.taskId)
+  approvalDialog.value.initDialog('agree', row.processId)
 }
 // 驳回
 const reject = (row: TableRow) => {
-  approvalDialog.value.initDialog('reject', row.taskId)
+  approvalDialog.value.initDialog('reject', row.processId)
 }
 // 拒绝
 const refuse = (row: TableRow) => {
-  approvalDialog.value.initDialog('refuse', row.taskId)
+  approvalDialog.value.initDialog('refuse', row.processId)
 }
 // 取消
-const cancel = (rowrow: TableRow) => {
-  ElMessageBox.confirm(
-    '确认取消吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
+const cancel = (row: TableRow) => {
+  const { processId } = row
+  ElMessageBox.confirm('确认取消吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    cancelStatus({ processInstanceId: processId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+
+// 提交
+const submit = (row: TableRow) => {
+  // 流程id为空
+  const { id } = row
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitStatus({ id, formId: searchQuery.formId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 搜索
 const search = () => {
@@ -208,16 +300,13 @@
 }
 // 重置
 const reset = () => {
+  clearSearch()
   getList()
 }
 // 模板下载
-const templateDownload = () => {
-
-}
+const templateDownload = () => {}
 // 标签识别
-const identify = () => {
-
-}
+const identify = () => {}
 // 新增
 const add = () => {
   $router.push({
@@ -251,7 +340,9 @@
     printJSON(list.value, properties, props.name)
   }
   else if (selectIds.length > 0) {
-    const printList = list.value.filter((item: TableRow) => selectIds.includes(item.id))
+    const printList = list.value.filter((item: TableRow) =>
+      selectIds.includes(item.id),
+    )
     printJSON(printList, properties, props.name)
   }
   else {
@@ -260,11 +351,37 @@
 }
 // 导出
 const exportExcelBtn = () => {
+  // const params: supplierExportQuery = {
+  //   approvalStatus: listQuery.value.approvalStatus,
+  //   businessContent: listQuery.value.businessContent,
+  //   companyArea: listQuery.value.companyArea,
+  //   companyCity: listQuery.value.companyCity,
+  //   companyProvince: listQuery.value.companyProvince,
+  //   formId: listQuery.value.formId,
+  //   supplierName: listQuery.value.supplierName,
+  //   supplierNo: listQuery.value.supplierNo,
+  // }
+  // if (checkoutList.value.length > 0) {
+  //   params.ids = checkoutList.value
+  // }
+  const postData = {
+    applyType: searchQuery.applyType,
+    approvalStatus: searchQuery.approvalStatus,
+    createUser: searchQuery.createUser,
+    ids: [] as number[],
+  }
+  postData.ids = selectList.value.map((item) => {
+    return item.id
+  })
+  exportStatus(postData).then((res) => {
+
+  })
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  loading.close()
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -284,18 +401,22 @@
   getList()
   dialogVisible.value = false
 }
-watch(() => props.type, (newValue) => {
-  if (newValue === '0') {
-    searchQuery.approvalStatus = ''
-  }
-  else {
-    searchQuery.approvalStatus = newValue
-  }
-  getList()
-}, {
-  immediate: true,
-  deep: true,
-})
+watch(
+  () => props.type,
+  (newValue) => {
+    if (newValue === '0') {
+      searchQuery.approvalStatus = ''
+    }
+    else {
+      searchQuery.approvalStatus = newValue
+    }
+    getList()
+  },
+  {
+    immediate: true,
+    deep: true,
+  },
+)
 </script>
 
 <template>
@@ -307,68 +428,197 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input
+            v-model="searchQuery.applyNo"
+            placeholder="申请编号"
+            clearable
+            class="w-50 m-2"
+          />
         </search-item>
         <search-item>
-          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input
+            v-model="searchQuery.equipmentNo"
+            placeholder="设备编号"
+            clearable
+            class="w-50 m-2"
+          />
         </search-item>
         <search-item>
-          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input
+            v-model="searchQuery.equipmentName"
+            placeholder="设备名称"
+            clearable
+            class="w-50 m-2"
+          />
         </search-item>
         <search-item>
-          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input
+            v-model="searchQuery.applyUnit"
+            placeholder="申请单位"
+            clearable
+            class="w-50 m-2"
+          />
         </search-item>
         <search-item>
-          <el-select placeholder="申请状态" clearable />
+          <el-select
+            v-model="searchQuery.applyStatus"
+            placeholder="申请状态"
+            clearable
+          >
+            <el-option
+              v-for="manager of managerStateList"
+              :key="manager.id"
+              :label="manager.name"
+              :value="manager.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <input
+            v-show="searchQuery.limit === 0"
+            ref="fileRef"
+            type="file"
+            multiple
+            @change="onFileChange"
+          >
           <icon-button icon="icon-add" title="新建" @click="add" />
-          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button
+            icon="icon-export"
+            title="导出"
+            @click="exportExcelBtn"
+          />
           <icon-button icon="icon-print" title="打印" @click="printList" />
         </template>
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns"
+          :data="list"
+          :total="total"
+          :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           :is-multi="true"
-          @change="changePage" @multi-select="multiSelect"
+          @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
               <template #default="scope">
-                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+                {{
+                  (searchQuery.offset - 1) * searchQuery.limit
+                    + scope.$index
+                    + 1
+                }}
               </template>
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="230" fixed="right">
+            <el-table-column
+              label="操作"
+              align="center"
+              width="230"
+              fixed="right"
+            >
               <template #default="{ row }">
-                <!-- <el-button size="small" type="primary" link @click="update(row)">
-                  编辑
-                </el-button> -->
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="detail(row)"
+                >
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="agree(row)">
+                <el-button
+                  v-if="
+                    props.type !== '0' && props.type !== '3'
+                      && props.type !== '6' && props.type !== '2'
+                  "
+                  size="small"
+                  type="primary"
+                  link
+                  @click="update(row)"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="
+                    props.type !== '0' && props.type !== '3'
+                      && props.type !== '6' && props.type !== '2'
+                  "
+                  size="small"
+                  type="primary"
+                  link
+                  @click="submit(row)"
+                >
+                  提交
+                </el-button>
+                <el-button
+                  v-if="(props.type === '0' || props.type === '2')"
+                  size="small"
+                  type="primary"
+                  link
+                  :disabled="
+                    row.approvalStatus !== '待审批'
+                      && row.approvalStatus !== '审批中'
+                  "
+                  @click="agree(row)"
+                >
                   同意
                 </el-button>
-                <el-button size="small" type="primary" link @click="reject(row)">
+                <el-button
+                  v-if="(props.type === '0' || props.type === '2')"
+                  size="small"
+                  type="primary"
+                  link
+                  :disabled="
+                    row.approvalStatus !== '待审批'
+                      && row.approvalStatus !== '审批中'
+                  "
+                  @click="reject(row)"
+                >
                   驳回
                 </el-button>
-                <el-button size="small" type="primary" link @click="refuse(row)">
+                <el-button
+                  v-if="(props.type === '0' || props.type === '2')"
+                  size="small"
+                  type="danger"
+                  link
+                  :disabled="
+                    row.approvalStatus !== '待审批'
+                      && row.approvalStatus !== '审批中'
+                  "
+                  @click="refuse(row)"
+                >
                   拒绝
                 </el-button>
-                <el-button size="small" type="primary" link @click="cancel(row)">
+                <el-button
+                  v-if="
+                    props.type !== '1'
+                      && props.type !== '2'
+                  "
+                  size="small"
+                  type="text"
+                  link
+                  :disabled="row.approvalStatus !== '审批中'"
+                  @click="cancel(row)"
+                >
                   取消
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button
+                  v-if="
+                    props.type !== '4'
+                      && props.type !== '5'
+                  "
+                  :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                  size="small"
+                  type="danger"
+                  link
+                  @click="remove(row)"
+                >
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 27faff8..531fe0d 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -80,7 +80,7 @@
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
-    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    // ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
   else if (row.title === '详情') {
     ruleForm.createUserId = row.createUserId
@@ -107,10 +107,8 @@
   ruleForm.minioFileName = ''
   ruleForm.publishTime = ''
   ruleForm.remark = ''
-  ruleForm.publishTime = ''
   ruleForm.effectiveTime = ''
   ruleForm.effectiveStatus = ''
-  ruleForm.publishTime = ''
   ruleForm.createUserId = ''
   effectiveStatusName.value = ''
 }
@@ -128,9 +126,9 @@
       type: 'warning',
     },
       ).then((res) => {
-        if (flag == '提交') {
+        if (flag === '提交') {
           confirmDrafts(ruleForm).then((res) => {
-            if (res.code == 200) {
+            if (res.code === 200) {
               console.log(res.data, '保存成功')
               submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
                 formEl?.resetFields()
@@ -199,7 +197,7 @@
       effectiveStatusName.value = '在使用'
       ruleForm.effectiveStatus = '1'
     }
-    else if (diffDat == 0) {
+    else if (diffDat === 0) {
     // ruleForm.effectiveStatusName = '在使用'
       effectiveStatusName.value = '在使用'
       ruleForm.effectiveStatus = '1'
diff --git a/src/views/measure/file/components/approve/addDialog.vue b/src/views/measure/file/components/approve/addDialog.vue
index f7f9b42..6e66400 100644
--- a/src/views/measure/file/components/approve/addDialog.vue
+++ b/src/views/measure/file/components/approve/addDialog.vue
@@ -4,16 +4,18 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../../file-interface'
+import type { TableRow } from './approve-interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
 import { toTreeList } from '@/utils/structure'
 import { printHtml } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi, confirmDrafts, submitFile } from '@/api/measure/file'
+import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -75,7 +77,6 @@
   fileList.value = []
   formDataRow.value = row
   getuser()
-  getuser()
   getPubList()
   if (row.title === '新建') {
     // 默认发布人和发布单位
@@ -83,9 +84,10 @@
     ruleForm.publisher = userInfo.$state.deptId
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '详情') {
+  else if (row.title === '详情' || row.title === '编辑') {
     ruleForm.createUserId = row.createUserId
     ruleForm.fileNo = row.fileNo
+    ruleForm.id = row.id
     ruleForm.fileName = row.fileName
     ruleForm.fileCode = row.fileCode
     fileTypeName.value = row.fileTypeName
@@ -127,25 +129,37 @@
       type: 'warning',
     },
   ).then((res) => {
-    console.log('提交')
+    if (approvalStatusName.value !== '草稿箱') {
+      confirmDrafts(ruleForm).then((res) => {
+        if (res.code === 200) {
+          console.log(res.data, '保存成功')
+          submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
+            ElMessage.success('提交成功')
+            $router.go(-1)
+            close()
+          })
+        }
+      })
+    }
+    else {
+      // 保存（草稿箱）
+      updateDrafts(ruleForm).then((res) => {
+        ElMessage.success('保存成功')
+        $router.go(-1)
+        close()
+      })
+    }
   })
 }
 // 编辑
-const update = (row) => {
-  // $router.push({
-  //   name: 'approveDetail',
-  //   query: {
-  //     ...row,
-  //     title: '编辑',
-  //   },
-  // })
+const update = (row: TableRow) => {
   initDialog({
     ...row,
     title: '编辑',
   })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: TableRow) => {
   ElMessageBox.confirm(
     '确认删除吗？',
     '提示',
@@ -156,7 +170,28 @@
     },
   )
     .then(() => {
-      console.log('确认删除')
+      if (row.approvalStatusName === '待审批') {
+        approvalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            $router.go(-1)
+          }
+        })
+      }
+      else {
+        deleteApi({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            $router.go(-1)
+          }
+        })
+      }
     })
 }
 // 取消
@@ -172,8 +207,8 @@
 }
 const approvalDialog = ref()
 // 审批操作
-const approval = (type: string, taskId: string) => {
-  approvalDialog.value.initDialog(type, taskId)
+const approval = (type: string, processId: string) => {
+  approvalDialog.value.initDialog(type, processId)
 }
 // 打印
 const print = () => {
@@ -217,7 +252,7 @@
       effectiveStatusName.value = '在使用'
       ruleForm.effectiveStatus = '1'
     }
-    else if (diffDat == 0) {
+    else if (diffDat === 0) {
     // ruleForm.effectiveStatusName = '在使用'
       effectiveStatusName.value = '在使用'
       ruleForm.effectiveStatus = '1'
@@ -236,12 +271,12 @@
     <detail-page :title="`文件审批-${title}`">
       <template #btns>
         <div v-if="approvalStatusName === '草稿箱' || approvalStatusName === '已取消'">
-          <el-button type="primary" @click="submitForm">
-            提交
-          </el-button>
           <el-button v-if="title !== '编辑'" type="primary" @click="update(formDataRow)">
             编辑
           </el-button>
+          <el-button v-else type="primary" @click="submitForm">
+            {{ approvalStatusName === '草稿箱' ? '保存' : '提交' }}
+          </el-button>
           <el-button type="primary" @click="remove(formDataRow)">
             删除
           </el-button>
@@ -249,7 +284,7 @@
             关闭
           </el-button>
         </div>
-        <div v-if="approvalStatusName === '待审批' || approvalStatusName === '审批中'">
+        <div v-if="approvalStatusName === '待审批'">
           <el-button type="primary" @click="approval('agree', formDataRow.taskId)">
             同意
           </el-button>
diff --git a/src/views/measure/file/components/approve/approve-interface.ts b/src/views/measure/file/components/approve/approve-interface.ts
new file mode 100644
index 0000000..7a1b06d
--- /dev/null
+++ b/src/views/measure/file/components/approve/approve-interface.ts
@@ -0,0 +1,20 @@
+// 计量文件表格行
+export interface TableRow {
+  createUser: string
+  effectiveStatus: string
+  effectiveStatusName: string
+  approvalStatusName: string
+  effectiveTime: string
+  fileCode: string
+  fileName: string
+  fileNo: string
+  fileType: string
+  fileTypeName: string
+  id: string
+  taskId: string
+  minioFileName: string
+  processId: string
+  publishTime: string
+  publisher: string
+  remark: string
+}
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 9b5c151..912b24f 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -1,9 +1,10 @@
 <!-- 文件审批公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { TableRow } from './approve-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { printJSON } from '@/utils/printUtils'
-import { approvallistPageApi, approvallistPageDetailApi } from '@/api/measure/file'
+import { approvalCancel, approvalDelete, approvallistPageApi, approvallistPageDetailApi, deleteApi, exportFileApi, submitFile } from '@/api/measure/file'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
@@ -16,11 +17,22 @@
 })
 const $router = useRouter()
 const approvalStatus = ref('0')
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  全部: '0',
+  草稿箱: '1',
+  待审批: '2',
+  审批中: '3',
+  已通过: '4',
+  未通过: '5',
+  已取消: '6',
+}
 watch(() => props.name, (_) => {
+  approvalStatus.value = approvalStatusReserveMap[props.name]
   //  获取当前状态
-  getDictByCode('approvalStatus').then((res) => {
-    approvalStatus.value = res.data.filter((item: fileResType) => item.name === props.name)[0].value || '0'
-  })
+  // getDictByCode('approvalStatus').then((res) => {
+  //   approvalStatus.value = res.data.filter((item: fileResType) => item.name === props.name)[0].value || '0'
+  // })
 },
 {
   deep: true,
@@ -37,7 +49,7 @@
   offset: 1,
   fileType: '', // 文件类别
   formId: SCHEDULE.FILE_APPROVAL,
-  ids: [],
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -53,52 +65,16 @@
 const list = ref([]) // 表格数据
 // 获取数据列表
 const getList = () => {
-  // loadingTable.value = true
-  // approvallistPageApi(searchQuery).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  //   loadingTable.value = false
-  // }).catch((_) => {
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      approvalStatus: '1',
-      approvalStatusName: '草稿箱',
-      createUser: '张三',
-      fileName: 'test',
-      fileNo: '1234',
-      fileCode: '1234',
-      fileTypeName: '计量文件1',
-      createTime: '2022-12-12 00:00:00',
-      create: '张三3',
-    },
-    {
-      approvalStatus: '3',
-      approvalStatusName: '审批中',
-      createUser: '张三',
-      fileName: 'test',
-      fileNo: '1234',
-      fileCode: '1234',
-      fileTypeName: '计量文件2',
-      createTime: '2022-12-12 00:00:00',
-      create: '张三2',
-    },
-    {
-      approvalStatus: '5',
-      approvalStatusName: '未通过',
-      createUser: '张三',
-      fileName: 'test',
-      fileNo: '1234',
-      fileCode: '1234',
-      fileTypeName: '计量文件3',
-      createTime: '2022-12-12 00:00:00',
-      create: '张三1',
-    },
-  ] as any
-  total.value = 1
+  loadingTable.value = true
+  approvallistPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
 }
 const fileTypeList = ref<fileResType[]>([])
 // 获取文件类别
@@ -118,7 +94,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: TableRow) => {
   $router.push({
     name: 'approveDetail',
     query: {
@@ -127,8 +103,18 @@
     },
   })
 }
+
+const edit = (row: TableRow) => {
+  $router.push({
+    name: 'approveDetail',
+    query: {
+      title: '编辑',
+      ...row,
+    },
+  })
+}
 // 删除
-const remove = (row) => {
+const remove = (row: TableRow) => {
   ElMessageBox.confirm(
     `确认删除${row.fileName}吗？`,
     '提示',
@@ -139,11 +125,33 @@
     },
   )
     .then(() => {
-      console.log('确认删除')
+      if (row.approvalStatusName == '待审批') {
+        approvalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            getList()
+          }
+        })
+      }
+      else {
+        deleteApi({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            getList()
+          }
+        })
+      }
     })
 }
 // 取消
-const cancel = (row) => {
+const cancel = (row: TableRow) => {
+  const { processId } = row
   ElMessageBox.confirm(
     `确认取消${row.fileName}吗？`,
     '提示',
@@ -154,7 +162,40 @@
     },
   )
     .then(() => {
-      console.log('确认取消')
+      approvalCancel({ processInstanceId: processId }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+
+// 提交
+const submit = (row: TableRow) => {
+  const { id } = row
+  ElMessageBox.confirm(
+    `确认提交${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitFile({ id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '提交成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -167,8 +208,8 @@
 }
 const approvalDialog = ref()
 // 审批操作
-const approval = (type: string, taskId: string) => {
-  approvalDialog.value.initDialog(type, taskId)
+const approval = (type: string, processId: string) => {
+  approvalDialog.value.initDialog(type, processId)
 }
 // 重置
 const reset = () => {
@@ -178,9 +219,9 @@
   getList()
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<TableRow[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
 // 导出
@@ -190,6 +231,7 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  searchQuery.ids = []
   if (selectList.value.length) {
     selectList.value.forEach((item) => {
       searchQuery.ids?.push(item.id as string)
@@ -225,7 +267,7 @@
 }
 // 是否审批中或者待审批
 const isApproval = computed(() => {
-  return (row) => {
+  return (row: TableRow) => {
     if (row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批') {
       return true
     }
@@ -236,7 +278,7 @@
 })
 // 是否已通过或者未通过
 const isPass = computed(() => {
-  return (row) => {
+  return (row: TableRow) => {
     if (row.approvalStatusName === '已通过' || row.approvalStatusName === '未通过') {
       return true
     }
@@ -305,7 +347,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           :is-showmulti-select="true"
@@ -326,19 +368,27 @@
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link :disabled="!isApproval(row)" @click="approval('agree', row.taskId)">
-                  同意
+                <el-button v-if="['1', '6'].includes(approvalStatus)" size="small" type="primary" link @click="edit(row)">
+                  编辑
                 </el-button>
-                <el-button size="small" type="primary" link :disabled="!isApproval(row)" @click="approval('reject', row.taskId)">
-                  驳回
+                <el-button v-if="!['0', '2', '4', '5'].includes(approvalStatus)" size="small" type="primary" link @click="submit(row)">
+                  提交
                 </el-button>
-                <el-button size="small" type="primary" link :disabled="!isApproval(row)" @click="approval('refuse', row.taskId)">
-                  拒绝
-                </el-button>
-                <el-button size="small" type="primary" link :disabled="!isApproval(row)" @click="cancel(row)">
+                <template v-if="!['1', '3', '4', '5', '6'].includes(approvalStatus)">
+                  <el-button size="small" type="primary" link :disabled="!isApproval(row)" @click="approval('agree', row.taskId)">
+                    同意
+                  </el-button>
+                  <el-button size="small" type="primary" link :disabled="!isApproval(row)" @click="approval('reject', row.taskId)">
+                    驳回
+                  </el-button>
+                  <el-button size="small" type="primary" link :disabled="!isApproval(row)" @click="approval('refuse', row.taskId)">
+                    拒绝
+                  </el-button>
+                </template>
+                <el-button v-if="!['1', '2', '4', '5', '6'].includes(approvalStatus)" size="small" type="primary" link :disabled="!isApproval(row)" @click="cancel(row)">
                   取消
                 </el-button>
-                <el-button size="small" type="danger" :disabled="isPass(row)" link @click="remove(row)">
+                <el-button v-if="!['4', '5'].includes(approvalStatus)" size="small" type="danger" :disabled="isPass(row)" link @click="remove(row)">
                   删除
                 </el-button>
               </template>