diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index f785f0f..eaee931 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -28,6 +28,15 @@
   })
 }
 
+// 状态管理编辑驳回
+export function updateRejectStatus(data: Object) {
+  return request({
+    url: '/meter/stateManage/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: { id: string | number }) {
   return request({

diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index f785f0f..eaee931 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -28,6 +28,15 @@
   })
 }
 
+// 状态管理编辑驳回
+export function updateRejectStatus(data: Object) {
+  return request({
+    url: '/meter/stateManage/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: { id: string | number }) {
   return request({
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 047d441..85dc752 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -159,3 +159,19 @@
 .el-button--danger.is-link:focus {
   color: #f56c6c !important;
 }
+
+/* 上传文件删除 */
+.photo-close {
+  z-index: 10;
+  position: absolute;
+  top: -10px;
+  right: -10px;
+  width: 20px;
+  height: 20px;
+  text-align: center;
+  line-height: 20px;
+  border-radius: 50%;
+  background: rgb(0 0 0 / 30%);
+  color: #fff;
+  cursor: pointer;
+}

diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index f785f0f..eaee931 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -28,6 +28,15 @@
   })
 }
 
+// 状态管理编辑驳回
+export function updateRejectStatus(data: Object) {
+  return request({
+    url: '/meter/stateManage/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: { id: string | number }) {
   return request({
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 047d441..85dc752 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -159,3 +159,19 @@
 .el-button--danger.is-link:focus {
   color: #f56c6c !important;
 }
+
+/* 上传文件删除 */
+.photo-close {
+  z-index: 10;
+  position: absolute;
+  top: -10px;
+  right: -10px;
+  width: 20px;
+  height: 20px;
+  text-align: center;
+  line-height: 20px;
+  border-radius: 50%;
+  background: rgb(0 0 0 / 30%);
+  color: #fff;
+  cursor: pointer;
+}
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index dc21ae0..42d0040 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -15,15 +15,16 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { addApply, deleteApply, detailApply, editApply, failUpdate, submitApply } from '@/api/device/borrow'
-import { addStatus, detailStatus, updateStatus } from '@/api/device/stateManage'
+import { addStatus, detailStatus, submitStatus, updateRejectStatus, updateStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow'
 import useUserStore from '@/store/modules/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { cancelApproval, fetchApproval } from '@/api/approval'
 
+const $route = useRoute()
 const userInfo = useUserStore()
 const $router = useRouter()
-const $route = useRoute()
 const ruleFormRef1 = ref() // from组件
 const ruleFormRef2 = ref() // from组件
 const title = ref('')
@@ -33,6 +34,8 @@
 const selectIndex = ref() // 点击选择的index--点击第几行
 const borrowList = ref<IdeviceList[]>([])
 const processId = ref('')
+const _approvalStatusName = $route.query.approvalStatusName
+const _title = $route.query.title
 // 状态管理
 const ruleForm1 = ref({
   applyType: $route.query.applyType, // 申请类型
@@ -183,11 +186,12 @@
     return false
   }
 })
+
 // 弹窗初始化
 const initDialog = (row: any) => {
-  fetchData()
   title.value = row.title
   name.value = row.name
+  fetchData()
   // 设备借用
   if (isDevice.value) {
     if (title.value !== '新建') {
@@ -195,6 +199,9 @@
       detailApply({ id: row.id }).then((res) => {
         processId.value = res.data.processId // 流程id存在的时候赋值
         ruleForm2.value = res.data
+        if (res.data.approvalStatusName !== '草稿箱') {
+          getApprovalRecord(res.data.processId) // 查询审批记录
+        }
         borrowList.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
           return {
             ...item,
@@ -214,11 +221,29 @@
         ruleForm1.value.equipmentNo = res.data.applyNo
         ruleForm1.value.equipmentName = res.data.equipmentName
         ruleForm1.value.time = res.data.time
+        if (res.data.approvalStatusName !== '草稿箱') {
+          getApprovalRecord(res.data.processId) // 查询审批记录
+        }
       })
     }
   }
 }
-onMounted(() => {
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (title.value !== '新建') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+
+onMounted(async () => {
   initDialog($route.query)
 })
 
@@ -228,7 +253,7 @@
 }
 
 // 保存
-const saveForm = async (formEl: FormInstance | undefined) => {
+const deviceManageSave = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -272,7 +297,7 @@
 }
 
 // 提交
-const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+const deviceManageSubmit = async (formEl2: FormInstance | undefined) => {
   if (isDevice.value) {
     //  设备借用
     if (!formEl2) { return }
@@ -334,52 +359,108 @@
       ElMessage.info('请先保存再提交！')
     }
   }
-  else {
-  // 状态管理
-    if (!formEl1) { return }
-    await formEl1.validate((valid, fields) => {
-      if (valid) {
-        console.log(ruleForm1.value.equipmentList)
-        ElMessageBox.confirm(
-          '确认提交吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then((res) => {
-          if (title.value == '编辑') {
-            if (ruleForm1.value.equipmentList && ruleForm1.value.equipmentList[0]) {
-              ruleForm1.value.equipmentId = ruleForm1.value.equipmentList[0].equipmentId
-              // delete ruleForm1.value.equipmentList
-            }
-            updateStatus(ruleForm1.value).then((res) => {
-              if (res.code === 200) {
-                ElMessage.success('操作成功!')
-                $router.go(-1)
-              }
-              else {
-                ElMessage.warning(res.message)
-              }
-            })
-          }
-          else {
-            addStatus(ruleForm1.value).then((res) => {
-              if (res.code === 200) {
-                ElMessage.success('操作成功!')
-                $router.go(-1)
-              }
-              else {
-                ElMessage.warning(res.message)
-              }
-            })
-          }
-        })
+}
+
+// 状态管理编辑
+const statusManageEdit = () => {
+  if (title.value == '编辑') {
+    if (ruleForm1.value.equipmentList && ruleForm1.value.equipmentList[0]) {
+      ruleForm1.value.equipmentId = ruleForm1.value.equipmentList[0].equipmentId
+      // delete ruleForm1.value.equipmentList
+    }
+    updateStatus(ruleForm1.value).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('操作成功!')
+        $router.go(-1)
+      }
+      else {
+        ElMessage.warning(res.message)
       }
     })
   }
 }
+
+// 驳回编辑
+const statusManageRejectEdit = () => {
+  if (title.value == '编辑') {
+    if (ruleForm1.value.equipmentList && ruleForm1.value.equipmentList[0]) {
+      ruleForm1.value.equipmentId = ruleForm1.value.equipmentList[0].equipmentId
+      // delete ruleForm1.value.equipmentList
+    }
+    updateRejectStatus(ruleForm1.value).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('操作成功!')
+        $router.go(-1)
+      }
+      else {
+        ElMessage.warning(res.message)
+      }
+    })
+  }
+}
+// 新建 状态管理保存
+const statusManageSave = async (formEl1: FormInstance | undefined) => {
+  if (!formEl1) { return }
+  await formEl1.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        addStatus(ruleForm1.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('操作成功!')
+            ruleForm1.value.id = res.data
+          }
+          else {
+            ElMessage.warning(res.message)
+          }
+        })
+      })
+    }
+  })
+}
+
+// 新建 状态管理提交
+const statusManageSubmit = async (formEl1: FormInstance | undefined) => {
+  if (ruleForm1.value.id === '') {
+    ElMessage.warning('请保存之后再提交!')
+    return
+  }
+  if (!formEl1) { return }
+  await formEl1.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        submitStatus({
+          formId: $route.query.formId as string,
+          id: ruleForm1.value.id,
+          processId: '',
+        }).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('操作成功!')
+            $router.go(-1)
+          }
+          else {
+            ElMessage.warning(res.message)
+          }
+        })
+      })
+    }
+  })
+}
 // 取消
 const resetForm = () => {
   close()
@@ -435,22 +516,26 @@
 const onFileChange = (event: any) => {
   // 原生上传
   // console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
+  const files = event.target.files
+  if (files.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
     UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        console.log(res.data[0])
-        // 重置当前验证
-        ruleForm1.value.fileList = []
-        ruleForm1.value.fileList.push({
-          assetId: '',
-          fileName: res.data[0],
-          minioFileName: res.data[0],
+      console.log(res)
+      if (res.code === 200 && res.data.length >= 1) {
+        for (const item of res.data) {
+          ruleForm1.value.fileList.push({
+            assetId: '',
+            fileName: item,
+            minioFileName: item,
           // id: '',
-        })
+          })
+        }
         ruleFormRef1.value?.clearValidate('minioFileName')
+        // 重置当前验证
         ElMessage.success('文件上传成功')
       }
       else {
@@ -459,6 +544,10 @@
     })
   }
 }
