diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 17c5b36..85334a4 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -58,3 +58,12 @@
     data,
   })
 }
+
+// 状态管理导出
+export function exportStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/exportStateManageList',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 17c5b36..85334a4 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -58,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/device/stateManage.ts b/src/api/device/stateManage.ts
index 17c5b36..85334a4 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -58,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/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index f751201..97d660a 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -24,6 +24,8 @@
   useDept: string // 使用部门
   usePerson: string // 使用人
   validDate: string // 有效日期
+  approvalStatusName: string
+  applyName: string
   edit?: boolean
   equipmentName?: string
   id?: string

diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 17c5b36..85334a4 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -58,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/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index f751201..97d660a 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -24,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/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 1c13501..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" apply-type="2" />
+    <component :is="currentComp" :name="current" :type="type" apply-type="1" />
   </div>
 </template>
 

diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 17c5b36..85334a4 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -58,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/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index f751201..97d660a 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -24,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/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 1c13501..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" apply-type="2" />
+    <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 1e8075c..b863728 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,6 +1,7 @@
 <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'
@@ -8,7 +9,6 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import { SCHEDULE } from '@/utils/scheduleDict'
-
 const props = defineProps({
   type: {
     type: String,
@@ -19,6 +19,7 @@
     required: true,
   },
 })