+
+const del = (index: any) => {
+  ruleForm1.value.fileList.splice(index, 1)
+}
 const upload = () => {
   fileRef.value.click()
 }
@@ -664,27 +753,45 @@
     <approve-action ref="approveRef" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
-          提交
-        </el-button>
-        <el-button v-if="title !== '详情' && name.search('借用') !== -1" type="primary" @click="saveForm(ruleFormRef2)">
-          保存
-        </el-button>
-        <!-- <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
-          同意
-        </el-button>
-        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
-          驳回
-        </el-button>
-        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
-          拒绝
-        </el-button> -->
-        <!-- <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
-          提交
-        </el-button> -->
-        <!-- <el-button v-if="$route.query?.approvalStatus !== '草稿箱' && isCancel" type="primary" @click="editForm">
-          编辑
-        </el-button> -->
+        <!-- 设备借用 -->
+        <temalate v-if="name.search('借用') !== -1">
+          <el-button v-if="title !== '详情'" type="primary" @click="deviceManageSubmit(ruleFormRef2)">
+            提交
+          </el-button>
+          <el-button v-if="title !== '详情'" type="primary" @click="deviceManageSave(ruleFormRef2)">
+            保存
+          </el-button>
+        </temalate>
+        <!-- 状态管理 -->
+        <template v-else>
+          <template v-if="title !== '详情'">
+            <!-- 新建 -->
+            <el-button v-if="title === '新建'" type="primary" @click="statusManageSubmit(ruleFormRef1)">
+              提交
+            </el-button>
+            <el-button v-if="title === '新建'" type="primary" @click="statusManageSave(ruleFormRef1)">
+              保存
+            </el-button>
+            <!-- 草稿箱 + 已取消 -->
+            <el-button v-if="_approvalStatusName === '草稿箱' || _approvalStatusName === '已取消'" type="primary" @click="statusManageEdit">
+              保存
+            </el-button>
+            <!-- 未通过-驳回 -->
+            <el-button v-if="_approvalStatusName === '未通过-驳回'" type="primary" @click="statusManageRejectEdit">
+              保存
+            </el-button>
+            <!-- 待审批 -->
+            <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+              同意
+            </el-button>
+            <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
+              驳回
+            </el-button>
+            <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
+              拒绝
+            </el-button>
+          </template>
+        </template>
         <el-button v-if="(title === '详情' && $route.query?.approvalStatusName === '草稿箱' && isCancel)" type="primary" @click="editForm">
           编辑
         </el-button>
@@ -765,10 +872,14 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo :minio-file-name="ruleForm1.fileList[0]?.minioFileName || ''" />
-              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm1.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-                {{ ruleForm1.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              <div style="display: flex;">
+                <show-photo v-for="(item, index) in ruleForm1.fileList" :key="item" :index="index" :minio-file-name="item.minioFileName || ''" style="display: inline-block;margin: 10px;">
+                  <span v-if="title !== '详情'" class="photo-close" @click="del(index)">x</span>
+                </show-photo>
+              </div>
+              <input v-show="title === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
+                上传
               </el-button>
               <span v-if="title === '详情' && !ruleForm1.fileList[0]?.minioFileName">暂无</span>
             </el-form-item>
@@ -857,8 +968,9 @@
           </el-table-column>
         </el-table>
       </detail-block>
-      <detail-block v-if="title !== '新建'" title="审批流程">
-        <approval-record :process-id="processId" />
+      <detail-block v-if="title !== '新建' && _approvalStatusName !== '草稿箱'" title="审批流程">
+        <!-- 审批流程 -->
+        <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
       </detail-block>
     </div>
     <select-device-dialog

diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index f785f0f..eaee931 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -28,6 +28,15 @@
   })
 }
 
+// 状态管理编辑驳回
+export function updateRejectStatus(data: Object) {
+  return request({
+    url: '/meter/stateManage/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: { id: string | number }) {
   return request({
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 047d441..85dc752 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -159,3 +159,19 @@
 .el-button--danger.is-link:focus {
   color: #f56c6c !important;
 }
+
+/* 上传文件删除 */
+.photo-close {
+  z-index: 10;
+  position: absolute;
+  top: -10px;
+  right: -10px;
+  width: 20px;
+  height: 20px;
+  text-align: center;
+  line-height: 20px;
+  border-radius: 50%;
+  background: rgb(0 0 0 / 30%);
+  color: #fff;
+  cursor: pointer;
+}
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index dc21ae0..42d0040 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -15,15 +15,16 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { addApply, deleteApply, detailApply, editApply, failUpdate, submitApply } from '@/api/device/borrow'
-import { addStatus, detailStatus, updateStatus } from '@/api/device/stateManage'
+import { addStatus, detailStatus, submitStatus, updateRejectStatus, updateStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow'
 import useUserStore from '@/store/modules/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { cancelApproval, fetchApproval } from '@/api/approval'
 
+const $route = useRoute()
 const userInfo = useUserStore()
 const $router = useRouter()
-const $route = useRoute()
 const ruleFormRef1 = ref() // from组件
 const ruleFormRef2 = ref() // from组件
 const title = ref('')
@@ -33,6 +34,8 @@
 const selectIndex = ref() // 点击选择的index--点击第几行
 const borrowList = ref<IdeviceList[]>([])
 const processId = ref('')
+const _approvalStatusName = $route.query.approvalStatusName
+const _title = $route.query.title
 // 状态管理
 const ruleForm1 = ref({
   applyType: $route.query.applyType, // 申请类型
@@ -183,11 +186,12 @@
     return false
   }
 })
+
 // 弹窗初始化
 const initDialog = (row: any) => {
-  fetchData()
   title.value = row.title
   name.value = row.name
+  fetchData()
   // 设备借用
   if (isDevice.value) {
     if (title.value !== '新建') {
@@ -195,6 +199,9 @@
       detailApply({ id: row.id }).then((res) => {
         processId.value = res.data.processId // 流程id存在的时候赋值
         ruleForm2.value = res.data
+        if (res.data.approvalStatusName !== '草稿箱') {
+          getApprovalRecord(res.data.processId) // 查询审批记录
+        }
         borrowList.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
           return {
             ...item,
@@ -214,11 +221,29 @@
         ruleForm1.value.equipmentNo = res.data.applyNo
         ruleForm1.value.equipmentName = res.data.equipmentName
         ruleForm1.value.time = res.data.time
+        if (res.data.approvalStatusName !== '草稿箱') {
+          getApprovalRecord(res.data.processId) // 查询审批记录
+        }
       })
     }
   }
 }
-onMounted(() => {
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (title.value !== '新建') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+
+onMounted(async () => {
   initDialog($route.query)
 })
 
@@ -228,7 +253,7 @@
 }
 
 // 保存
-const saveForm = async (formEl: FormInstance | undefined) => {
+const deviceManageSave = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -272,7 +297,7 @@
 }
 
 // 提交
-const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+const deviceManageSubmit = async (formEl2: FormInstance | undefined) => {
   if (isDevice.value) {
     //  设备借用
     if (!formEl2) { return }
@@ -334,52 +359,108 @@
       ElMessage.info('请先保存再提交！')
     }
   }
-  else {
-  // 状态管理
-    if (!formEl1) { return }
-    await formEl1.validate((valid, fields) => {
-      if (valid) {
-        console.log(ruleForm1.value.equipmentList)
-        ElMessageBox.confirm(
-          '确认提交吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then((res) => {
-          if (title.value == '编辑') {
-            if (ruleForm1.value.equipmentList && ruleForm1.value.equipmentList[0]) {
-              ruleForm1.value.equipmentId = ruleForm1.value.equipmentList[0].equipmentId
-              // delete ruleForm1.value.equipmentList
-            }
-            updateStatus(ruleForm1.value).then((res) => {
-              if (res.code === 200) {
-                ElMessage.success('操作成功!')
-                $router.go(-1)
-              }
-              else {
-                ElMessage.warning(res.message)
-              }
-            })
-          }
-          else {
-            addStatus(ruleForm1.value).then((res) => {
-              if (res.code === 200) {
-                ElMessage.success('操作成功!')
-                $router.go(-1)
-              }
-              else {
-                ElMessage.warning(res.message)
-              }
-            })
-          }
-        })
+}
+
+// 状态管理编辑
+const statusManageEdit = () => {
+  if (title.value == '编辑') {
+    if (ruleForm1.value.equipmentList && ruleForm1.value.equipmentList[0]) {
+      ruleForm1.value.equipmentId = ruleForm1.value.equipmentList[0].equipmentId
+      // delete ruleForm1.value.equipmentList
+    }
+    updateStatus(ruleForm1.value).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('操作成功!')
+        $router.go(-1)
+      }
+      else {
+        ElMessage.warning(res.message)
       }
     })
   }
 }
+
+// 驳回编辑
+const statusManageRejectEdit = () => {
+  if (title.value == '编辑') {
+    if (ruleForm1.value.equipmentList && ruleForm1.value.equipmentList[0]) {
+      ruleForm1.value.equipmentId = ruleForm1.value.equipmentList[0].equipmentId
+      // delete ruleForm1.value.equipmentList
+    }
+    updateRejectStatus(ruleForm1.value).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('操作成功!')
+        $router.go(-1)
+      }
+      else {
+        ElMessage.warning(res.message)
+      }
+    })
+  }
+}
+// 新建 状态管理保存
+const statusManageSave = async (formEl1: FormInstance | undefined) => {
+  if (!formEl1) { return }
+  await formEl1.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        addStatus(ruleForm1.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('操作成功!')
+            ruleForm1.value.id = res.data
+          }
+          else {
+            ElMessage.warning(res.message)
+          }
+        })
+      })
+    }
+  })
+}
+
+// 新建 状态管理提交
+const statusManageSubmit = async (formEl1: FormInstance | undefined) => {
+  if (ruleForm1.value.id === '') {
+    ElMessage.warning('请保存之后再提交!')
+    return
+  }
+  if (!formEl1) { return }
+  await formEl1.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        submitStatus({
+          formId: $route.query.formId as string,
+          id: ruleForm1.value.id,
+          processId: '',
+        }).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('操作成功!')
+            $router.go(-1)
+          }
+          else {
+            ElMessage.warning(res.message)
+          }
+        })
+      })
+    }
+  })
+}
 // 取消
 const resetForm = () => {
   close()
@@ -435,22 +516,26 @@
 const onFileChange = (event: any) => {
   // 原生上传
   // console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
+  const files = event.target.files
+  if (files.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
     UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        console.log(res.data[0])
-        // 重置当前验证
-        ruleForm1.value.fileList = []
-        ruleForm1.value.fileList.push({
-          assetId: '',
-          fileName: res.data[0],
-          minioFileName: res.data[0],
+      console.log(res)
+      if (res.code === 200 && res.data.length >= 1) {
+        for (const item of res.data) {
+          ruleForm1.value.fileList.push({
+            assetId: '',
+            fileName: item,
+            minioFileName: item,
           // id: '',
-        })
+          })
+        }
         ruleFormRef1.value?.clearValidate('minioFileName')
+        // 重置当前验证
         ElMessage.success('文件上传成功')
       }
       else {
@@ -459,6 +544,10 @@
     })
   }
 }