+const approvalDialog = ref() // 审批对话框显隐
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
@@ -35,7 +36,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
-  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -175,7 +176,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: borrowDeviceType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -191,7 +192,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: borrowDeviceType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -205,7 +206,7 @@
   })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: borrowDeviceType) => {
   ElMessageBox.confirm(
     `确认删除${row.applyName}吗？`,
     '提示',
@@ -255,9 +256,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<borrowDeviceType[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: borrowDeviceType[]) => {
   selectList.value = row
 }
 // 导出
@@ -267,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()
@@ -300,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(
@@ -384,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>
@@ -433,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"
@@ -455,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/device/stateManage.ts b/src/api/device/stateManage.ts
index 17c5b36..85334a4 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -58,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/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index f751201..97d660a 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -24,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/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 1c13501..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" apply-type="2" />
+    <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 1e8075c..b863728 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,6 +1,7 @@
 <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'
@@ -8,7 +9,6 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import { SCHEDULE } from '@/utils/scheduleDict'
-
 const props = defineProps({
   type: {
     type: String,
@@ -19,6 +19,7 @@
     required: true,
   },
 })
+const approvalDialog = ref() // 审批对话框显隐
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
@@ -35,7 +36,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
-  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -175,7 +176,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: borrowDeviceType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -191,7 +192,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: borrowDeviceType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -205,7 +206,7 @@
   })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: borrowDeviceType) => {
   ElMessageBox.confirm(
     `确认删除${row.applyName}吗？`,
     '提示',
@@ -255,9 +256,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<borrowDeviceType[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: borrowDeviceType[]) => {
   selectList.value = row
 }
 // 导出
@@ -267,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()
@@ -300,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(
@@ -384,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>
@@ -433,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"
@@ -455,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/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index a2ff30f..5a4aad6 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -6,6 +6,7 @@
 import {
   cancelStatus,
   deleteStatus,
+  exportStatus,
   getStatusList,
   submitStatus,
 } from '@/api/device/stateManage'
@@ -79,7 +80,6 @@
   applyType: props.applyType, // 申请类型
   formId: SCHEDULE[formIdList.value[props.name]],
 }) // 查询参数
-
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
@@ -244,19 +244,18 @@
 }
 // 同意
 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 = (row: TableRow) => {
-  // 流程id为空
   const { processId } = row
   ElMessageBox.confirm('确认取消吗？', '提示', {
     confirmButtonText: '确认',
@@ -352,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) => {

diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 17c5b36..85334a4 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -58,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/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index f751201..97d660a 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -24,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/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 1c13501..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" apply-type="2" />
+    <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 1e8075c..b863728 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,6 +1,7 @@
 <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'
@@ -8,7 +9,6 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import { SCHEDULE } from '@/utils/scheduleDict'
-
 const props = defineProps({
   type: {
     type: String,
@@ -19,6 +19,7 @@
     required: true,
   },
 })
+const approvalDialog = ref() // 审批对话框显隐
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
@@ -35,7 +36,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
-  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -175,7 +176,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: borrowDeviceType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -191,7 +192,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: borrowDeviceType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -205,7 +206,7 @@
   })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: borrowDeviceType) => {
   ElMessageBox.confirm(
     `确认删除${row.applyName}吗？`,
     '提示',
@@ -255,9 +256,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<borrowDeviceType[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: borrowDeviceType[]) => {
   selectList.value = row
 }
 // 导出
@@ -267,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()
@@ -300,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(
@@ -384,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>
@@ -433,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"
@@ -455,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/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index a2ff30f..5a4aad6 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -6,6 +6,7 @@
 import {
   cancelStatus,
   deleteStatus,
+  exportStatus,
   getStatusList,
   submitStatus,
 } from '@/api/device/stateManage'
@@ -79,7 +80,6 @@
   applyType: props.applyType, // 申请类型
   formId: SCHEDULE[formIdList.value[props.name]],
 }) // 查询参数
-
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
@@ -244,19 +244,18 @@
 }
 // 同意
 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 = (row: TableRow) => {
-  // 流程id为空
   const { processId } = row
   ElMessageBox.confirm('确认取消吗？', '提示', {
     confirmButtonText: '确认',
@@ -352,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) => {
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/device/stateManage.ts b/src/api/device/stateManage.ts
index 17c5b36..85334a4 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -58,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/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index f751201..97d660a 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -24,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/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 1c13501..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" apply-type="2" />
+    <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 1e8075c..b863728 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,6 +1,7 @@
 <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'
@@ -8,7 +9,6 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import { SCHEDULE } from '@/utils/scheduleDict'
-
 const props = defineProps({
   type: {
     type: String,
@@ -19,6 +19,7 @@
     required: true,
   },
 })
+const approvalDialog = ref() // 审批对话框显隐
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
@@ -35,7 +36,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
-  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -175,7 +176,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: borrowDeviceType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -191,7 +192,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: borrowDeviceType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -205,7 +206,7 @@
   })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: borrowDeviceType) => {
   ElMessageBox.confirm(
     `确认删除${row.applyName}吗？`,
     '提示',
@@ -255,9 +256,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<borrowDeviceType[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: borrowDeviceType[]) => {
   selectList.value = row
 }
 // 导出
@@ -267,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()
@@ -300,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(
@@ -384,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>
@@ -433,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"
@@ -455,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/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index a2ff30f..5a4aad6 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -6,6 +6,7 @@
 import {
   cancelStatus,
   deleteStatus,
+  exportStatus,
   getStatusList,
   submitStatus,
 } from '@/api/device/stateManage'
@@ -79,7 +80,6 @@
   applyType: props.applyType, // 申请类型
   formId: SCHEDULE[formIdList.value[props.name]],
 }) // 查询参数
-
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
@@ -244,19 +244,18 @@
 }
 // 同意
 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 = (row: TableRow) => {
-  // 流程id为空
   const { processId } = row
   ElMessageBox.confirm('确认取消吗？', '提示', {
     confirmButtonText: '确认',
@@ -352,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) => {
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/device/stateManage.ts b/src/api/device/stateManage.ts
index 17c5b36..85334a4 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -58,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/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index f751201..97d660a 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -24,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/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 1c13501..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" apply-type="2" />
+    <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 1e8075c..b863728 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,6 +1,7 @@
 <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'
@@ -8,7 +9,6 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import { SCHEDULE } from '@/utils/scheduleDict'
-
 const props = defineProps({
   type: {
     type: String,
@@ -19,6 +19,7 @@
     required: true,
   },
 })
+const approvalDialog = ref() // 审批对话框显隐
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
@@ -35,7 +36,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
-  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -175,7 +176,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: borrowDeviceType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -191,7 +192,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: borrowDeviceType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -205,7 +206,7 @@
   })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: borrowDeviceType) => {
   ElMessageBox.confirm(
     `确认删除${row.applyName}吗？`,
     '提示',
@@ -255,9 +256,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<borrowDeviceType[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: borrowDeviceType[]) => {
   selectList.value = row
 }
 // 导出
@@ -267,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()
@@ -300,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(
@@ -384,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>
@@ -433,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"
@@ -455,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/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index a2ff30f..5a4aad6 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -6,6 +6,7 @@
 import {
   cancelStatus,
   deleteStatus,
+  exportStatus,
   getStatusList,
   submitStatus,
 } from '@/api/device/stateManage'
@@ -79,7 +80,6 @@
   applyType: props.applyType, // 申请类型
   formId: SCHEDULE[formIdList.value[props.name]],
 }) // 查询参数
-
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
@@ -244,19 +244,18 @@
 }
 // 同意
 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 = (row: TableRow) => {
-  // 流程id为空
   const { processId } = row
   ElMessageBox.confirm('确认取消吗？', '提示', {
     confirmButtonText: '确认',
@@ -352,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) => {
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/device/stateManage.ts b/src/api/device/stateManage.ts
index 17c5b36..85334a4 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -58,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/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index f751201..97d660a 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -24,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/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 1c13501..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" apply-type="2" />
+    <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 1e8075c..b863728 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,6 +1,7 @@
 <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'
@@ -8,7 +9,6 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import { SCHEDULE } from '@/utils/scheduleDict'
-
 const props = defineProps({
   type: {
     type: String,
@@ -19,6 +19,7 @@
     required: true,
   },
 })
+const approvalDialog = ref() // 审批对话框显隐
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
@@ -35,7 +36,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
-  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -175,7 +176,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: borrowDeviceType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -191,7 +192,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: borrowDeviceType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -205,7 +206,7 @@
   })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: borrowDeviceType) => {
   ElMessageBox.confirm(
     `确认删除${row.applyName}吗？`,
     '提示',
@@ -255,9 +256,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<borrowDeviceType[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: borrowDeviceType[]) => {
   selectList.value = row
 }
 // 导出
@@ -267,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()
@@ -300,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(
@@ -384,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>
@@ -433,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"
@@ -455,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/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index a2ff30f..5a4aad6 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -6,6 +6,7 @@
 import {
   cancelStatus,
   deleteStatus,
+  exportStatus,
   getStatusList,
   submitStatus,
 } from '@/api/device/stateManage'
@@ -79,7 +80,6 @@
   applyType: props.applyType, // 申请类型
   formId: SCHEDULE[formIdList.value[props.name]],
 }) // 查询参数
-
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
@@ -244,19 +244,18 @@
 }
 // 同意
 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 = (row: TableRow) => {
-  // 流程id为空
   const { processId } = row
   ElMessageBox.confirm('确认取消吗？', '提示', {
     confirmButtonText: '确认',
@@ -352,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) => {
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 fd22bcd..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) // 数据总条数
@@ -63,42 +75,6 @@
   }).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
 }
 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>