+
+const del = (index: any) => {
+  ruleForm1.value.fileList.splice(index, 1)
+}
 const upload = () => {
   fileRef.value.click()
 }
@@ -664,27 +753,45 @@
     <approve-action ref="approveRef" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
-          提交
-        </el-button>
-        <el-button v-if="title !== '详情' && name.search('借用') !== -1" type="primary" @click="saveForm(ruleFormRef2)">
-          保存
-        </el-button>
-        <!-- <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
-          同意
-        </el-button>
-        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
-          驳回
-        </el-button>
-        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
-          拒绝
-        </el-button> -->
-        <!-- <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
-          提交
-        </el-button> -->
-        <!-- <el-button v-if="$route.query?.approvalStatus !== '草稿箱' && isCancel" type="primary" @click="editForm">
-          编辑
-        </el-button> -->
+        <!-- 设备借用 -->
+        <temalate v-if="name.search('借用') !== -1">
+          <el-button v-if="title !== '详情'" type="primary" @click="deviceManageSubmit(ruleFormRef2)">
+            提交
+          </el-button>
+          <el-button v-if="title !== '详情'" type="primary" @click="deviceManageSave(ruleFormRef2)">
+            保存
+          </el-button>
+        </temalate>
+        <!-- 状态管理 -->
+        <template v-else>
+          <template v-if="title !== '详情'">
+            <!-- 新建 -->
+            <el-button v-if="title === '新建'" type="primary" @click="statusManageSubmit(ruleFormRef1)">
+              提交
+            </el-button>
+            <el-button v-if="title === '新建'" type="primary" @click="statusManageSave(ruleFormRef1)">
+              保存
+            </el-button>
+            <!-- 草稿箱 + 已取消 -->
+            <el-button v-if="_approvalStatusName === '草稿箱' || _approvalStatusName === '已取消'" type="primary" @click="statusManageEdit">
+              保存
+            </el-button>
+            <!-- 未通过-驳回 -->
+            <el-button v-if="_approvalStatusName === '未通过-驳回'" type="primary" @click="statusManageRejectEdit">
+              保存
+            </el-button>
+            <!-- 待审批 -->
+            <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+              同意
+            </el-button>
+            <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
+              驳回
+            </el-button>
+            <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
+              拒绝
+            </el-button>
+          </template>
+        </template>
         <el-button v-if="(title === '详情' && $route.query?.approvalStatusName === '草稿箱' && isCancel)" type="primary" @click="editForm">
           编辑
         </el-button>
@@ -765,10 +872,14 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo :minio-file-name="ruleForm1.fileList[0]?.minioFileName || ''" />
-              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm1.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-                {{ ruleForm1.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              <div style="display: flex;">
+                <show-photo v-for="(item, index) in ruleForm1.fileList" :key="item" :index="index" :minio-file-name="item.minioFileName || ''" style="display: inline-block;margin: 10px;">
+                  <span v-if="title !== '详情'" class="photo-close" @click="del(index)">x</span>
+                </show-photo>
+              </div>
+              <input v-show="title === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
+                上传
               </el-button>
               <span v-if="title === '详情' && !ruleForm1.fileList[0]?.minioFileName">暂无</span>
             </el-form-item>
@@ -857,8 +968,9 @@
           </el-table-column>
         </el-table>
       </detail-block>
-      <detail-block v-if="title !== '新建'" title="审批流程">
-        <approval-record :process-id="processId" />
+      <detail-block v-if="title !== '新建' && _approvalStatusName !== '草稿箱'" title="审批流程">
+        <!-- 审批流程 -->
+        <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
       </detail-block>
     </div>
     <select-device-dialog
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 4c7f5d5..f31b654 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -214,6 +214,8 @@
       title: '详情',
       name: props.name,
       applyType: props.applyType,
+      approvalStatusName: row.approvalStatusName,
+
     },
   })
 }
@@ -229,6 +231,8 @@
       title: '编辑',
       name: props.name,
       applyType: props.applyType,
+      approvalStatusName: row.approvalStatusName,
+
     },
   })
 }
@@ -336,6 +340,7 @@
       title: '新建',
       name: props.name,
       applyType: props.applyType,
+      formId: searchQuery.formId,
     },
   })
 }

diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index f785f0f..eaee931 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -28,6 +28,15 @@
   })
 }
 
+// 状态管理编辑驳回
+export function updateRejectStatus(data: Object) {
+  return request({
+    url: '/meter/stateManage/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: { id: string | number }) {
   return request({
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 047d441..85dc752 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -159,3 +159,19 @@
 .el-button--danger.is-link:focus {
   color: #f56c6c !important;
 }
+
+/* 上传文件删除 */
+.photo-close {
+  z-index: 10;
+  position: absolute;
+  top: -10px;
+  right: -10px;
+  width: 20px;
+  height: 20px;
+  text-align: center;
+  line-height: 20px;
+  border-radius: 50%;
+  background: rgb(0 0 0 / 30%);
+  color: #fff;
+  cursor: pointer;
+}
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index dc21ae0..42d0040 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -15,15 +15,16 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { addApply, deleteApply, detailApply, editApply, failUpdate, submitApply } from '@/api/device/borrow'
-import { addStatus, detailStatus, updateStatus } from '@/api/device/stateManage'
+import { addStatus, detailStatus, submitStatus, updateRejectStatus, updateStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow'
 import useUserStore from '@/store/modules/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { cancelApproval, fetchApproval } from '@/api/approval'
 
+const $route = useRoute()
 const userInfo = useUserStore()
 const $router = useRouter()
-const $route = useRoute()
 const ruleFormRef1 = ref() // from组件
 const ruleFormRef2 = ref() // from组件
 const title = ref('')
@@ -33,6 +34,8 @@
 const selectIndex = ref() // 点击选择的index--点击第几行
 const borrowList = ref<IdeviceList[]>([])
 const processId = ref('')
+const _approvalStatusName = $route.query.approvalStatusName
+const _title = $route.query.title
 // 状态管理
 const ruleForm1 = ref({
   applyType: $route.query.applyType, // 申请类型
@@ -183,11 +186,12 @@
     return false
   }
 })
+
 // 弹窗初始化
 const initDialog = (row: any) => {
-  fetchData()
   title.value = row.title
   name.value = row.name
+  fetchData()
   // 设备借用
   if (isDevice.value) {
     if (title.value !== '新建') {
@@ -195,6 +199,9 @@
       detailApply({ id: row.id }).then((res) => {
         processId.value = res.data.processId // 流程id存在的时候赋值
         ruleForm2.value = res.data
+        if (res.data.approvalStatusName !== '草稿箱') {
+          getApprovalRecord(res.data.processId) // 查询审批记录
+        }
         borrowList.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
           return {
             ...item,
@@ -214,11 +221,29 @@
         ruleForm1.value.equipmentNo = res.data.applyNo
         ruleForm1.value.equipmentName = res.data.equipmentName
         ruleForm1.value.time = res.data.time
+        if (res.data.approvalStatusName !== '草稿箱') {
+          getApprovalRecord(res.data.processId) // 查询审批记录
+        }
       })
     }
   }
 }
-onMounted(() => {
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (title.value !== '新建') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+
+onMounted(async () => {
   initDialog($route.query)
 })
 
@@ -228,7 +253,7 @@
 }
 
 // 保存
-const saveForm = async (formEl: FormInstance | undefined) => {
+const deviceManageSave = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -272,7 +297,7 @@
 }
 
 // 提交
-const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+const deviceManageSubmit = async (formEl2: FormInstance | undefined) => {
   if (isDevice.value) {
     //  设备借用
     if (!formEl2) { return }
@@ -334,52 +359,108 @@
       ElMessage.info('请先保存再提交！')
     }
   }
-  else {
-  // 状态管理
-    if (!formEl1) { return }
-    await formEl1.validate((valid, fields) => {
-      if (valid) {
-        console.log(ruleForm1.value.equipmentList)
-        ElMessageBox.confirm(
-          '确认提交吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then((res) => {
-          if (title.value == '编辑') {
-            if (ruleForm1.value.equipmentList && ruleForm1.value.equipmentList[0]) {
-              ruleForm1.value.equipmentId = ruleForm1.value.equipmentList[0].equipmentId
-              // delete ruleForm1.value.equipmentList
-            }
-            updateStatus(ruleForm1.value).then((res) => {
-              if (res.code === 200) {
-                ElMessage.success('操作成功!')
-                $router.go(-1)
-              }
-              else {
-                ElMessage.warning(res.message)
-              }
-            })
-          }
-          else {
-            addStatus(ruleForm1.value).then((res) => {
-              if (res.code === 200) {
-                ElMessage.success('操作成功!')
-                $router.go(-1)
-              }
-              else {
-                ElMessage.warning(res.message)
-              }
-            })
-          }
-        })
+}
+
+// 状态管理编辑
+const statusManageEdit = () => {
+  if (title.value == '编辑') {
+    if (ruleForm1.value.equipmentList && ruleForm1.value.equipmentList[0]) {
+      ruleForm1.value.equipmentId = ruleForm1.value.equipmentList[0].equipmentId
+      // delete ruleForm1.value.equipmentList
+    }
+    updateStatus(ruleForm1.value).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('操作成功!')
+        $router.go(-1)
+      }
+      else {
+        ElMessage.warning(res.message)
       }
     })
   }
 }
+
+// 驳回编辑
+const statusManageRejectEdit = () => {
+  if (title.value == '编辑') {
+    if (ruleForm1.value.equipmentList && ruleForm1.value.equipmentList[0]) {
+      ruleForm1.value.equipmentId = ruleForm1.value.equipmentList[0].equipmentId
+      // delete ruleForm1.value.equipmentList
+    }
+    updateRejectStatus(ruleForm1.value).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('操作成功!')
+        $router.go(-1)
+      }
+      else {
+        ElMessage.warning(res.message)
+      }
+    })
+  }
+}
+// 新建 状态管理保存
+const statusManageSave = async (formEl1: FormInstance | undefined) => {
+  if (!formEl1) { return }
+  await formEl1.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        addStatus(ruleForm1.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('操作成功!')
+            ruleForm1.value.id = res.data
+          }
+          else {
+            ElMessage.warning(res.message)
+          }
+        })
+      })
+    }
+  })
+}
+
+// 新建 状态管理提交
+const statusManageSubmit = async (formEl1: FormInstance | undefined) => {
+  if (ruleForm1.value.id === '') {
+    ElMessage.warning('请保存之后再提交!')
+    return
+  }
+  if (!formEl1) { return }
+  await formEl1.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        submitStatus({
+          formId: $route.query.formId as string,
+          id: ruleForm1.value.id,
+          processId: '',
+        }).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('操作成功!')
+            $router.go(-1)
+          }
+          else {
+            ElMessage.warning(res.message)
+          }
+        })
+      })
+    }
+  })
+}
 // 取消
 const resetForm = () => {
   close()
@@ -435,22 +516,26 @@
 const onFileChange = (event: any) => {
   // 原生上传
   // console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
+  const files = event.target.files
+  if (files.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
     UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        console.log(res.data[0])
-        // 重置当前验证
-        ruleForm1.value.fileList = []
-        ruleForm1.value.fileList.push({
-          assetId: '',
-          fileName: res.data[0],
-          minioFileName: res.data[0],
+      console.log(res)
+      if (res.code === 200 && res.data.length >= 1) {
+        for (const item of res.data) {
+          ruleForm1.value.fileList.push({
+            assetId: '',
+            fileName: item,
+            minioFileName: item,
           // id: '',
-        })
+          })
+        }
         ruleFormRef1.value?.clearValidate('minioFileName')
+        // 重置当前验证
         ElMessage.success('文件上传成功')
       }
       else {
@@ -459,6 +544,10 @@
     })
   }
 }
+
+const del = (index: any) => {
+  ruleForm1.value.fileList.splice(index, 1)
+}
 const upload = () => {
   fileRef.value.click()
 }
@@ -664,27 +753,45 @@
     <approve-action ref="approveRef" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
-          提交
-        </el-button>
-        <el-button v-if="title !== '详情' && name.search('借用') !== -1" type="primary" @click="saveForm(ruleFormRef2)">
-          保存
-        </el-button>
-        <!-- <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
-          同意
-        </el-button>
-        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
-          驳回
-        </el-button>
-        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
-          拒绝
-        </el-button> -->
-        <!-- <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
-          提交
-        </el-button> -->
-        <!-- <el-button v-if="$route.query?.approvalStatus !== '草稿箱' && isCancel" type="primary" @click="editForm">
-          编辑
-        </el-button> -->
+        <!-- 设备借用 -->
+        <temalate v-if="name.search('借用') !== -1">
+          <el-button v-if="title !== '详情'" type="primary" @click="deviceManageSubmit(ruleFormRef2)">
+            提交
+          </el-button>
+          <el-button v-if="title !== '详情'" type="primary" @click="deviceManageSave(ruleFormRef2)">
+            保存
+          </el-button>
+        </temalate>
+        <!-- 状态管理 -->
+        <template v-else>
+          <template v-if="title !== '详情'">
+            <!-- 新建 -->
+            <el-button v-if="title === '新建'" type="primary" @click="statusManageSubmit(ruleFormRef1)">
+              提交
+            </el-button>
+            <el-button v-if="title === '新建'" type="primary" @click="statusManageSave(ruleFormRef1)">
+              保存
+            </el-button>
+            <!-- 草稿箱 + 已取消 -->
+            <el-button v-if="_approvalStatusName === '草稿箱' || _approvalStatusName === '已取消'" type="primary" @click="statusManageEdit">
+              保存
+            </el-button>
+            <!-- 未通过-驳回 -->
+            <el-button v-if="_approvalStatusName === '未通过-驳回'" type="primary" @click="statusManageRejectEdit">
+              保存
+            </el-button>
+            <!-- 待审批 -->
+            <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+              同意
+            </el-button>
+            <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
+              驳回
+            </el-button>
+            <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
+              拒绝
+            </el-button>
+          </template>
+        </template>
         <el-button v-if="(title === '详情' && $route.query?.approvalStatusName === '草稿箱' && isCancel)" type="primary" @click="editForm">
           编辑
         </el-button>
@@ -765,10 +872,14 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo :minio-file-name="ruleForm1.fileList[0]?.minioFileName || ''" />
-              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm1.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-                {{ ruleForm1.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              <div style="display: flex;">
+                <show-photo v-for="(item, index) in ruleForm1.fileList" :key="item" :index="index" :minio-file-name="item.minioFileName || ''" style="display: inline-block;margin: 10px;">
+                  <span v-if="title !== '详情'" class="photo-close" @click="del(index)">x</span>
+                </show-photo>
+              </div>
+              <input v-show="title === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
+                上传
               </el-button>
               <span v-if="title === '详情' && !ruleForm1.fileList[0]?.minioFileName">暂无</span>
             </el-form-item>
@@ -857,8 +968,9 @@
           </el-table-column>
         </el-table>
       </detail-block>
-      <detail-block v-if="title !== '新建'" title="审批流程">
-        <approval-record :process-id="processId" />
+      <detail-block v-if="title !== '新建' && _approvalStatusName !== '草稿箱'" title="审批流程">
+        <!-- 审批流程 -->
+        <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
       </detail-block>
     </div>
     <select-device-dialog
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 4c7f5d5..f31b654 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -214,6 +214,8 @@
       title: '详情',
       name: props.name,
       applyType: props.applyType,
+      approvalStatusName: row.approvalStatusName,
+
     },
   })
 }
@@ -229,6 +231,8 @@
       title: '编辑',
       name: props.name,
       applyType: props.applyType,
+      approvalStatusName: row.approvalStatusName,
+
     },
   })
 }
@@ -336,6 +340,7 @@
       title: '新建',
       name: props.name,
       applyType: props.applyType,
+      formId: searchQuery.formId,
     },
   })
 }
diff --git a/src/views/system/tool/showPhoto.vue b/src/views/system/tool/showPhoto.vue
index fb142e5..3235ec3 100644
--- a/src/views/system/tool/showPhoto.vue
+++ b/src/views/system/tool/showPhoto.vue
@@ -5,10 +5,6 @@
     type: String,
     required: true,
   },
-  // title: {
-  //   type: String,
-  //   required: true,
-  // },
   height: {
     type: String,
     default: '100px',
@@ -29,6 +25,7 @@
     })
   }
 }
+
 onMounted(() => {
   getPhoto()
 })
@@ -39,6 +36,7 @@
 
 <template>
   <div class="container">
+    <slot />
     <el-image
       v-if="props.minioFileName && isPhoto"
       :style="{ width: props.width, height: props.height }"
@@ -58,6 +56,8 @@
 
 <style lang="scss" scoped>
 .container {
+  position: relative;
+
   ::v-deep {
     .el-link::after {
       content: "";