diff --git a/src/api/device/standingBook.ts b/src/api/device/standingBook.ts
index 0f47a88..fe3c99e 100644
--- a/src/api/device/standingBook.ts
+++ b/src/api/device/standingBook.ts
@@ -35,7 +35,7 @@
   })
 }
 // 批量导入测量设备信息
-export function listImporttApi(data: FormData) {
+export function listImportApi(data: FormData) {
   return request({
     url: '/meter/assets/importMeterEquipment',
     method: 'post',

diff --git a/src/api/device/standingBook.ts b/src/api/device/standingBook.ts
index 0f47a88..fe3c99e 100644
--- a/src/api/device/standingBook.ts
+++ b/src/api/device/standingBook.ts
@@ -35,7 +35,7 @@
   })
 }
 // 批量导入测量设备信息
-export function listImporttApi(data: FormData) {
+export function listImportApi(data: FormData) {
   return request({
     url: '/meter/assets/importMeterEquipment',
     method: 'post',
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/standingBook.ts b/src/api/device/standingBook.ts
index 0f47a88..fe3c99e 100644
--- a/src/api/device/standingBook.ts
+++ b/src/api/device/standingBook.ts
@@ -35,7 +35,7 @@
   })
 }
 // 批量导入测量设备信息
-export function listImporttApi(data: FormData) {
+export function listImportApi(data: FormData) {
   return request({
     url: '/meter/assets/importMeterEquipment',
     method: 'post',
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/standingBook.ts b/src/api/device/standingBook.ts
index 0f47a88..fe3c99e 100644
--- a/src/api/device/standingBook.ts
+++ b/src/api/device/standingBook.ts
@@ -35,7 +35,7 @@
   })
 }
 // 批量导入测量设备信息
-export function listImporttApi(data: FormData) {
+export function listImportApi(data: FormData) {
   return request({
     url: '/meter/assets/importMeterEquipment',
     method: 'post',
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/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 3452009..5ec3c4d 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -418,7 +418,7 @@
             <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === 'detail' ? '' : '型号'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-        <el-col v-if="title === 'detail'" :span="6">
+        <el-col :span="6">
           <el-form-item label="管理状态" prop="managerState">
             <el-select v-model="ruleForm.managerState" :placeholder="title === 'detail' ? '' : '管理状态'" :disabled="title === 'detail'" clearable style="width: 100%;">
               <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
@@ -457,17 +457,17 @@
         </el-col>
       </el-row>
       <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item v-if="showAssetsItem" label="立卡年月" prop="cardEstablishmentDate">
+        <el-col v-if="showAssetsItem" :span="6">
+          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
             <el-date-picker
               v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === 'detail'"
               :placeholder="title === 'detail' ? '' : '立卡年月'"
               style="width: 100%;"
             />
           </el-form-item>
-          <el-form-item v-if="!showAssetsItem" label="原值" prop="originValue">
+          <!-- <el-form-item v-if="!showAssetsItem" label="原值" prop="originValue">
             <el-input v-model.trim="ruleForm.originValue" :placeholder="title === 'detail' ? '' : '原值'" :disabled="title === 'detail'" />
-          </el-form-item>
+          </el-form-item> -->
         </el-col>
         <el-col :span="6">
           <el-form-item label="启用日期" prop="enableDate">

diff --git a/src/api/device/standingBook.ts b/src/api/device/standingBook.ts
index 0f47a88..fe3c99e 100644
--- a/src/api/device/standingBook.ts
+++ b/src/api/device/standingBook.ts
@@ -35,7 +35,7 @@
   })
 }
 // 批量导入测量设备信息
-export function listImporttApi(data: FormData) {
+export function listImportApi(data: FormData) {
   return request({
     url: '/meter/assets/importMeterEquipment',
     method: 'post',
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/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 3452009..5ec3c4d 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -418,7 +418,7 @@
             <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === 'detail' ? '' : '型号'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-        <el-col v-if="title === 'detail'" :span="6">
+        <el-col :span="6">
           <el-form-item label="管理状态" prop="managerState">
             <el-select v-model="ruleForm.managerState" :placeholder="title === 'detail' ? '' : '管理状态'" :disabled="title === 'detail'" clearable style="width: 100%;">
               <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
@@ -457,17 +457,17 @@
         </el-col>
       </el-row>
       <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item v-if="showAssetsItem" label="立卡年月" prop="cardEstablishmentDate">
+        <el-col v-if="showAssetsItem" :span="6">
+          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
             <el-date-picker
               v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === 'detail'"
               :placeholder="title === 'detail' ? '' : '立卡年月'"
               style="width: 100%;"
             />
           </el-form-item>
-          <el-form-item v-if="!showAssetsItem" label="原值" prop="originValue">
+          <!-- <el-form-item v-if="!showAssetsItem" label="原值" prop="originValue">
             <el-input v-model.trim="ruleForm.originValue" :placeholder="title === 'detail' ? '' : '原值'" :disabled="title === 'detail'" />
-          </el-form-item>
+          </el-form-item> -->
         </el-col>
         <el-col :span="6">
           <el-form-item label="启用日期" prop="enableDate">
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 9cd3c83..988ba08 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -166,7 +166,7 @@
     <!-- 展示区域 -->
 
     <!-- 添加证书信息组件 -->
-    <detail-block-switch v-if="pageType === 'detail'" :title="current">
+    <detail-block-switch v-if="pageType === 'detail' && $route.query.name !== '固定资产'" :title="current">
       <template #menu>
         <el-radio-group v-model="current">
           <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">

diff --git a/src/api/device/standingBook.ts b/src/api/device/standingBook.ts
index 0f47a88..fe3c99e 100644
--- a/src/api/device/standingBook.ts
+++ b/src/api/device/standingBook.ts
@@ -35,7 +35,7 @@
   })
 }
 // 批量导入测量设备信息
-export function listImporttApi(data: FormData) {
+export function listImportApi(data: FormData) {
   return request({
     url: '/meter/assets/importMeterEquipment',
     method: 'post',
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/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 3452009..5ec3c4d 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -418,7 +418,7 @@
             <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === 'detail' ? '' : '型号'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-        <el-col v-if="title === 'detail'" :span="6">
+        <el-col :span="6">
           <el-form-item label="管理状态" prop="managerState">
             <el-select v-model="ruleForm.managerState" :placeholder="title === 'detail' ? '' : '管理状态'" :disabled="title === 'detail'" clearable style="width: 100%;">
               <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
@@ -457,17 +457,17 @@
         </el-col>
       </el-row>
       <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item v-if="showAssetsItem" label="立卡年月" prop="cardEstablishmentDate">
+        <el-col v-if="showAssetsItem" :span="6">
+          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
             <el-date-picker
               v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === 'detail'"
               :placeholder="title === 'detail' ? '' : '立卡年月'"
               style="width: 100%;"
             />
           </el-form-item>
-          <el-form-item v-if="!showAssetsItem" label="原值" prop="originValue">
+          <!-- <el-form-item v-if="!showAssetsItem" label="原值" prop="originValue">
             <el-input v-model.trim="ruleForm.originValue" :placeholder="title === 'detail' ? '' : '原值'" :disabled="title === 'detail'" />
-          </el-form-item>
+          </el-form-item> -->
         </el-col>
         <el-col :span="6">
           <el-form-item label="启用日期" prop="enableDate">
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 9cd3c83..988ba08 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -166,7 +166,7 @@
     <!-- 展示区域 -->
 
     <!-- 添加证书信息组件 -->
-    <detail-block-switch v-if="pageType === 'detail'" :title="current">
+    <detail-block-switch v-if="pageType === 'detail' && $route.query.name !== '固定资产'" :title="current">
       <template #menu>
         <el-radio-group v-model="current">
           <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 65ec9ca..608d07c 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -8,7 +8,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { assetsDeleteApi, listExportApi, listPageApi } from '@/api/device/standingBook'
+import { assetsDeleteApi, listExportApi, listImportApi, listPageApi } from '@/api/device/standingBook'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
   /**
@@ -291,9 +291,9 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    listImportApi(fd).then((res) => {
       if (res.code === 200) {
-        ElMessage.success('上传成功')
+        ElMessage.success('批量导入成功')
       }
       else {
         ElMessage.error(res.message)

diff --git a/src/api/device/standingBook.ts b/src/api/device/standingBook.ts
index 0f47a88..fe3c99e 100644
--- a/src/api/device/standingBook.ts
+++ b/src/api/device/standingBook.ts
@@ -35,7 +35,7 @@
   })
 }
 // 批量导入测量设备信息
-export function listImporttApi(data: FormData) {
+export function listImportApi(data: FormData) {
   return request({
     url: '/meter/assets/importMeterEquipment',
     method: 'post',
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/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 3452009..5ec3c4d 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -418,7 +418,7 @@
             <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === 'detail' ? '' : '型号'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-        <el-col v-if="title === 'detail'" :span="6">
+        <el-col :span="6">
           <el-form-item label="管理状态" prop="managerState">
             <el-select v-model="ruleForm.managerState" :placeholder="title === 'detail' ? '' : '管理状态'" :disabled="title === 'detail'" clearable style="width: 100%;">
               <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
@@ -457,17 +457,17 @@
         </el-col>
       </el-row>
       <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item v-if="showAssetsItem" label="立卡年月" prop="cardEstablishmentDate">
+        <el-col v-if="showAssetsItem" :span="6">
+          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
             <el-date-picker
               v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === 'detail'"
               :placeholder="title === 'detail' ? '' : '立卡年月'"
               style="width: 100%;"
             />
           </el-form-item>
-          <el-form-item v-if="!showAssetsItem" label="原值" prop="originValue">
+          <!-- <el-form-item v-if="!showAssetsItem" label="原值" prop="originValue">
             <el-input v-model.trim="ruleForm.originValue" :placeholder="title === 'detail' ? '' : '原值'" :disabled="title === 'detail'" />
-          </el-form-item>
+          </el-form-item> -->
         </el-col>
         <el-col :span="6">
           <el-form-item label="启用日期" prop="enableDate">
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 9cd3c83..988ba08 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -166,7 +166,7 @@
     <!-- 展示区域 -->
 
     <!-- 添加证书信息组件 -->
-    <detail-block-switch v-if="pageType === 'detail'" :title="current">
+    <detail-block-switch v-if="pageType === 'detail' && $route.query.name !== '固定资产'" :title="current">
       <template #menu>
         <el-radio-group v-model="current">
           <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 65ec9ca..608d07c 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -8,7 +8,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { assetsDeleteApi, listExportApi, listPageApi } from '@/api/device/standingBook'
+import { assetsDeleteApi, listExportApi, listImportApi, listPageApi } from '@/api/device/standingBook'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
   /**
@@ -291,9 +291,9 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    listImportApi(fd).then((res) => {
       if (res.code === 200) {
-        ElMessage.success('上传成功')
+        ElMessage.success('批量导入成功')
       }
       else {
         ElMessage.error(res.message)
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index be8a578..4bdb187 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -5,7 +5,7 @@
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
-import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { assetsDeleteApi, listExportApi, listImportApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -213,7 +213,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    listImporttApi(fd).then((res) => {
+    listImportApi(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }

diff --git a/src/api/device/standingBook.ts b/src/api/device/standingBook.ts
index 0f47a88..fe3c99e 100644
--- a/src/api/device/standingBook.ts
+++ b/src/api/device/standingBook.ts
@@ -35,7 +35,7 @@
   })
 }
 // 批量导入测量设备信息
-export function listImporttApi(data: FormData) {
+export function listImportApi(data: FormData) {
   return request({
     url: '/meter/assets/importMeterEquipment',
     method: 'post',
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/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 3452009..5ec3c4d 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -418,7 +418,7 @@
             <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === 'detail' ? '' : '型号'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-        <el-col v-if="title === 'detail'" :span="6">
+        <el-col :span="6">
           <el-form-item label="管理状态" prop="managerState">
             <el-select v-model="ruleForm.managerState" :placeholder="title === 'detail' ? '' : '管理状态'" :disabled="title === 'detail'" clearable style="width: 100%;">
               <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
@@ -457,17 +457,17 @@
         </el-col>
       </el-row>
       <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item v-if="showAssetsItem" label="立卡年月" prop="cardEstablishmentDate">
+        <el-col v-if="showAssetsItem" :span="6">
+          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
             <el-date-picker
               v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === 'detail'"
               :placeholder="title === 'detail' ? '' : '立卡年月'"
               style="width: 100%;"
             />
           </el-form-item>
-          <el-form-item v-if="!showAssetsItem" label="原值" prop="originValue">
+          <!-- <el-form-item v-if="!showAssetsItem" label="原值" prop="originValue">
             <el-input v-model.trim="ruleForm.originValue" :placeholder="title === 'detail' ? '' : '原值'" :disabled="title === 'detail'" />
-          </el-form-item>
+          </el-form-item> -->
         </el-col>
         <el-col :span="6">
           <el-form-item label="启用日期" prop="enableDate">
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 9cd3c83..988ba08 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -166,7 +166,7 @@
     <!-- 展示区域 -->
 
     <!-- 添加证书信息组件 -->
-    <detail-block-switch v-if="pageType === 'detail'" :title="current">
+    <detail-block-switch v-if="pageType === 'detail' && $route.query.name !== '固定资产'" :title="current">
       <template #menu>
         <el-radio-group v-model="current">
           <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 65ec9ca..608d07c 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -8,7 +8,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { assetsDeleteApi, listExportApi, listPageApi } from '@/api/device/standingBook'
+import { assetsDeleteApi, listExportApi, listImportApi, listPageApi } from '@/api/device/standingBook'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
   /**
@@ -291,9 +291,9 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    listImportApi(fd).then((res) => {
       if (res.code === 200) {
-        ElMessage.success('上传成功')
+        ElMessage.success('批量导入成功')
       }
       else {
         ElMessage.error(res.message)
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index be8a578..4bdb187 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -5,7 +5,7 @@
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
-import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { assetsDeleteApi, listExportApi, listImportApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -213,7 +213,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    listImporttApi(fd).then((res) => {
+    listImportApi(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index dc21ae0..e6bb9a1 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,21 +221,39 @@
         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)
 })
 
 // 关闭弹窗
 const close = () => {
-  $router.go(-1)
+  $router.back()
 }
 
 // 保存
-const saveForm = async (formEl: FormInstance | undefined) => {
+const deviceManageSave = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -256,7 +281,7 @@
               // 成功
               ruleForm2.value.id = res.data
               ElMessage.success('操作成功')
-              $router.go(-1)
+              $router.back()
             }
           })
         }
@@ -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 }
@@ -299,7 +324,7 @@
               // }
               failUpdate({ ...ruleForm2.value }).then(() => {
                 ElMessage.success('操作成功!')
-                $router.go(-1)
+                $router.back()
               })
             })
           }
@@ -323,7 +348,7 @@
               }
               submitApply(params).then(() => {
                 ElMessage.success('操作成功!')
-                $router.go(-1)
+                $router.back()
               })
             })
           }
@@ -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.back()
+      }
+      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.back()
+      }
+      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.back()
+          }
+          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> -->
+          <!-- 新建 -->
+          <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="title === '编辑' && _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>
@@ -713,7 +820,7 @@
           <el-col :span="6">
             <el-form-item label="设备编号" prop="equipmentNo" class="equipmentNo">
               <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" disabled />
-              <el-button class="equipmentNo-item" type="default" :disabled="title === '详情'" @click="addRowBtn">
+              <el-button v-if="title !== '详情'" class="equipmentNo-item" type="default" @click="addRowBtn">
                 选择
               </el-button>
             </el-form-item>
@@ -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/standingBook.ts b/src/api/device/standingBook.ts
index 0f47a88..fe3c99e 100644
--- a/src/api/device/standingBook.ts
+++ b/src/api/device/standingBook.ts
@@ -35,7 +35,7 @@
   })
 }
 // 批量导入测量设备信息
-export function listImporttApi(data: FormData) {
+export function listImportApi(data: FormData) {
   return request({
     url: '/meter/assets/importMeterEquipment',
     method: 'post',
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/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 3452009..5ec3c4d 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -418,7 +418,7 @@
             <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === 'detail' ? '' : '型号'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-        <el-col v-if="title === 'detail'" :span="6">
+        <el-col :span="6">
           <el-form-item label="管理状态" prop="managerState">
             <el-select v-model="ruleForm.managerState" :placeholder="title === 'detail' ? '' : '管理状态'" :disabled="title === 'detail'" clearable style="width: 100%;">
               <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
@@ -457,17 +457,17 @@
         </el-col>
       </el-row>
       <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item v-if="showAssetsItem" label="立卡年月" prop="cardEstablishmentDate">
+        <el-col v-if="showAssetsItem" :span="6">
+          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
             <el-date-picker
               v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === 'detail'"
               :placeholder="title === 'detail' ? '' : '立卡年月'"
               style="width: 100%;"
             />
           </el-form-item>
-          <el-form-item v-if="!showAssetsItem" label="原值" prop="originValue">
+          <!-- <el-form-item v-if="!showAssetsItem" label="原值" prop="originValue">
             <el-input v-model.trim="ruleForm.originValue" :placeholder="title === 'detail' ? '' : '原值'" :disabled="title === 'detail'" />
-          </el-form-item>
+          </el-form-item> -->
         </el-col>
         <el-col :span="6">
           <el-form-item label="启用日期" prop="enableDate">
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 9cd3c83..988ba08 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -166,7 +166,7 @@
     <!-- 展示区域 -->
 
     <!-- 添加证书信息组件 -->
-    <detail-block-switch v-if="pageType === 'detail'" :title="current">
+    <detail-block-switch v-if="pageType === 'detail' && $route.query.name !== '固定资产'" :title="current">
       <template #menu>
         <el-radio-group v-model="current">
           <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 65ec9ca..608d07c 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -8,7 +8,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { assetsDeleteApi, listExportApi, listPageApi } from '@/api/device/standingBook'
+import { assetsDeleteApi, listExportApi, listImportApi, listPageApi } from '@/api/device/standingBook'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
   /**
@@ -291,9 +291,9 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    listImportApi(fd).then((res) => {
       if (res.code === 200) {
-        ElMessage.success('上传成功')
+        ElMessage.success('批量导入成功')
       }
       else {
         ElMessage.error(res.message)
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index be8a578..4bdb187 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -5,7 +5,7 @@
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
-import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { assetsDeleteApi, listExportApi, listImportApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -213,7 +213,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    listImporttApi(fd).then((res) => {
+    listImportApi(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index dc21ae0..e6bb9a1 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,21 +221,39 @@
         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)
 })
 
 // 关闭弹窗
 const close = () => {
-  $router.go(-1)
+  $router.back()
 }
 
 // 保存
-const saveForm = async (formEl: FormInstance | undefined) => {
+const deviceManageSave = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -256,7 +281,7 @@
               // 成功
               ruleForm2.value.id = res.data
               ElMessage.success('操作成功')
-              $router.go(-1)
+              $router.back()
             }
           })
         }
@@ -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 }
@@ -299,7 +324,7 @@
               // }
               failUpdate({ ...ruleForm2.value }).then(() => {
                 ElMessage.success('操作成功!')
-                $router.go(-1)
+                $router.back()
               })
             })
           }
@@ -323,7 +348,7 @@
               }
               submitApply(params).then(() => {
                 ElMessage.success('操作成功!')
-                $router.go(-1)
+                $router.back()
               })
             })
           }
@@ -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.back()
+      }
+      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.back()
+      }
+      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.back()
+          }
+          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> -->
+          <!-- 新建 -->
+          <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="title === '编辑' && _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>
@@ -713,7 +820,7 @@
           <el-col :span="6">
             <el-form-item label="设备编号" prop="equipmentNo" class="equipmentNo">
               <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" disabled />
-              <el-button class="equipmentNo-item" type="default" :disabled="title === '详情'" @click="addRowBtn">
+              <el-button v-if="title !== '详情'" class="equipmentNo-item" type="default" @click="addRowBtn">
                 选择
               </el-button>
             </el-form-item>
@@ -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..3a7deae 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -10,11 +10,9 @@
   getStatusList,
   submitStatus,
 } from '@/api/device/stateManage'
-import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import type { dictType } from '@/views/device/receive/receive'
 import { exportFile } from '@/utils/exportUtils'
 
 // 选中的按钮
@@ -49,15 +47,19 @@
   delete: '/device/unusedApply/delete', // 删除
 }
 const activeTitle = ref<string>(props.title) // 状态按钮选中
-const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
-const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const approvalStatusVal = ref<string>(props.type)
+if (props.type == '0') {
+  approvalStatusVal.value = ''
+}
+// const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+// const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 const $router = useRouter()
 // 查询参数
 const searchQuery = reactive<ISearchQuery>({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
   applyUnit: '', // 申请单位
-  approvalStatus: '0', // 审批状态
+  approvalStatus: approvalStatusVal.value, // 审批状态
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
@@ -142,48 +144,12 @@
   searchQuery.formId = SCHEDULE[props.formCode as keyof typeof SCHEDULE]
 }
 
-// 获取字典值
-async function getDict() {
-  managerStateList.value = []
-  // 审批状态
-  const res = await getDictByCode('approvalStatus')
-  // 审批状态字典 {1：草稿箱}
-  res.data.forEach((item: any) => {
-    approvalStatusMap.value[`${item.value}`] = item.name
-  })
-
-  // 审批状态字典 {草稿箱: 1}
-  res.data.forEach((item: any) => {
-    approvalStatusReserveMap.value[item.name] = `${item.value}`
-  })
-
-  // 制作右上角的菜单
-  res.data.forEach((item: dictType) => {
-    if (item.name === '全部' || item.name === '草稿箱'
-      || item.name === '待审批' || item.name === '审批中'
-      || item.name === '已通过' || item.name === '未通过'
-      || item.name === '已取消') {
-      managerStateList.value.push({
-        name: item.name,
-        value: item.name,
-        id: `${item.value}`,
-      })
-    }
-  })
-}
-
 // 获取数据列表
 const getList = () => {
-  getDict()
   loadingTable.value = true
   getStatusList(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map((item: ITableRow) => {
-        return {
-          ...item,
-          approvalStatus: approvalStatusMap[item.approvalStatus],
-        }
-      })
+      list.value = res.data.rows
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -192,6 +158,7 @@
       loadingTable.value = false
     })
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -214,6 +181,8 @@
       title: '详情',
       name: props.name,
       applyType: props.applyType,
+      approvalStatusName: row.approvalStatusName,
+
     },
   })
 }
@@ -229,6 +198,8 @@
       title: '编辑',
       name: props.name,
       applyType: props.applyType,
+      approvalStatusName: row.approvalStatusName,
+
     },
   })
 }
@@ -336,6 +307,7 @@
       title: '新建',
       name: props.name,
       applyType: props.applyType,
+      formId: searchQuery.formId,
     },
   })
 }
@@ -418,31 +390,9 @@
   dialogVisible.value = false
 }
 
-watch(() => searchQuery.applyStatus, (newValue) => {
-  if (newValue == '') {
-    searchQuery.approvalStatus = '0'
-  }
-  else {
-    searchQuery.approvalStatus = approvalStatusReserveMap.value[newValue]
-  }
+onMounted(() => {
+  getList()
 })
-
-watch(
-  () => props.type,
-  (newValue) => {
-    if (newValue === '0') {
-      searchQuery.approvalStatus = '0'
-    }
-    else {
-      searchQuery.approvalStatus = newValue
-    }
-    getList()
-  },
-  {
-    immediate: true,
-    deep: true,
-  },
-)
 </script>
 
 <template>
@@ -610,7 +560,7 @@
                 <el-button
                   v-if="proxy.buttonPerm.cancel.if(row, permUrl.cancel)"
                   size="small"
-                  type="text"
+                  type="info"
                   link
                   :disabled="proxy.buttonPerm.cancel.disabled(row)"
                   @click="cancel(row)"

diff --git a/src/api/device/standingBook.ts b/src/api/device/standingBook.ts
index 0f47a88..fe3c99e 100644
--- a/src/api/device/standingBook.ts
+++ b/src/api/device/standingBook.ts
@@ -35,7 +35,7 @@
   })
 }
 // 批量导入测量设备信息
-export function listImporttApi(data: FormData) {
+export function listImportApi(data: FormData) {
   return request({
     url: '/meter/assets/importMeterEquipment',
     method: 'post',
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/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 3452009..5ec3c4d 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -418,7 +418,7 @@
             <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === 'detail' ? '' : '型号'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-        <el-col v-if="title === 'detail'" :span="6">
+        <el-col :span="6">
           <el-form-item label="管理状态" prop="managerState">
             <el-select v-model="ruleForm.managerState" :placeholder="title === 'detail' ? '' : '管理状态'" :disabled="title === 'detail'" clearable style="width: 100%;">
               <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
@@ -457,17 +457,17 @@
         </el-col>
       </el-row>
       <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item v-if="showAssetsItem" label="立卡年月" prop="cardEstablishmentDate">
+        <el-col v-if="showAssetsItem" :span="6">
+          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
             <el-date-picker
               v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === 'detail'"
               :placeholder="title === 'detail' ? '' : '立卡年月'"
               style="width: 100%;"
             />
           </el-form-item>
-          <el-form-item v-if="!showAssetsItem" label="原值" prop="originValue">
+          <!-- <el-form-item v-if="!showAssetsItem" label="原值" prop="originValue">
             <el-input v-model.trim="ruleForm.originValue" :placeholder="title === 'detail' ? '' : '原值'" :disabled="title === 'detail'" />
-          </el-form-item>
+          </el-form-item> -->
         </el-col>
         <el-col :span="6">
           <el-form-item label="启用日期" prop="enableDate">
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 9cd3c83..988ba08 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -166,7 +166,7 @@
     <!-- 展示区域 -->
 
     <!-- 添加证书信息组件 -->
-    <detail-block-switch v-if="pageType === 'detail'" :title="current">
+    <detail-block-switch v-if="pageType === 'detail' && $route.query.name !== '固定资产'" :title="current">
       <template #menu>
         <el-radio-group v-model="current">
           <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 65ec9ca..608d07c 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -8,7 +8,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { assetsDeleteApi, listExportApi, listPageApi } from '@/api/device/standingBook'
+import { assetsDeleteApi, listExportApi, listImportApi, listPageApi } from '@/api/device/standingBook'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
   /**
@@ -291,9 +291,9 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    listImportApi(fd).then((res) => {
       if (res.code === 200) {
-        ElMessage.success('上传成功')
+        ElMessage.success('批量导入成功')
       }
       else {
         ElMessage.error(res.message)
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index be8a578..4bdb187 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -5,7 +5,7 @@
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
-import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { assetsDeleteApi, listExportApi, listImportApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -213,7 +213,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    listImporttApi(fd).then((res) => {
+    listImportApi(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index dc21ae0..e6bb9a1 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,21 +221,39 @@
         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)
 })
 
 // 关闭弹窗
 const close = () => {
-  $router.go(-1)
+  $router.back()
 }
 
 // 保存
-const saveForm = async (formEl: FormInstance | undefined) => {
+const deviceManageSave = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -256,7 +281,7 @@
               // 成功
               ruleForm2.value.id = res.data
               ElMessage.success('操作成功')
-              $router.go(-1)
+              $router.back()
             }
           })
         }
@@ -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 }
@@ -299,7 +324,7 @@
               // }
               failUpdate({ ...ruleForm2.value }).then(() => {
                 ElMessage.success('操作成功!')
-                $router.go(-1)
+                $router.back()
               })
             })
           }
@@ -323,7 +348,7 @@
               }
               submitApply(params).then(() => {
                 ElMessage.success('操作成功!')
-                $router.go(-1)
+                $router.back()
               })
             })
           }
@@ -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.back()
+      }
+      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.back()
+      }
+      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.back()
+          }
+          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> -->
+          <!-- 新建 -->
+          <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="title === '编辑' && _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>
@@ -713,7 +820,7 @@
           <el-col :span="6">
             <el-form-item label="设备编号" prop="equipmentNo" class="equipmentNo">
               <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" disabled />
-              <el-button class="equipmentNo-item" type="default" :disabled="title === '详情'" @click="addRowBtn">
+              <el-button v-if="title !== '详情'" class="equipmentNo-item" type="default" @click="addRowBtn">
                 选择
               </el-button>
             </el-form-item>
@@ -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..3a7deae 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -10,11 +10,9 @@
   getStatusList,
   submitStatus,
 } from '@/api/device/stateManage'
-import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import type { dictType } from '@/views/device/receive/receive'
 import { exportFile } from '@/utils/exportUtils'
 
 // 选中的按钮
@@ -49,15 +47,19 @@
   delete: '/device/unusedApply/delete', // 删除
 }
 const activeTitle = ref<string>(props.title) // 状态按钮选中
-const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
-const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const approvalStatusVal = ref<string>(props.type)
+if (props.type == '0') {
+  approvalStatusVal.value = ''
+}
+// const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+// const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 const $router = useRouter()
 // 查询参数
 const searchQuery = reactive<ISearchQuery>({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
   applyUnit: '', // 申请单位
-  approvalStatus: '0', // 审批状态
+  approvalStatus: approvalStatusVal.value, // 审批状态
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
@@ -142,48 +144,12 @@
   searchQuery.formId = SCHEDULE[props.formCode as keyof typeof SCHEDULE]
 }
 
-// 获取字典值
-async function getDict() {
-  managerStateList.value = []
-  // 审批状态
-  const res = await getDictByCode('approvalStatus')
-  // 审批状态字典 {1：草稿箱}
-  res.data.forEach((item: any) => {
-    approvalStatusMap.value[`${item.value}`] = item.name
-  })
-
-  // 审批状态字典 {草稿箱: 1}
-  res.data.forEach((item: any) => {
-    approvalStatusReserveMap.value[item.name] = `${item.value}`
-  })
-
-  // 制作右上角的菜单
-  res.data.forEach((item: dictType) => {
-    if (item.name === '全部' || item.name === '草稿箱'
-      || item.name === '待审批' || item.name === '审批中'
-      || item.name === '已通过' || item.name === '未通过'
-      || item.name === '已取消') {
-      managerStateList.value.push({
-        name: item.name,
-        value: item.name,
-        id: `${item.value}`,
-      })
-    }
-  })
-}
-
 // 获取数据列表
 const getList = () => {
-  getDict()
   loadingTable.value = true
   getStatusList(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map((item: ITableRow) => {
-        return {
-          ...item,
-          approvalStatus: approvalStatusMap[item.approvalStatus],
-        }
-      })
+      list.value = res.data.rows
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -192,6 +158,7 @@
       loadingTable.value = false
     })
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -214,6 +181,8 @@
       title: '详情',
       name: props.name,
       applyType: props.applyType,
+      approvalStatusName: row.approvalStatusName,
+
     },
   })
 }
@@ -229,6 +198,8 @@
       title: '编辑',
       name: props.name,
       applyType: props.applyType,
+      approvalStatusName: row.approvalStatusName,
+
     },
   })
 }
@@ -336,6 +307,7 @@
       title: '新建',
       name: props.name,
       applyType: props.applyType,
+      formId: searchQuery.formId,
     },
   })
 }
@@ -418,31 +390,9 @@
   dialogVisible.value = false
 }
 
-watch(() => searchQuery.applyStatus, (newValue) => {
-  if (newValue == '') {
-    searchQuery.approvalStatus = '0'
-  }
-  else {
-    searchQuery.approvalStatus = approvalStatusReserveMap.value[newValue]
-  }
+onMounted(() => {
+  getList()
 })
-
-watch(
-  () => props.type,
-  (newValue) => {
-    if (newValue === '0') {
-      searchQuery.approvalStatus = '0'
-    }
-    else {
-      searchQuery.approvalStatus = newValue
-    }
-    getList()
-  },
-  {
-    immediate: true,
-    deep: true,
-  },
-)
 </script>
 
 <template>
@@ -610,7 +560,7 @@
                 <el-button
                   v-if="proxy.buttonPerm.cancel.if(row, permUrl.cancel)"
                   size="small"
-                  type="text"
+                  type="info"
                   link
                   :disabled="proxy.buttonPerm.cancel.disabled(row)"
                   @click="cancel(row)"
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index a15ce23..2d07167 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -43,7 +43,7 @@
 ])
 const statusList = ref<menuType[]>([])
 const type = ref('') // 当前状态的value
-const current = ref('全部')
+const current = ref('')
 const currentComp = shallowRef(all)
 watch(current, async (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
@@ -63,8 +63,14 @@
 onUnmounted(() => {
   sessionStorage.setItem(`${props.authority}Menu`, current.value)
 })
-onMounted(() => {
+onMounted(async () => {
+  await getDictByCode('approvalStatus').then((res) => {
+    statusList.value = (res.data as menuType[])
+  })
   current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  if (statusList.value.length > 0) {
+    type.value = statusList.value.filter(item => item.name === current.value)[0].value || ''
+  }
   sessionStorage.getItem(`${props.authority}Menu`) ? sessionStorage.removeItem(`${props.authority}Menu`) : ''
 })
 </script>

diff --git a/src/api/device/standingBook.ts b/src/api/device/standingBook.ts
index 0f47a88..fe3c99e 100644
--- a/src/api/device/standingBook.ts
+++ b/src/api/device/standingBook.ts
@@ -35,7 +35,7 @@
   })
 }
 // 批量导入测量设备信息
-export function listImporttApi(data: FormData) {
+export function listImportApi(data: FormData) {
   return request({
     url: '/meter/assets/importMeterEquipment',
     method: 'post',
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/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 3452009..5ec3c4d 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -418,7 +418,7 @@
             <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === 'detail' ? '' : '型号'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-        <el-col v-if="title === 'detail'" :span="6">
+        <el-col :span="6">
           <el-form-item label="管理状态" prop="managerState">
             <el-select v-model="ruleForm.managerState" :placeholder="title === 'detail' ? '' : '管理状态'" :disabled="title === 'detail'" clearable style="width: 100%;">
               <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
@@ -457,17 +457,17 @@
         </el-col>
       </el-row>
       <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item v-if="showAssetsItem" label="立卡年月" prop="cardEstablishmentDate">
+        <el-col v-if="showAssetsItem" :span="6">
+          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
             <el-date-picker
               v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === 'detail'"
               :placeholder="title === 'detail' ? '' : '立卡年月'"
               style="width: 100%;"
             />
           </el-form-item>
-          <el-form-item v-if="!showAssetsItem" label="原值" prop="originValue">
+          <!-- <el-form-item v-if="!showAssetsItem" label="原值" prop="originValue">
             <el-input v-model.trim="ruleForm.originValue" :placeholder="title === 'detail' ? '' : '原值'" :disabled="title === 'detail'" />
-          </el-form-item>
+          </el-form-item> -->
         </el-col>
         <el-col :span="6">
           <el-form-item label="启用日期" prop="enableDate">
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 9cd3c83..988ba08 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -166,7 +166,7 @@
     <!-- 展示区域 -->
 
     <!-- 添加证书信息组件 -->
-    <detail-block-switch v-if="pageType === 'detail'" :title="current">
+    <detail-block-switch v-if="pageType === 'detail' && $route.query.name !== '固定资产'" :title="current">
       <template #menu>
         <el-radio-group v-model="current">
           <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 65ec9ca..608d07c 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -8,7 +8,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { assetsDeleteApi, listExportApi, listPageApi } from '@/api/device/standingBook'
+import { assetsDeleteApi, listExportApi, listImportApi, listPageApi } from '@/api/device/standingBook'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
   /**
@@ -291,9 +291,9 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    listImportApi(fd).then((res) => {
       if (res.code === 200) {
-        ElMessage.success('上传成功')
+        ElMessage.success('批量导入成功')
       }
       else {
         ElMessage.error(res.message)
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index be8a578..4bdb187 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -5,7 +5,7 @@
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
-import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { assetsDeleteApi, listExportApi, listImportApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -213,7 +213,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    listImporttApi(fd).then((res) => {
+    listImportApi(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index dc21ae0..e6bb9a1 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,21 +221,39 @@
         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)
 })
 
 // 关闭弹窗
 const close = () => {
-  $router.go(-1)
+  $router.back()
 }
 
 // 保存
-const saveForm = async (formEl: FormInstance | undefined) => {
+const deviceManageSave = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -256,7 +281,7 @@
               // 成功
               ruleForm2.value.id = res.data
               ElMessage.success('操作成功')
-              $router.go(-1)
+              $router.back()
             }
           })
         }
@@ -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 }
@@ -299,7 +324,7 @@
               // }
               failUpdate({ ...ruleForm2.value }).then(() => {
                 ElMessage.success('操作成功!')
-                $router.go(-1)
+                $router.back()
               })
             })
           }
@@ -323,7 +348,7 @@
               }
               submitApply(params).then(() => {
                 ElMessage.success('操作成功!')
-                $router.go(-1)
+                $router.back()
               })
             })
           }
@@ -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.back()
+      }
+      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.back()
+      }
+      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.back()
+          }
+          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> -->
+          <!-- 新建 -->
+          <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="title === '编辑' && _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>
@@ -713,7 +820,7 @@
           <el-col :span="6">
             <el-form-item label="设备编号" prop="equipmentNo" class="equipmentNo">
               <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" disabled />
-              <el-button class="equipmentNo-item" type="default" :disabled="title === '详情'" @click="addRowBtn">
+              <el-button v-if="title !== '详情'" class="equipmentNo-item" type="default" @click="addRowBtn">
                 选择
               </el-button>
             </el-form-item>
@@ -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..3a7deae 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -10,11 +10,9 @@
   getStatusList,
   submitStatus,
 } from '@/api/device/stateManage'
-import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import type { dictType } from '@/views/device/receive/receive'
 import { exportFile } from '@/utils/exportUtils'
 
 // 选中的按钮
@@ -49,15 +47,19 @@
   delete: '/device/unusedApply/delete', // 删除
 }
 const activeTitle = ref<string>(props.title) // 状态按钮选中
-const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
-const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const approvalStatusVal = ref<string>(props.type)
+if (props.type == '0') {
+  approvalStatusVal.value = ''
+}
+// const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+// const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 const $router = useRouter()
 // 查询参数
 const searchQuery = reactive<ISearchQuery>({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
   applyUnit: '', // 申请单位
-  approvalStatus: '0', // 审批状态
+  approvalStatus: approvalStatusVal.value, // 审批状态
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
@@ -142,48 +144,12 @@
   searchQuery.formId = SCHEDULE[props.formCode as keyof typeof SCHEDULE]
 }
 
-// 获取字典值
-async function getDict() {
-  managerStateList.value = []
-  // 审批状态
-  const res = await getDictByCode('approvalStatus')
-  // 审批状态字典 {1：草稿箱}
-  res.data.forEach((item: any) => {
-    approvalStatusMap.value[`${item.value}`] = item.name
-  })
-
-  // 审批状态字典 {草稿箱: 1}
-  res.data.forEach((item: any) => {
-    approvalStatusReserveMap.value[item.name] = `${item.value}`
-  })
-
-  // 制作右上角的菜单
-  res.data.forEach((item: dictType) => {
-    if (item.name === '全部' || item.name === '草稿箱'
-      || item.name === '待审批' || item.name === '审批中'
-      || item.name === '已通过' || item.name === '未通过'
-      || item.name === '已取消') {
-      managerStateList.value.push({
-        name: item.name,
-        value: item.name,
-        id: `${item.value}`,
-      })
-    }
-  })
-}
-
 // 获取数据列表
 const getList = () => {
-  getDict()
   loadingTable.value = true
   getStatusList(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map((item: ITableRow) => {
-        return {
-          ...item,
-          approvalStatus: approvalStatusMap[item.approvalStatus],
-        }
-      })
+      list.value = res.data.rows
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -192,6 +158,7 @@
       loadingTable.value = false
     })
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -214,6 +181,8 @@
       title: '详情',
       name: props.name,
       applyType: props.applyType,
+      approvalStatusName: row.approvalStatusName,
+
     },
   })
 }
@@ -229,6 +198,8 @@
       title: '编辑',
       name: props.name,
       applyType: props.applyType,
+      approvalStatusName: row.approvalStatusName,
+
     },
   })
 }
@@ -336,6 +307,7 @@
       title: '新建',
       name: props.name,
       applyType: props.applyType,
+      formId: searchQuery.formId,
     },
   })
 }
@@ -418,31 +390,9 @@
   dialogVisible.value = false
 }
 
-watch(() => searchQuery.applyStatus, (newValue) => {
-  if (newValue == '') {
-    searchQuery.approvalStatus = '0'
-  }
-  else {
-    searchQuery.approvalStatus = approvalStatusReserveMap.value[newValue]
-  }
+onMounted(() => {
+  getList()
 })
-
-watch(
-  () => props.type,
-  (newValue) => {
-    if (newValue === '0') {
-      searchQuery.approvalStatus = '0'
-    }
-    else {
-      searchQuery.approvalStatus = newValue
-    }
-    getList()
-  },
-  {
-    immediate: true,
-    deep: true,
-  },
-)
 </script>
 
 <template>
@@ -610,7 +560,7 @@
                 <el-button
                   v-if="proxy.buttonPerm.cancel.if(row, permUrl.cancel)"
                   size="small"
-                  type="text"
+                  type="info"
                   link
                   :disabled="proxy.buttonPerm.cancel.disabled(row)"
                   @click="cancel(row)"
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index a15ce23..2d07167 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -43,7 +43,7 @@
 ])
 const statusList = ref<menuType[]>([])
 const type = ref('') // 当前状态的value
-const current = ref('全部')
+const current = ref('')
 const currentComp = shallowRef(all)
 watch(current, async (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
@@ -63,8 +63,14 @@
 onUnmounted(() => {
   sessionStorage.setItem(`${props.authority}Menu`, current.value)
 })
-onMounted(() => {
+onMounted(async () => {
+  await getDictByCode('approvalStatus').then((res) => {
+    statusList.value = (res.data as menuType[])
+  })
   current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  if (statusList.value.length > 0) {
+    type.value = statusList.value.filter(item => item.name === current.value)[0].value || ''
+  }
   sessionStorage.getItem(`${props.authority}Menu`) ? sessionStorage.removeItem(`${props.authority}Menu`) : ''
 })
 </script>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 088cb52..733efc3 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -6,7 +6,7 @@
 import lodash from 'lodash'
 import type { technologyJobType } from '../person-interface'
 import userListDialog from './userListDialog.vue'
-import { getUserList } from '@/api/system/user'
+import { getUserList, roleAssign } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
 import { toTreeList } from '@/utils/structure'
@@ -14,6 +14,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
+import { getRoleTreeListByUser } from '@/api/system/role'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const $route = useRoute()
 const $router = useRouter()
@@ -161,8 +162,11 @@
 const selectPerson = () => {
   userListRef.value.initDialog()
 }
+const userInfoData = ref()
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
+  userInfoData.value = row
+  console.log(row, '选择的人员信息')
   ruleForm.value.name = row.name
   ruleForm.value.account = row.account
   ruleForm.value.deptId = row.deptId
@@ -506,10 +510,41 @@
             ? getStaffAdd({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })
             : getStaffupdate({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })).then((res) => {
             if (res.code == 200) {
-              formEl?.resetFields()
-              ElMessage.success('提交成功')
-              resetFormData()
-              $router.go(-1)
+              // formEl?.resetFields()
+              // ElMessage.success('提交成功')
+              // resetFormData()
+              // $router.go(-1)
+              // 获取当前用户角色
+              getRoleTreeListByUser(userInfoData.value.id).then((res) => {
+                console.log(res.data, '角色列表')
+                // 当前用户 角色 id
+                const roleIds: string[] = []
+                // 挑选 计量人员 角色id
+                let metering = ''
+                const data = res.data
+                data.forEach((item: any) => {
+                  // 当前用户角色
+                  if (item.checked) {
+                    roleIds.push(item.id)
+                  }
+                  // 计量人员角色
+                  if (item.name === '计量人员') {
+                    metering = item.id
+                  }
+                })
+                // 判断当前用户是否 计量人员角色
+                if (roleIds.every(item => item !== metering)) {
+                  roleIds.push(metering)
+                }
+                // 设置当前用户角色
+                roleAssign(userInfoData.value.id, roleIds).then((res) => {
+                  console.log('分配计量人员角色成功')
+                  formEl?.resetFields()
+                  ElMessage.success('提交成功')
+                  resetFormData()
+                  $router.go(-1)
+                })
+              })
             }
           })
         }

diff --git a/src/api/device/standingBook.ts b/src/api/device/standingBook.ts
index 0f47a88..fe3c99e 100644
--- a/src/api/device/standingBook.ts
+++ b/src/api/device/standingBook.ts
@@ -35,7 +35,7 @@
   })
 }
 // 批量导入测量设备信息
-export function listImporttApi(data: FormData) {
+export function listImportApi(data: FormData) {
   return request({
     url: '/meter/assets/importMeterEquipment',
     method: 'post',
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/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 3452009..5ec3c4d 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -418,7 +418,7 @@
             <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === 'detail' ? '' : '型号'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-        <el-col v-if="title === 'detail'" :span="6">
+        <el-col :span="6">
           <el-form-item label="管理状态" prop="managerState">
             <el-select v-model="ruleForm.managerState" :placeholder="title === 'detail' ? '' : '管理状态'" :disabled="title === 'detail'" clearable style="width: 100%;">
               <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
@@ -457,17 +457,17 @@
         </el-col>
       </el-row>
       <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item v-if="showAssetsItem" label="立卡年月" prop="cardEstablishmentDate">
+        <el-col v-if="showAssetsItem" :span="6">
+          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
             <el-date-picker
               v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === 'detail'"
               :placeholder="title === 'detail' ? '' : '立卡年月'"
               style="width: 100%;"
             />
           </el-form-item>
-          <el-form-item v-if="!showAssetsItem" label="原值" prop="originValue">
+          <!-- <el-form-item v-if="!showAssetsItem" label="原值" prop="originValue">
             <el-input v-model.trim="ruleForm.originValue" :placeholder="title === 'detail' ? '' : '原值'" :disabled="title === 'detail'" />
-          </el-form-item>
+          </el-form-item> -->
         </el-col>
         <el-col :span="6">
           <el-form-item label="启用日期" prop="enableDate">
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 9cd3c83..988ba08 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -166,7 +166,7 @@
     <!-- 展示区域 -->
 
     <!-- 添加证书信息组件 -->
-    <detail-block-switch v-if="pageType === 'detail'" :title="current">
+    <detail-block-switch v-if="pageType === 'detail' && $route.query.name !== '固定资产'" :title="current">
       <template #menu>
         <el-radio-group v-model="current">
           <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 65ec9ca..608d07c 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -8,7 +8,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { assetsDeleteApi, listExportApi, listPageApi } from '@/api/device/standingBook'
+import { assetsDeleteApi, listExportApi, listImportApi, listPageApi } from '@/api/device/standingBook'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
   /**
@@ -291,9 +291,9 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    listImportApi(fd).then((res) => {
       if (res.code === 200) {
-        ElMessage.success('上传成功')
+        ElMessage.success('批量导入成功')
       }
       else {
         ElMessage.error(res.message)
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index be8a578..4bdb187 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -5,7 +5,7 @@
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
-import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { assetsDeleteApi, listExportApi, listImportApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -213,7 +213,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    listImporttApi(fd).then((res) => {
+    listImportApi(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index dc21ae0..e6bb9a1 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,21 +221,39 @@
         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)
 })
 
 // 关闭弹窗
 const close = () => {
-  $router.go(-1)
+  $router.back()
 }
 
 // 保存
-const saveForm = async (formEl: FormInstance | undefined) => {
+const deviceManageSave = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -256,7 +281,7 @@
               // 成功
               ruleForm2.value.id = res.data
               ElMessage.success('操作成功')
-              $router.go(-1)
+              $router.back()
             }
           })
         }
@@ -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 }
@@ -299,7 +324,7 @@
               // }
               failUpdate({ ...ruleForm2.value }).then(() => {
                 ElMessage.success('操作成功!')
-                $router.go(-1)
+                $router.back()
               })
             })
           }
@@ -323,7 +348,7 @@
               }
               submitApply(params).then(() => {
                 ElMessage.success('操作成功!')
-                $router.go(-1)
+                $router.back()
               })
             })
           }
@@ -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.back()
+      }
+      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.back()
+      }
+      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.back()
+          }
+          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> -->
+          <!-- 新建 -->
+          <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="title === '编辑' && _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>
@@ -713,7 +820,7 @@
           <el-col :span="6">
             <el-form-item label="设备编号" prop="equipmentNo" class="equipmentNo">
               <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" disabled />
-              <el-button class="equipmentNo-item" type="default" :disabled="title === '详情'" @click="addRowBtn">
+              <el-button v-if="title !== '详情'" class="equipmentNo-item" type="default" @click="addRowBtn">
                 选择
               </el-button>
             </el-form-item>
@@ -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..3a7deae 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -10,11 +10,9 @@
   getStatusList,
   submitStatus,
 } from '@/api/device/stateManage'
-import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import type { dictType } from '@/views/device/receive/receive'
 import { exportFile } from '@/utils/exportUtils'
 
 // 选中的按钮
@@ -49,15 +47,19 @@
   delete: '/device/unusedApply/delete', // 删除
 }
 const activeTitle = ref<string>(props.title) // 状态按钮选中
-const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
-const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const approvalStatusVal = ref<string>(props.type)
+if (props.type == '0') {
+  approvalStatusVal.value = ''
+}
+// const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+// const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 const $router = useRouter()
 // 查询参数
 const searchQuery = reactive<ISearchQuery>({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
   applyUnit: '', // 申请单位
-  approvalStatus: '0', // 审批状态
+  approvalStatus: approvalStatusVal.value, // 审批状态
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
@@ -142,48 +144,12 @@
   searchQuery.formId = SCHEDULE[props.formCode as keyof typeof SCHEDULE]
 }
 
-// 获取字典值
-async function getDict() {
-  managerStateList.value = []
-  // 审批状态
-  const res = await getDictByCode('approvalStatus')
-  // 审批状态字典 {1：草稿箱}
-  res.data.forEach((item: any) => {
-    approvalStatusMap.value[`${item.value}`] = item.name
-  })
-
-  // 审批状态字典 {草稿箱: 1}
-  res.data.forEach((item: any) => {
-    approvalStatusReserveMap.value[item.name] = `${item.value}`
-  })
-
-  // 制作右上角的菜单
-  res.data.forEach((item: dictType) => {
-    if (item.name === '全部' || item.name === '草稿箱'
-      || item.name === '待审批' || item.name === '审批中'
-      || item.name === '已通过' || item.name === '未通过'
-      || item.name === '已取消') {
-      managerStateList.value.push({
-        name: item.name,
-        value: item.name,
-        id: `${item.value}`,
-      })
-    }
-  })
-}
-
 // 获取数据列表
 const getList = () => {
-  getDict()
   loadingTable.value = true
   getStatusList(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map((item: ITableRow) => {
-        return {
-          ...item,
-          approvalStatus: approvalStatusMap[item.approvalStatus],
-        }
-      })
+      list.value = res.data.rows
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -192,6 +158,7 @@
       loadingTable.value = false
     })
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -214,6 +181,8 @@
       title: '详情',
       name: props.name,
       applyType: props.applyType,
+      approvalStatusName: row.approvalStatusName,
+
     },
   })
 }
@@ -229,6 +198,8 @@
       title: '编辑',
       name: props.name,
       applyType: props.applyType,
+      approvalStatusName: row.approvalStatusName,
+
     },
   })
 }
@@ -336,6 +307,7 @@
       title: '新建',
       name: props.name,
       applyType: props.applyType,
+      formId: searchQuery.formId,
     },
   })
 }
@@ -418,31 +390,9 @@
   dialogVisible.value = false
 }
 
-watch(() => searchQuery.applyStatus, (newValue) => {
-  if (newValue == '') {
-    searchQuery.approvalStatus = '0'
-  }
-  else {
-    searchQuery.approvalStatus = approvalStatusReserveMap.value[newValue]
-  }
+onMounted(() => {
+  getList()
 })
-
-watch(
-  () => props.type,
-  (newValue) => {
-    if (newValue === '0') {
-      searchQuery.approvalStatus = '0'
-    }
-    else {
-      searchQuery.approvalStatus = newValue
-    }
-    getList()
-  },
-  {
-    immediate: true,
-    deep: true,
-  },
-)
 </script>
 
 <template>
@@ -610,7 +560,7 @@
                 <el-button
                   v-if="proxy.buttonPerm.cancel.if(row, permUrl.cancel)"
                   size="small"
-                  type="text"
+                  type="info"
                   link
                   :disabled="proxy.buttonPerm.cancel.disabled(row)"
                   @click="cancel(row)"
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index a15ce23..2d07167 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -43,7 +43,7 @@
 ])
 const statusList = ref<menuType[]>([])
 const type = ref('') // 当前状态的value
-const current = ref('全部')
+const current = ref('')
 const currentComp = shallowRef(all)
 watch(current, async (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
@@ -63,8 +63,14 @@
 onUnmounted(() => {
   sessionStorage.setItem(`${props.authority}Menu`, current.value)
 })
-onMounted(() => {
+onMounted(async () => {
+  await getDictByCode('approvalStatus').then((res) => {
+    statusList.value = (res.data as menuType[])
+  })
   current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  if (statusList.value.length > 0) {
+    type.value = statusList.value.filter(item => item.name === current.value)[0].value || ''
+  }
   sessionStorage.getItem(`${props.authority}Menu`) ? sessionStorage.removeItem(`${props.authority}Menu`) : ''
 })
 </script>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 088cb52..733efc3 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -6,7 +6,7 @@
 import lodash from 'lodash'
 import type { technologyJobType } from '../person-interface'
 import userListDialog from './userListDialog.vue'
-import { getUserList } from '@/api/system/user'
+import { getUserList, roleAssign } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
 import { toTreeList } from '@/utils/structure'
@@ -14,6 +14,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
+import { getRoleTreeListByUser } from '@/api/system/role'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const $route = useRoute()
 const $router = useRouter()
@@ -161,8 +162,11 @@
 const selectPerson = () => {
   userListRef.value.initDialog()
 }
+const userInfoData = ref()
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
+  userInfoData.value = row
+  console.log(row, '选择的人员信息')
   ruleForm.value.name = row.name
   ruleForm.value.account = row.account
   ruleForm.value.deptId = row.deptId
@@ -506,10 +510,41 @@
             ? getStaffAdd({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })
             : getStaffupdate({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })).then((res) => {
             if (res.code == 200) {
-              formEl?.resetFields()
-              ElMessage.success('提交成功')
-              resetFormData()
-              $router.go(-1)
+              // formEl?.resetFields()
+              // ElMessage.success('提交成功')
+              // resetFormData()
+              // $router.go(-1)
+              // 获取当前用户角色
+              getRoleTreeListByUser(userInfoData.value.id).then((res) => {
+                console.log(res.data, '角色列表')
+                // 当前用户 角色 id
+                const roleIds: string[] = []
+                // 挑选 计量人员 角色id
+                let metering = ''
+                const data = res.data
+                data.forEach((item: any) => {
+                  // 当前用户角色
+                  if (item.checked) {
+                    roleIds.push(item.id)
+                  }
+                  // 计量人员角色
+                  if (item.name === '计量人员') {
+                    metering = item.id
+                  }
+                })
+                // 判断当前用户是否 计量人员角色
+                if (roleIds.every(item => item !== metering)) {
+                  roleIds.push(metering)
+                }
+                // 设置当前用户角色
+                roleAssign(userInfoData.value.id, roleIds).then((res) => {
+                  console.log('分配计量人员角色成功')
+                  formEl?.resetFields()
+                  ElMessage.success('提交成功')
+                  resetFormData()
+                  $router.go(-1)
+                })
+              })
             }
           })
         }
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 79c8659..ecda4cf 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,6 +3,8 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { StaffListType, StaffType } from './person-interface'
 import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+import { getRoleTreeListByUser } from '@/api/system/role'
+import { roleAssign } from '@/api/system/user'
 // import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -104,6 +106,8 @@
 
 // 删除
 const remove = (row: StaffType) => {
+  // 当前用户id
+  const userId = row.userId as string
   ElMessageBox.confirm(
     `确认删除${row.name}吗？`,
     '提示',
@@ -116,11 +120,41 @@
     .then(() => {
       getStaffDelete({ id: row.id as string }).then((res) => {
         if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
+          // ElMessage({
+          //   type: 'success',
+          //   message: '删除成功',
+          // })
+          // getList()
+          // 删除用户的 计量人员 角色
+          // 获取当前用户角色
+          getRoleTreeListByUser(userId).then((res) => {
+            console.log(res.data, '角色列表')
+            // 当前用户 角色 id
+            let roleIds: string[] = []
+            // 挑选 计量人员 角色id
+            let metering = ''
+            const data = res.data
+            data.forEach((item: any) => {
+              // 当前用户角色
+              if (item.checked) {
+                roleIds.push(item.id)
+              }
+              // 计量人员角色
+              if (item.name === '计量人员') {
+                metering = item.id
+              }
+            })
+            roleIds = roleIds.filter(item => item !== metering)
+            // 设置当前用户角色
+            roleAssign(userId, roleIds).then((res) => {
+              console.log('删除计量人员角色成功')
+              ElMessage({
+                type: 'success',
+                message: '删除成功',
+              })
+              getList()
+            })
           })
-          getList()
         }
       })
     })
@@ -308,7 +342,7 @@
                 <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-show="false" v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>

diff --git a/src/api/device/standingBook.ts b/src/api/device/standingBook.ts
index 0f47a88..fe3c99e 100644
--- a/src/api/device/standingBook.ts
+++ b/src/api/device/standingBook.ts
@@ -35,7 +35,7 @@
   })
 }
 // 批量导入测量设备信息
-export function listImporttApi(data: FormData) {
+export function listImportApi(data: FormData) {
   return request({
     url: '/meter/assets/importMeterEquipment',
     method: 'post',
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/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 3452009..5ec3c4d 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -418,7 +418,7 @@
             <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === 'detail' ? '' : '型号'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-        <el-col v-if="title === 'detail'" :span="6">
+        <el-col :span="6">
           <el-form-item label="管理状态" prop="managerState">
             <el-select v-model="ruleForm.managerState" :placeholder="title === 'detail' ? '' : '管理状态'" :disabled="title === 'detail'" clearable style="width: 100%;">
               <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
@@ -457,17 +457,17 @@
         </el-col>
       </el-row>
       <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item v-if="showAssetsItem" label="立卡年月" prop="cardEstablishmentDate">
+        <el-col v-if="showAssetsItem" :span="6">
+          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
             <el-date-picker
               v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === 'detail'"
               :placeholder="title === 'detail' ? '' : '立卡年月'"
               style="width: 100%;"
             />
           </el-form-item>
-          <el-form-item v-if="!showAssetsItem" label="原值" prop="originValue">
+          <!-- <el-form-item v-if="!showAssetsItem" label="原值" prop="originValue">
             <el-input v-model.trim="ruleForm.originValue" :placeholder="title === 'detail' ? '' : '原值'" :disabled="title === 'detail'" />
-          </el-form-item>
+          </el-form-item> -->
         </el-col>
         <el-col :span="6">
           <el-form-item label="启用日期" prop="enableDate">
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 9cd3c83..988ba08 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -166,7 +166,7 @@
     <!-- 展示区域 -->
 
     <!-- 添加证书信息组件 -->
-    <detail-block-switch v-if="pageType === 'detail'" :title="current">
+    <detail-block-switch v-if="pageType === 'detail' && $route.query.name !== '固定资产'" :title="current">
       <template #menu>
         <el-radio-group v-model="current">
           <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 65ec9ca..608d07c 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -8,7 +8,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { assetsDeleteApi, listExportApi, listPageApi } from '@/api/device/standingBook'
+import { assetsDeleteApi, listExportApi, listImportApi, listPageApi } from '@/api/device/standingBook'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
   /**
@@ -291,9 +291,9 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    listImportApi(fd).then((res) => {
       if (res.code === 200) {
-        ElMessage.success('上传成功')
+        ElMessage.success('批量导入成功')
       }
       else {
         ElMessage.error(res.message)
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index be8a578..4bdb187 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -5,7 +5,7 @@
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
-import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { assetsDeleteApi, listExportApi, listImportApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -213,7 +213,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    listImporttApi(fd).then((res) => {
+    listImportApi(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index dc21ae0..e6bb9a1 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,21 +221,39 @@
         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)
 })
 
 // 关闭弹窗
 const close = () => {
-  $router.go(-1)
+  $router.back()
 }
 
 // 保存
-const saveForm = async (formEl: FormInstance | undefined) => {
+const deviceManageSave = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -256,7 +281,7 @@
               // 成功
               ruleForm2.value.id = res.data
               ElMessage.success('操作成功')
-              $router.go(-1)
+              $router.back()
             }
           })
         }
@@ -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 }
@@ -299,7 +324,7 @@
               // }
               failUpdate({ ...ruleForm2.value }).then(() => {
                 ElMessage.success('操作成功!')
-                $router.go(-1)
+                $router.back()
               })
             })
           }
@@ -323,7 +348,7 @@
               }
               submitApply(params).then(() => {
                 ElMessage.success('操作成功!')
-                $router.go(-1)
+                $router.back()
               })
             })
           }
@@ -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.back()
+      }
+      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.back()
+      }
+      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.back()
+          }
+          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> -->
+          <!-- 新建 -->
+          <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="title === '编辑' && _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>
@@ -713,7 +820,7 @@
           <el-col :span="6">
             <el-form-item label="设备编号" prop="equipmentNo" class="equipmentNo">
               <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" disabled />
-              <el-button class="equipmentNo-item" type="default" :disabled="title === '详情'" @click="addRowBtn">
+              <el-button v-if="title !== '详情'" class="equipmentNo-item" type="default" @click="addRowBtn">
                 选择
               </el-button>
             </el-form-item>
@@ -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..3a7deae 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -10,11 +10,9 @@
   getStatusList,
   submitStatus,
 } from '@/api/device/stateManage'
-import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import type { dictType } from '@/views/device/receive/receive'
 import { exportFile } from '@/utils/exportUtils'
 
 // 选中的按钮
@@ -49,15 +47,19 @@
   delete: '/device/unusedApply/delete', // 删除
 }
 const activeTitle = ref<string>(props.title) // 状态按钮选中
-const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
-const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const approvalStatusVal = ref<string>(props.type)
+if (props.type == '0') {
+  approvalStatusVal.value = ''
+}
+// const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+// const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 const $router = useRouter()
 // 查询参数
 const searchQuery = reactive<ISearchQuery>({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
   applyUnit: '', // 申请单位
-  approvalStatus: '0', // 审批状态
+  approvalStatus: approvalStatusVal.value, // 审批状态
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
@@ -142,48 +144,12 @@
   searchQuery.formId = SCHEDULE[props.formCode as keyof typeof SCHEDULE]
 }
 
-// 获取字典值
-async function getDict() {
-  managerStateList.value = []
-  // 审批状态
-  const res = await getDictByCode('approvalStatus')
-  // 审批状态字典 {1：草稿箱}
-  res.data.forEach((item: any) => {
-    approvalStatusMap.value[`${item.value}`] = item.name
-  })
-
-  // 审批状态字典 {草稿箱: 1}
-  res.data.forEach((item: any) => {
-    approvalStatusReserveMap.value[item.name] = `${item.value}`
-  })
-
-  // 制作右上角的菜单
-  res.data.forEach((item: dictType) => {
-    if (item.name === '全部' || item.name === '草稿箱'
-      || item.name === '待审批' || item.name === '审批中'
-      || item.name === '已通过' || item.name === '未通过'
-      || item.name === '已取消') {
-      managerStateList.value.push({
-        name: item.name,
-        value: item.name,
-        id: `${item.value}`,
-      })
-    }
-  })
-}
-
 // 获取数据列表
 const getList = () => {
-  getDict()
   loadingTable.value = true
   getStatusList(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map((item: ITableRow) => {
-        return {
-          ...item,
-          approvalStatus: approvalStatusMap[item.approvalStatus],
-        }
-      })
+      list.value = res.data.rows
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -192,6 +158,7 @@
       loadingTable.value = false
     })
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -214,6 +181,8 @@
       title: '详情',
       name: props.name,
       applyType: props.applyType,
+      approvalStatusName: row.approvalStatusName,
+
     },
   })
 }
@@ -229,6 +198,8 @@
       title: '编辑',
       name: props.name,
       applyType: props.applyType,
+      approvalStatusName: row.approvalStatusName,
+
     },
   })
 }
@@ -336,6 +307,7 @@
       title: '新建',
       name: props.name,
       applyType: props.applyType,
+      formId: searchQuery.formId,
     },
   })
 }
@@ -418,31 +390,9 @@
   dialogVisible.value = false
 }
 
-watch(() => searchQuery.applyStatus, (newValue) => {
-  if (newValue == '') {
-    searchQuery.approvalStatus = '0'
-  }
-  else {
-    searchQuery.approvalStatus = approvalStatusReserveMap.value[newValue]
-  }
+onMounted(() => {
+  getList()
 })
-
-watch(
-  () => props.type,
-  (newValue) => {
-    if (newValue === '0') {
-      searchQuery.approvalStatus = '0'
-    }
-    else {
-      searchQuery.approvalStatus = newValue
-    }
-    getList()
-  },
-  {
-    immediate: true,
-    deep: true,
-  },
-)
 </script>
 
 <template>
@@ -610,7 +560,7 @@
                 <el-button
                   v-if="proxy.buttonPerm.cancel.if(row, permUrl.cancel)"
                   size="small"
-                  type="text"
+                  type="info"
                   link
                   :disabled="proxy.buttonPerm.cancel.disabled(row)"
                   @click="cancel(row)"
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index a15ce23..2d07167 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -43,7 +43,7 @@
 ])
 const statusList = ref<menuType[]>([])
 const type = ref('') // 当前状态的value
-const current = ref('全部')
+const current = ref('')
 const currentComp = shallowRef(all)
 watch(current, async (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
@@ -63,8 +63,14 @@
 onUnmounted(() => {
   sessionStorage.setItem(`${props.authority}Menu`, current.value)
 })
-onMounted(() => {
+onMounted(async () => {
+  await getDictByCode('approvalStatus').then((res) => {
+    statusList.value = (res.data as menuType[])
+  })
   current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  if (statusList.value.length > 0) {
+    type.value = statusList.value.filter(item => item.name === current.value)[0].value || ''
+  }
   sessionStorage.getItem(`${props.authority}Menu`) ? sessionStorage.removeItem(`${props.authority}Menu`) : ''
 })
 </script>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 088cb52..733efc3 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -6,7 +6,7 @@
 import lodash from 'lodash'
 import type { technologyJobType } from '../person-interface'
 import userListDialog from './userListDialog.vue'
-import { getUserList } from '@/api/system/user'
+import { getUserList, roleAssign } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
 import { toTreeList } from '@/utils/structure'
@@ -14,6 +14,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
+import { getRoleTreeListByUser } from '@/api/system/role'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const $route = useRoute()
 const $router = useRouter()
@@ -161,8 +162,11 @@
 const selectPerson = () => {
   userListRef.value.initDialog()
 }
+const userInfoData = ref()
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
+  userInfoData.value = row
+  console.log(row, '选择的人员信息')
   ruleForm.value.name = row.name
   ruleForm.value.account = row.account
   ruleForm.value.deptId = row.deptId
@@ -506,10 +510,41 @@
             ? getStaffAdd({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })
             : getStaffupdate({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })).then((res) => {
             if (res.code == 200) {
-              formEl?.resetFields()
-              ElMessage.success('提交成功')
-              resetFormData()
-              $router.go(-1)
+              // formEl?.resetFields()
+              // ElMessage.success('提交成功')
+              // resetFormData()
+              // $router.go(-1)
+              // 获取当前用户角色
+              getRoleTreeListByUser(userInfoData.value.id).then((res) => {
+                console.log(res.data, '角色列表')
+                // 当前用户 角色 id
+                const roleIds: string[] = []
+                // 挑选 计量人员 角色id
+                let metering = ''
+                const data = res.data
+                data.forEach((item: any) => {
+                  // 当前用户角色
+                  if (item.checked) {
+                    roleIds.push(item.id)
+                  }
+                  // 计量人员角色
+                  if (item.name === '计量人员') {
+                    metering = item.id
+                  }
+                })
+                // 判断当前用户是否 计量人员角色
+                if (roleIds.every(item => item !== metering)) {
+                  roleIds.push(metering)
+                }
+                // 设置当前用户角色
+                roleAssign(userInfoData.value.id, roleIds).then((res) => {
+                  console.log('分配计量人员角色成功')
+                  formEl?.resetFields()
+                  ElMessage.success('提交成功')
+                  resetFormData()
+                  $router.go(-1)
+                })
+              })
             }
           })
         }
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 79c8659..ecda4cf 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,6 +3,8 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { StaffListType, StaffType } from './person-interface'
 import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+import { getRoleTreeListByUser } from '@/api/system/role'
+import { roleAssign } from '@/api/system/user'
 // import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -104,6 +106,8 @@
 
 // 删除
 const remove = (row: StaffType) => {
+  // 当前用户id
+  const userId = row.userId as string
   ElMessageBox.confirm(
     `确认删除${row.name}吗？`,
     '提示',
@@ -116,11 +120,41 @@
     .then(() => {
       getStaffDelete({ id: row.id as string }).then((res) => {
         if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
+          // ElMessage({
+          //   type: 'success',
+          //   message: '删除成功',
+          // })
+          // getList()
+          // 删除用户的 计量人员 角色
+          // 获取当前用户角色
+          getRoleTreeListByUser(userId).then((res) => {
+            console.log(res.data, '角色列表')
+            // 当前用户 角色 id
+            let roleIds: string[] = []
+            // 挑选 计量人员 角色id
+            let metering = ''
+            const data = res.data
+            data.forEach((item: any) => {
+              // 当前用户角色
+              if (item.checked) {
+                roleIds.push(item.id)
+              }
+              // 计量人员角色
+              if (item.name === '计量人员') {
+                metering = item.id
+              }
+            })
+            roleIds = roleIds.filter(item => item !== metering)
+            // 设置当前用户角色
+            roleAssign(userId, roleIds).then((res) => {
+              console.log('删除计量人员角色成功')
+              ElMessage({
+                type: 'success',
+                message: '删除成功',
+              })
+              getList()
+            })
           })
-          getList()
         }
       })
     })
@@ -308,7 +342,7 @@
                 <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-show="false" v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 1b92963..54caa66 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -1,4 +1,4 @@
-// 计量人员列表查询参数类型
+// 计量人员列表查询参数类型string
 export interface StaffListType {
   staffNo: string // 人员编号
   name: string // 姓名
@@ -14,6 +14,7 @@
 }
 // 计量人员类型
 export interface StaffType {
+  userId?: string
   account: string
   administrationJob: string
   birthday: string

diff --git a/src/api/device/standingBook.ts b/src/api/device/standingBook.ts
index 0f47a88..fe3c99e 100644
--- a/src/api/device/standingBook.ts
+++ b/src/api/device/standingBook.ts
@@ -35,7 +35,7 @@
   })
 }
 // 批量导入测量设备信息
-export function listImporttApi(data: FormData) {
+export function listImportApi(data: FormData) {
   return request({
     url: '/meter/assets/importMeterEquipment',
     method: 'post',
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/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 3452009..5ec3c4d 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -418,7 +418,7 @@
             <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === 'detail' ? '' : '型号'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-        <el-col v-if="title === 'detail'" :span="6">
+        <el-col :span="6">
           <el-form-item label="管理状态" prop="managerState">
             <el-select v-model="ruleForm.managerState" :placeholder="title === 'detail' ? '' : '管理状态'" :disabled="title === 'detail'" clearable style="width: 100%;">
               <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
@@ -457,17 +457,17 @@
         </el-col>
       </el-row>
       <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item v-if="showAssetsItem" label="立卡年月" prop="cardEstablishmentDate">
+        <el-col v-if="showAssetsItem" :span="6">
+          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
             <el-date-picker
               v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === 'detail'"
               :placeholder="title === 'detail' ? '' : '立卡年月'"
               style="width: 100%;"
             />
           </el-form-item>
-          <el-form-item v-if="!showAssetsItem" label="原值" prop="originValue">
+          <!-- <el-form-item v-if="!showAssetsItem" label="原值" prop="originValue">
             <el-input v-model.trim="ruleForm.originValue" :placeholder="title === 'detail' ? '' : '原值'" :disabled="title === 'detail'" />
-          </el-form-item>
+          </el-form-item> -->
         </el-col>
         <el-col :span="6">
           <el-form-item label="启用日期" prop="enableDate">
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 9cd3c83..988ba08 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -166,7 +166,7 @@
     <!-- 展示区域 -->
 
     <!-- 添加证书信息组件 -->
-    <detail-block-switch v-if="pageType === 'detail'" :title="current">
+    <detail-block-switch v-if="pageType === 'detail' && $route.query.name !== '固定资产'" :title="current">
       <template #menu>
         <el-radio-group v-model="current">
           <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 65ec9ca..608d07c 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -8,7 +8,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { assetsDeleteApi, listExportApi, listPageApi } from '@/api/device/standingBook'
+import { assetsDeleteApi, listExportApi, listImportApi, listPageApi } from '@/api/device/standingBook'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
   /**
@@ -291,9 +291,9 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    listImportApi(fd).then((res) => {
       if (res.code === 200) {
-        ElMessage.success('上传成功')
+        ElMessage.success('批量导入成功')
       }
       else {
         ElMessage.error(res.message)
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index be8a578..4bdb187 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -5,7 +5,7 @@
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
-import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { assetsDeleteApi, listExportApi, listImportApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -213,7 +213,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    listImporttApi(fd).then((res) => {
+    listImportApi(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index dc21ae0..e6bb9a1 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,21 +221,39 @@
         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)
 })
 
 // 关闭弹窗
 const close = () => {
-  $router.go(-1)
+  $router.back()
 }
 
 // 保存
-const saveForm = async (formEl: FormInstance | undefined) => {
+const deviceManageSave = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -256,7 +281,7 @@
               // 成功
               ruleForm2.value.id = res.data
               ElMessage.success('操作成功')
-              $router.go(-1)
+              $router.back()
             }
           })
         }
@@ -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 }
@@ -299,7 +324,7 @@
               // }
               failUpdate({ ...ruleForm2.value }).then(() => {
                 ElMessage.success('操作成功!')
-                $router.go(-1)
+                $router.back()
               })
             })
           }
@@ -323,7 +348,7 @@
               }
               submitApply(params).then(() => {
                 ElMessage.success('操作成功!')
-                $router.go(-1)
+                $router.back()
               })
             })
           }
@@ -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.back()
+      }
+      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.back()
+      }
+      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.back()
+          }
+          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> -->
+          <!-- 新建 -->
+          <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="title === '编辑' && _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>
@@ -713,7 +820,7 @@
           <el-col :span="6">
             <el-form-item label="设备编号" prop="equipmentNo" class="equipmentNo">
               <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" disabled />
-              <el-button class="equipmentNo-item" type="default" :disabled="title === '详情'" @click="addRowBtn">
+              <el-button v-if="title !== '详情'" class="equipmentNo-item" type="default" @click="addRowBtn">
                 选择
               </el-button>
             </el-form-item>
@@ -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..3a7deae 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -10,11 +10,9 @@
   getStatusList,
   submitStatus,
 } from '@/api/device/stateManage'
-import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import type { dictType } from '@/views/device/receive/receive'
 import { exportFile } from '@/utils/exportUtils'
 
 // 选中的按钮
@@ -49,15 +47,19 @@
   delete: '/device/unusedApply/delete', // 删除
 }
 const activeTitle = ref<string>(props.title) // 状态按钮选中
-const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
-const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const approvalStatusVal = ref<string>(props.type)
+if (props.type == '0') {
+  approvalStatusVal.value = ''
+}
+// const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+// const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 const $router = useRouter()
 // 查询参数
 const searchQuery = reactive<ISearchQuery>({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
   applyUnit: '', // 申请单位
-  approvalStatus: '0', // 审批状态
+  approvalStatus: approvalStatusVal.value, // 审批状态
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
@@ -142,48 +144,12 @@
   searchQuery.formId = SCHEDULE[props.formCode as keyof typeof SCHEDULE]
 }
 
-// 获取字典值
-async function getDict() {
-  managerStateList.value = []
-  // 审批状态
-  const res = await getDictByCode('approvalStatus')
-  // 审批状态字典 {1：草稿箱}
-  res.data.forEach((item: any) => {
-    approvalStatusMap.value[`${item.value}`] = item.name
-  })
-
-  // 审批状态字典 {草稿箱: 1}
-  res.data.forEach((item: any) => {
-    approvalStatusReserveMap.value[item.name] = `${item.value}`
-  })
-
-  // 制作右上角的菜单
-  res.data.forEach((item: dictType) => {
-    if (item.name === '全部' || item.name === '草稿箱'
-      || item.name === '待审批' || item.name === '审批中'
-      || item.name === '已通过' || item.name === '未通过'
-      || item.name === '已取消') {
-      managerStateList.value.push({
-        name: item.name,
-        value: item.name,
-        id: `${item.value}`,
-      })
-    }
-  })
-}
-
 // 获取数据列表
 const getList = () => {
-  getDict()
   loadingTable.value = true
   getStatusList(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map((item: ITableRow) => {
-        return {
-          ...item,
-          approvalStatus: approvalStatusMap[item.approvalStatus],
-        }
-      })
+      list.value = res.data.rows
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -192,6 +158,7 @@
       loadingTable.value = false
     })
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -214,6 +181,8 @@
       title: '详情',
       name: props.name,
       applyType: props.applyType,
+      approvalStatusName: row.approvalStatusName,
+
     },
   })
 }
@@ -229,6 +198,8 @@
       title: '编辑',
       name: props.name,
       applyType: props.applyType,
+      approvalStatusName: row.approvalStatusName,
+
     },
   })
 }
@@ -336,6 +307,7 @@
       title: '新建',
       name: props.name,
       applyType: props.applyType,
+      formId: searchQuery.formId,
     },
   })
 }
@@ -418,31 +390,9 @@
   dialogVisible.value = false
 }
 
-watch(() => searchQuery.applyStatus, (newValue) => {
-  if (newValue == '') {
-    searchQuery.approvalStatus = '0'
-  }
-  else {
-    searchQuery.approvalStatus = approvalStatusReserveMap.value[newValue]
-  }
+onMounted(() => {
+  getList()
 })
-
-watch(
-  () => props.type,
-  (newValue) => {
-    if (newValue === '0') {
-      searchQuery.approvalStatus = '0'
-    }
-    else {
-      searchQuery.approvalStatus = newValue
-    }
-    getList()
-  },
-  {
-    immediate: true,
-    deep: true,
-  },
-)
 </script>
 
 <template>
@@ -610,7 +560,7 @@
                 <el-button
                   v-if="proxy.buttonPerm.cancel.if(row, permUrl.cancel)"
                   size="small"
-                  type="text"
+                  type="info"
                   link
                   :disabled="proxy.buttonPerm.cancel.disabled(row)"
                   @click="cancel(row)"
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index a15ce23..2d07167 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -43,7 +43,7 @@
 ])
 const statusList = ref<menuType[]>([])
 const type = ref('') // 当前状态的value
-const current = ref('全部')
+const current = ref('')
 const currentComp = shallowRef(all)
 watch(current, async (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
@@ -63,8 +63,14 @@
 onUnmounted(() => {
   sessionStorage.setItem(`${props.authority}Menu`, current.value)
 })
-onMounted(() => {
+onMounted(async () => {
+  await getDictByCode('approvalStatus').then((res) => {
+    statusList.value = (res.data as menuType[])
+  })
   current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  if (statusList.value.length > 0) {
+    type.value = statusList.value.filter(item => item.name === current.value)[0].value || ''
+  }
   sessionStorage.getItem(`${props.authority}Menu`) ? sessionStorage.removeItem(`${props.authority}Menu`) : ''
 })
 </script>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 088cb52..733efc3 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -6,7 +6,7 @@
 import lodash from 'lodash'
 import type { technologyJobType } from '../person-interface'
 import userListDialog from './userListDialog.vue'
-import { getUserList } from '@/api/system/user'
+import { getUserList, roleAssign } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
 import { toTreeList } from '@/utils/structure'
@@ -14,6 +14,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
+import { getRoleTreeListByUser } from '@/api/system/role'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const $route = useRoute()
 const $router = useRouter()
@@ -161,8 +162,11 @@
 const selectPerson = () => {
   userListRef.value.initDialog()
 }
+const userInfoData = ref()
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
+  userInfoData.value = row
+  console.log(row, '选择的人员信息')
   ruleForm.value.name = row.name
   ruleForm.value.account = row.account
   ruleForm.value.deptId = row.deptId
@@ -506,10 +510,41 @@
             ? getStaffAdd({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })
             : getStaffupdate({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })).then((res) => {
             if (res.code == 200) {
-              formEl?.resetFields()
-              ElMessage.success('提交成功')
-              resetFormData()
-              $router.go(-1)
+              // formEl?.resetFields()
+              // ElMessage.success('提交成功')
+              // resetFormData()
+              // $router.go(-1)
+              // 获取当前用户角色
+              getRoleTreeListByUser(userInfoData.value.id).then((res) => {
+                console.log(res.data, '角色列表')
+                // 当前用户 角色 id
+                const roleIds: string[] = []
+                // 挑选 计量人员 角色id
+                let metering = ''
+                const data = res.data
+                data.forEach((item: any) => {
+                  // 当前用户角色
+                  if (item.checked) {
+                    roleIds.push(item.id)
+                  }
+                  // 计量人员角色
+                  if (item.name === '计量人员') {
+                    metering = item.id
+                  }
+                })
+                // 判断当前用户是否 计量人员角色
+                if (roleIds.every(item => item !== metering)) {
+                  roleIds.push(metering)
+                }
+                // 设置当前用户角色
+                roleAssign(userInfoData.value.id, roleIds).then((res) => {
+                  console.log('分配计量人员角色成功')
+                  formEl?.resetFields()
+                  ElMessage.success('提交成功')
+                  resetFormData()
+                  $router.go(-1)
+                })
+              })
             }
           })
         }
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 79c8659..ecda4cf 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,6 +3,8 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { StaffListType, StaffType } from './person-interface'
 import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+import { getRoleTreeListByUser } from '@/api/system/role'
+import { roleAssign } from '@/api/system/user'
 // import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -104,6 +106,8 @@
 
 // 删除
 const remove = (row: StaffType) => {
+  // 当前用户id
+  const userId = row.userId as string
   ElMessageBox.confirm(
     `确认删除${row.name}吗？`,
     '提示',
@@ -116,11 +120,41 @@
     .then(() => {
       getStaffDelete({ id: row.id as string }).then((res) => {
         if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
+          // ElMessage({
+          //   type: 'success',
+          //   message: '删除成功',
+          // })
+          // getList()
+          // 删除用户的 计量人员 角色
+          // 获取当前用户角色
+          getRoleTreeListByUser(userId).then((res) => {
+            console.log(res.data, '角色列表')
+            // 当前用户 角色 id
+            let roleIds: string[] = []
+            // 挑选 计量人员 角色id
+            let metering = ''
+            const data = res.data
+            data.forEach((item: any) => {
+              // 当前用户角色
+              if (item.checked) {
+                roleIds.push(item.id)
+              }
+              // 计量人员角色
+              if (item.name === '计量人员') {
+                metering = item.id
+              }
+            })
+            roleIds = roleIds.filter(item => item !== metering)
+            // 设置当前用户角色
+            roleAssign(userId, roleIds).then((res) => {
+              console.log('删除计量人员角色成功')
+              ElMessage({
+                type: 'success',
+                message: '删除成功',
+              })
+              getList()
+            })
           })
-          getList()
         }
       })
     })
@@ -308,7 +342,7 @@
                 <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-show="false" v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 1b92963..54caa66 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -1,4 +1,4 @@
-// 计量人员列表查询参数类型
+// 计量人员列表查询参数类型string
 export interface StaffListType {
   staffNo: string // 人员编号
   name: string // 姓名
@@ -14,6 +14,7 @@
 }
 // 计量人员类型
 export interface StaffType {
+  userId?: string
   account: string
   administrationJob: string
   birthday: string
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: "";

diff --git a/src/api/device/standingBook.ts b/src/api/device/standingBook.ts
index 0f47a88..fe3c99e 100644
--- a/src/api/device/standingBook.ts
+++ b/src/api/device/standingBook.ts
@@ -35,7 +35,7 @@
   })
 }
 // 批量导入测量设备信息
-export function listImporttApi(data: FormData) {
+export function listImportApi(data: FormData) {
   return request({
     url: '/meter/assets/importMeterEquipment',
     method: 'post',
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/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 3452009..5ec3c4d 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -418,7 +418,7 @@
             <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === 'detail' ? '' : '型号'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-        <el-col v-if="title === 'detail'" :span="6">
+        <el-col :span="6">
           <el-form-item label="管理状态" prop="managerState">
             <el-select v-model="ruleForm.managerState" :placeholder="title === 'detail' ? '' : '管理状态'" :disabled="title === 'detail'" clearable style="width: 100%;">
               <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
@@ -457,17 +457,17 @@
         </el-col>
       </el-row>
       <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item v-if="showAssetsItem" label="立卡年月" prop="cardEstablishmentDate">
+        <el-col v-if="showAssetsItem" :span="6">
+          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
             <el-date-picker
               v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === 'detail'"
               :placeholder="title === 'detail' ? '' : '立卡年月'"
               style="width: 100%;"
             />
           </el-form-item>
-          <el-form-item v-if="!showAssetsItem" label="原值" prop="originValue">
+          <!-- <el-form-item v-if="!showAssetsItem" label="原值" prop="originValue">
             <el-input v-model.trim="ruleForm.originValue" :placeholder="title === 'detail' ? '' : '原值'" :disabled="title === 'detail'" />
-          </el-form-item>
+          </el-form-item> -->
         </el-col>
         <el-col :span="6">
           <el-form-item label="启用日期" prop="enableDate">
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 9cd3c83..988ba08 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -166,7 +166,7 @@
     <!-- 展示区域 -->
 
     <!-- 添加证书信息组件 -->
-    <detail-block-switch v-if="pageType === 'detail'" :title="current">
+    <detail-block-switch v-if="pageType === 'detail' && $route.query.name !== '固定资产'" :title="current">
       <template #menu>
         <el-radio-group v-model="current">
           <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 65ec9ca..608d07c 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -8,7 +8,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { assetsDeleteApi, listExportApi, listPageApi } from '@/api/device/standingBook'
+import { assetsDeleteApi, listExportApi, listImportApi, listPageApi } from '@/api/device/standingBook'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
   /**
@@ -291,9 +291,9 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    listImportApi(fd).then((res) => {
       if (res.code === 200) {
-        ElMessage.success('上传成功')
+        ElMessage.success('批量导入成功')
       }
       else {
         ElMessage.error(res.message)
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index be8a578..4bdb187 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -5,7 +5,7 @@
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
-import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { assetsDeleteApi, listExportApi, listImportApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -213,7 +213,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    listImporttApi(fd).then((res) => {
+    listImportApi(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index dc21ae0..e6bb9a1 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,21 +221,39 @@
         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)
 })
 
 // 关闭弹窗
 const close = () => {
-  $router.go(-1)
+  $router.back()
 }
 
 // 保存
-const saveForm = async (formEl: FormInstance | undefined) => {
+const deviceManageSave = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -256,7 +281,7 @@
               // 成功
               ruleForm2.value.id = res.data
               ElMessage.success('操作成功')
-              $router.go(-1)
+              $router.back()
             }
           })
         }
@@ -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 }
@@ -299,7 +324,7 @@
               // }
               failUpdate({ ...ruleForm2.value }).then(() => {
                 ElMessage.success('操作成功!')
-                $router.go(-1)
+                $router.back()
               })
             })
           }
@@ -323,7 +348,7 @@
               }
               submitApply(params).then(() => {
                 ElMessage.success('操作成功!')
-                $router.go(-1)
+                $router.back()
               })
             })
           }
@@ -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.back()
+      }
+      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.back()
+      }
+      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.back()
+          }
+          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> -->
+          <!-- 新建 -->
+          <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="title === '编辑' && _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>
@@ -713,7 +820,7 @@
           <el-col :span="6">
             <el-form-item label="设备编号" prop="equipmentNo" class="equipmentNo">
               <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" disabled />
-              <el-button class="equipmentNo-item" type="default" :disabled="title === '详情'" @click="addRowBtn">
+              <el-button v-if="title !== '详情'" class="equipmentNo-item" type="default" @click="addRowBtn">
                 选择
               </el-button>
             </el-form-item>
@@ -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..3a7deae 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -10,11 +10,9 @@
   getStatusList,
   submitStatus,
 } from '@/api/device/stateManage'
-import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import type { dictType } from '@/views/device/receive/receive'
 import { exportFile } from '@/utils/exportUtils'
 
 // 选中的按钮
@@ -49,15 +47,19 @@
   delete: '/device/unusedApply/delete', // 删除
 }
 const activeTitle = ref<string>(props.title) // 状态按钮选中
-const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
-const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const approvalStatusVal = ref<string>(props.type)
+if (props.type == '0') {
+  approvalStatusVal.value = ''
+}
+// const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+// const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 const $router = useRouter()
 // 查询参数
 const searchQuery = reactive<ISearchQuery>({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
   applyUnit: '', // 申请单位
-  approvalStatus: '0', // 审批状态
+  approvalStatus: approvalStatusVal.value, // 审批状态
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
@@ -142,48 +144,12 @@
   searchQuery.formId = SCHEDULE[props.formCode as keyof typeof SCHEDULE]
 }
 
-// 获取字典值
-async function getDict() {
-  managerStateList.value = []
-  // 审批状态
-  const res = await getDictByCode('approvalStatus')
-  // 审批状态字典 {1：草稿箱}
-  res.data.forEach((item: any) => {
-    approvalStatusMap.value[`${item.value}`] = item.name
-  })
-
-  // 审批状态字典 {草稿箱: 1}
-  res.data.forEach((item: any) => {
-    approvalStatusReserveMap.value[item.name] = `${item.value}`
-  })
-
-  // 制作右上角的菜单
-  res.data.forEach((item: dictType) => {
-    if (item.name === '全部' || item.name === '草稿箱'
-      || item.name === '待审批' || item.name === '审批中'
-      || item.name === '已通过' || item.name === '未通过'
-      || item.name === '已取消') {
-      managerStateList.value.push({
-        name: item.name,
-        value: item.name,
-        id: `${item.value}`,
-      })
-    }
-  })
-}
-
 // 获取数据列表
 const getList = () => {
-  getDict()
   loadingTable.value = true
   getStatusList(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map((item: ITableRow) => {
-        return {
-          ...item,
-          approvalStatus: approvalStatusMap[item.approvalStatus],
-        }
-      })
+      list.value = res.data.rows
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -192,6 +158,7 @@
       loadingTable.value = false
     })
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -214,6 +181,8 @@
       title: '详情',
       name: props.name,
       applyType: props.applyType,
+      approvalStatusName: row.approvalStatusName,
+
     },
   })
 }
@@ -229,6 +198,8 @@
       title: '编辑',
       name: props.name,
       applyType: props.applyType,
+      approvalStatusName: row.approvalStatusName,
+
     },
   })
 }
@@ -336,6 +307,7 @@
       title: '新建',
       name: props.name,
       applyType: props.applyType,
+      formId: searchQuery.formId,
     },
   })
 }
@@ -418,31 +390,9 @@
   dialogVisible.value = false
 }
 
-watch(() => searchQuery.applyStatus, (newValue) => {
-  if (newValue == '') {
-    searchQuery.approvalStatus = '0'
-  }
-  else {
-    searchQuery.approvalStatus = approvalStatusReserveMap.value[newValue]
-  }
+onMounted(() => {
+  getList()
 })
-
-watch(
-  () => props.type,
-  (newValue) => {
-    if (newValue === '0') {
-      searchQuery.approvalStatus = '0'
-    }
-    else {
-      searchQuery.approvalStatus = newValue
-    }
-    getList()
-  },
-  {
-    immediate: true,
-    deep: true,
-  },
-)
 </script>
 
 <template>
@@ -610,7 +560,7 @@
                 <el-button
                   v-if="proxy.buttonPerm.cancel.if(row, permUrl.cancel)"
                   size="small"
-                  type="text"
+                  type="info"
                   link
                   :disabled="proxy.buttonPerm.cancel.disabled(row)"
                   @click="cancel(row)"
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index a15ce23..2d07167 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -43,7 +43,7 @@
 ])
 const statusList = ref<menuType[]>([])
 const type = ref('') // 当前状态的value
-const current = ref('全部')
+const current = ref('')
 const currentComp = shallowRef(all)
 watch(current, async (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
@@ -63,8 +63,14 @@
 onUnmounted(() => {
   sessionStorage.setItem(`${props.authority}Menu`, current.value)
 })
-onMounted(() => {
+onMounted(async () => {
+  await getDictByCode('approvalStatus').then((res) => {
+    statusList.value = (res.data as menuType[])
+  })
   current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  if (statusList.value.length > 0) {
+    type.value = statusList.value.filter(item => item.name === current.value)[0].value || ''
+  }
   sessionStorage.getItem(`${props.authority}Menu`) ? sessionStorage.removeItem(`${props.authority}Menu`) : ''
 })
 </script>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 088cb52..733efc3 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -6,7 +6,7 @@
 import lodash from 'lodash'
 import type { technologyJobType } from '../person-interface'
 import userListDialog from './userListDialog.vue'
-import { getUserList } from '@/api/system/user'
+import { getUserList, roleAssign } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
 import { toTreeList } from '@/utils/structure'
@@ -14,6 +14,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
+import { getRoleTreeListByUser } from '@/api/system/role'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const $route = useRoute()
 const $router = useRouter()
@@ -161,8 +162,11 @@
 const selectPerson = () => {
   userListRef.value.initDialog()
 }
+const userInfoData = ref()
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
+  userInfoData.value = row
+  console.log(row, '选择的人员信息')
   ruleForm.value.name = row.name
   ruleForm.value.account = row.account
   ruleForm.value.deptId = row.deptId
@@ -506,10 +510,41 @@
             ? getStaffAdd({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })
             : getStaffupdate({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })).then((res) => {
             if (res.code == 200) {
-              formEl?.resetFields()
-              ElMessage.success('提交成功')
-              resetFormData()
-              $router.go(-1)
+              // formEl?.resetFields()
+              // ElMessage.success('提交成功')
+              // resetFormData()
+              // $router.go(-1)
+              // 获取当前用户角色
+              getRoleTreeListByUser(userInfoData.value.id).then((res) => {
+                console.log(res.data, '角色列表')
+                // 当前用户 角色 id
+                const roleIds: string[] = []
+                // 挑选 计量人员 角色id
+                let metering = ''
+                const data = res.data
+                data.forEach((item: any) => {
+                  // 当前用户角色
+                  if (item.checked) {
+                    roleIds.push(item.id)
+                  }
+                  // 计量人员角色
+                  if (item.name === '计量人员') {
+                    metering = item.id
+                  }
+                })
+                // 判断当前用户是否 计量人员角色
+                if (roleIds.every(item => item !== metering)) {
+                  roleIds.push(metering)
+                }
+                // 设置当前用户角色
+                roleAssign(userInfoData.value.id, roleIds).then((res) => {
+                  console.log('分配计量人员角色成功')
+                  formEl?.resetFields()
+                  ElMessage.success('提交成功')
+                  resetFormData()
+                  $router.go(-1)
+                })
+              })
             }
           })
         }
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 79c8659..ecda4cf 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,6 +3,8 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { StaffListType, StaffType } from './person-interface'
 import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+import { getRoleTreeListByUser } from '@/api/system/role'
+import { roleAssign } from '@/api/system/user'
 // import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -104,6 +106,8 @@
 
 // 删除
 const remove = (row: StaffType) => {
+  // 当前用户id
+  const userId = row.userId as string
   ElMessageBox.confirm(
     `确认删除${row.name}吗？`,
     '提示',
@@ -116,11 +120,41 @@
     .then(() => {
       getStaffDelete({ id: row.id as string }).then((res) => {
         if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
+          // ElMessage({
+          //   type: 'success',
+          //   message: '删除成功',
+          // })
+          // getList()
+          // 删除用户的 计量人员 角色
+          // 获取当前用户角色
+          getRoleTreeListByUser(userId).then((res) => {
+            console.log(res.data, '角色列表')
+            // 当前用户 角色 id
+            let roleIds: string[] = []
+            // 挑选 计量人员 角色id
+            let metering = ''
+            const data = res.data
+            data.forEach((item: any) => {
+              // 当前用户角色
+              if (item.checked) {
+                roleIds.push(item.id)
+              }
+              // 计量人员角色
+              if (item.name === '计量人员') {
+                metering = item.id
+              }
+            })
+            roleIds = roleIds.filter(item => item !== metering)
+            // 设置当前用户角色
+            roleAssign(userId, roleIds).then((res) => {
+              console.log('删除计量人员角色成功')
+              ElMessage({
+                type: 'success',
+                message: '删除成功',
+              })
+              getList()
+            })
           })
-          getList()
         }
       })
     })
@@ -308,7 +342,7 @@
                 <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-show="false" v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 1b92963..54caa66 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -1,4 +1,4 @@
-// 计量人员列表查询参数类型
+// 计量人员列表查询参数类型string
 export interface StaffListType {
   staffNo: string // 人员编号
   name: string // 姓名
@@ -14,6 +14,7 @@
 }
 // 计量人员类型
 export interface StaffType {
+  userId?: string
   account: string
   administrationJob: string
   birthday: string
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: "";
diff --git a/src/views/system/user/roleAssignment.vue b/src/views/system/user/roleAssignment.vue
index be67b63..f262b91 100644
--- a/src/views/system/user/roleAssignment.vue
+++ b/src/views/system/user/roleAssignment.vue
@@ -32,6 +32,8 @@
 // 获取角色列表
 const fetchRoleTree = () => {
   getRoleTreeListByUser(userId.value).then((response) => {
+    // 过滤掉计量人员角色
+    response.data = response.data.filter((item: any) => item.name !== '计量人员')
     if (response.data) {
       roleTreeList.value = toTreeList(response.data)
       // 获取展开项和选中项

diff --git a/src/api/device/standingBook.ts b/src/api/device/standingBook.ts
index 0f47a88..fe3c99e 100644
--- a/src/api/device/standingBook.ts
+++ b/src/api/device/standingBook.ts
@@ -35,7 +35,7 @@
   })
 }
 // 批量导入测量设备信息
-export function listImporttApi(data: FormData) {
+export function listImportApi(data: FormData) {
   return request({
     url: '/meter/assets/importMeterEquipment',
     method: 'post',
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/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 3452009..5ec3c4d 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -418,7 +418,7 @@
             <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === 'detail' ? '' : '型号'" :disabled="title === 'detail'" />
           </el-form-item>
         </el-col>
-        <el-col v-if="title === 'detail'" :span="6">
+        <el-col :span="6">
           <el-form-item label="管理状态" prop="managerState">
             <el-select v-model="ruleForm.managerState" :placeholder="title === 'detail' ? '' : '管理状态'" :disabled="title === 'detail'" clearable style="width: 100%;">
               <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
@@ -457,17 +457,17 @@
         </el-col>
       </el-row>
       <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item v-if="showAssetsItem" label="立卡年月" prop="cardEstablishmentDate">
+        <el-col v-if="showAssetsItem" :span="6">
+          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
             <el-date-picker
               v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === 'detail'"
               :placeholder="title === 'detail' ? '' : '立卡年月'"
               style="width: 100%;"
             />
           </el-form-item>
-          <el-form-item v-if="!showAssetsItem" label="原值" prop="originValue">
+          <!-- <el-form-item v-if="!showAssetsItem" label="原值" prop="originValue">
             <el-input v-model.trim="ruleForm.originValue" :placeholder="title === 'detail' ? '' : '原值'" :disabled="title === 'detail'" />
-          </el-form-item>
+          </el-form-item> -->
         </el-col>
         <el-col :span="6">
           <el-form-item label="启用日期" prop="enableDate">
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 9cd3c83..988ba08 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -166,7 +166,7 @@
     <!-- 展示区域 -->
 
     <!-- 添加证书信息组件 -->
-    <detail-block-switch v-if="pageType === 'detail'" :title="current">
+    <detail-block-switch v-if="pageType === 'detail' && $route.query.name !== '固定资产'" :title="current">
       <template #menu>
         <el-radio-group v-model="current">
           <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 65ec9ca..608d07c 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -8,7 +8,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { assetsDeleteApi, listExportApi, listPageApi } from '@/api/device/standingBook'
+import { assetsDeleteApi, listExportApi, listImportApi, listPageApi } from '@/api/device/standingBook'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
   /**
@@ -291,9 +291,9 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    listImportApi(fd).then((res) => {
       if (res.code === 200) {
-        ElMessage.success('上传成功')
+        ElMessage.success('批量导入成功')
       }
       else {
         ElMessage.error(res.message)
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index be8a578..4bdb187 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -5,7 +5,7 @@
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
-import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { assetsDeleteApi, listExportApi, listImportApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -213,7 +213,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    listImporttApi(fd).then((res) => {
+    listImportApi(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index dc21ae0..e6bb9a1 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,21 +221,39 @@
         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)
 })
 
 // 关闭弹窗
 const close = () => {
-  $router.go(-1)
+  $router.back()
 }
 
 // 保存
-const saveForm = async (formEl: FormInstance | undefined) => {
+const deviceManageSave = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -256,7 +281,7 @@
               // 成功
               ruleForm2.value.id = res.data
               ElMessage.success('操作成功')
-              $router.go(-1)
+              $router.back()
             }
           })
         }
@@ -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 }
@@ -299,7 +324,7 @@
               // }
               failUpdate({ ...ruleForm2.value }).then(() => {
                 ElMessage.success('操作成功!')
-                $router.go(-1)
+                $router.back()
               })
             })
           }
@@ -323,7 +348,7 @@
               }
               submitApply(params).then(() => {
                 ElMessage.success('操作成功!')
-                $router.go(-1)
+                $router.back()
               })
             })
           }
@@ -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.back()
+      }
+      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.back()
+      }
+      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.back()
+          }
+          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> -->
+          <!-- 新建 -->
+          <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="title === '编辑' && _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>
@@ -713,7 +820,7 @@
           <el-col :span="6">
             <el-form-item label="设备编号" prop="equipmentNo" class="equipmentNo">
               <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" disabled />
-              <el-button class="equipmentNo-item" type="default" :disabled="title === '详情'" @click="addRowBtn">
+              <el-button v-if="title !== '详情'" class="equipmentNo-item" type="default" @click="addRowBtn">
                 选择
               </el-button>
             </el-form-item>
@@ -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..3a7deae 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -10,11 +10,9 @@
   getStatusList,
   submitStatus,
 } from '@/api/device/stateManage'
-import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import type { dictType } from '@/views/device/receive/receive'
 import { exportFile } from '@/utils/exportUtils'
 
 // 选中的按钮
@@ -49,15 +47,19 @@
   delete: '/device/unusedApply/delete', // 删除
 }
 const activeTitle = ref<string>(props.title) // 状态按钮选中
-const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
-const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const approvalStatusVal = ref<string>(props.type)
+if (props.type == '0') {
+  approvalStatusVal.value = ''
+}
+// const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+// const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 const $router = useRouter()
 // 查询参数
 const searchQuery = reactive<ISearchQuery>({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
   applyUnit: '', // 申请单位
-  approvalStatus: '0', // 审批状态
+  approvalStatus: approvalStatusVal.value, // 审批状态
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
@@ -142,48 +144,12 @@
   searchQuery.formId = SCHEDULE[props.formCode as keyof typeof SCHEDULE]
 }
 
-// 获取字典值
-async function getDict() {
-  managerStateList.value = []
-  // 审批状态
-  const res = await getDictByCode('approvalStatus')
-  // 审批状态字典 {1：草稿箱}
-  res.data.forEach((item: any) => {
-    approvalStatusMap.value[`${item.value}`] = item.name
-  })
-
-  // 审批状态字典 {草稿箱: 1}
-  res.data.forEach((item: any) => {
-    approvalStatusReserveMap.value[item.name] = `${item.value}`
-  })
-
-  // 制作右上角的菜单
-  res.data.forEach((item: dictType) => {
-    if (item.name === '全部' || item.name === '草稿箱'
-      || item.name === '待审批' || item.name === '审批中'
-      || item.name === '已通过' || item.name === '未通过'
-      || item.name === '已取消') {
-      managerStateList.value.push({
-        name: item.name,
-        value: item.name,
-        id: `${item.value}`,
-      })
-    }
-  })
-}
-
 // 获取数据列表
 const getList = () => {
-  getDict()
   loadingTable.value = true
   getStatusList(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map((item: ITableRow) => {
-        return {
-          ...item,
-          approvalStatus: approvalStatusMap[item.approvalStatus],
-        }
-      })
+      list.value = res.data.rows
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -192,6 +158,7 @@
       loadingTable.value = false
     })
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -214,6 +181,8 @@
       title: '详情',
       name: props.name,
       applyType: props.applyType,
+      approvalStatusName: row.approvalStatusName,
+
     },
   })
 }
@@ -229,6 +198,8 @@
       title: '编辑',
       name: props.name,
       applyType: props.applyType,
+      approvalStatusName: row.approvalStatusName,
+
     },
   })
 }
@@ -336,6 +307,7 @@
       title: '新建',
       name: props.name,
       applyType: props.applyType,
+      formId: searchQuery.formId,
     },
   })
 }
@@ -418,31 +390,9 @@
   dialogVisible.value = false
 }
 
-watch(() => searchQuery.applyStatus, (newValue) => {
-  if (newValue == '') {
-    searchQuery.approvalStatus = '0'
-  }
-  else {
-    searchQuery.approvalStatus = approvalStatusReserveMap.value[newValue]
-  }
+onMounted(() => {
+  getList()
 })
-
-watch(
-  () => props.type,
-  (newValue) => {
-    if (newValue === '0') {
-      searchQuery.approvalStatus = '0'
-    }
-    else {
-      searchQuery.approvalStatus = newValue
-    }
-    getList()
-  },
-  {
-    immediate: true,
-    deep: true,
-  },
-)
 </script>
 
 <template>
@@ -610,7 +560,7 @@
                 <el-button
                   v-if="proxy.buttonPerm.cancel.if(row, permUrl.cancel)"
                   size="small"
-                  type="text"
+                  type="info"
                   link
                   :disabled="proxy.buttonPerm.cancel.disabled(row)"
                   @click="cancel(row)"
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index a15ce23..2d07167 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -43,7 +43,7 @@
 ])
 const statusList = ref<menuType[]>([])
 const type = ref('') // 当前状态的value
-const current = ref('全部')
+const current = ref('')
 const currentComp = shallowRef(all)
 watch(current, async (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
@@ -63,8 +63,14 @@
 onUnmounted(() => {
   sessionStorage.setItem(`${props.authority}Menu`, current.value)
 })
-onMounted(() => {
+onMounted(async () => {
+  await getDictByCode('approvalStatus').then((res) => {
+    statusList.value = (res.data as menuType[])
+  })
   current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  if (statusList.value.length > 0) {
+    type.value = statusList.value.filter(item => item.name === current.value)[0].value || ''
+  }
   sessionStorage.getItem(`${props.authority}Menu`) ? sessionStorage.removeItem(`${props.authority}Menu`) : ''
 })
 </script>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 088cb52..733efc3 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -6,7 +6,7 @@
 import lodash from 'lodash'
 import type { technologyJobType } from '../person-interface'
 import userListDialog from './userListDialog.vue'
-import { getUserList } from '@/api/system/user'
+import { getUserList, roleAssign } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
 import { toTreeList } from '@/utils/structure'
@@ -14,6 +14,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
+import { getRoleTreeListByUser } from '@/api/system/role'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const $route = useRoute()
 const $router = useRouter()
@@ -161,8 +162,11 @@
 const selectPerson = () => {
   userListRef.value.initDialog()
 }
+const userInfoData = ref()
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
+  userInfoData.value = row
+  console.log(row, '选择的人员信息')
   ruleForm.value.name = row.name
   ruleForm.value.account = row.account
   ruleForm.value.deptId = row.deptId
@@ -506,10 +510,41 @@
             ? getStaffAdd({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })
             : getStaffupdate({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })).then((res) => {
             if (res.code == 200) {
-              formEl?.resetFields()
-              ElMessage.success('提交成功')
-              resetFormData()
-              $router.go(-1)
+              // formEl?.resetFields()
+              // ElMessage.success('提交成功')
+              // resetFormData()
+              // $router.go(-1)
+              // 获取当前用户角色
+              getRoleTreeListByUser(userInfoData.value.id).then((res) => {
+                console.log(res.data, '角色列表')
+                // 当前用户 角色 id
+                const roleIds: string[] = []
+                // 挑选 计量人员 角色id
+                let metering = ''
+                const data = res.data
+                data.forEach((item: any) => {
+                  // 当前用户角色
+                  if (item.checked) {
+                    roleIds.push(item.id)
+                  }
+                  // 计量人员角色
+                  if (item.name === '计量人员') {
+                    metering = item.id
+                  }
+                })
+                // 判断当前用户是否 计量人员角色
+                if (roleIds.every(item => item !== metering)) {
+                  roleIds.push(metering)
+                }
+                // 设置当前用户角色
+                roleAssign(userInfoData.value.id, roleIds).then((res) => {
+                  console.log('分配计量人员角色成功')
+                  formEl?.resetFields()
+                  ElMessage.success('提交成功')
+                  resetFormData()
+                  $router.go(-1)
+                })
+              })
             }
           })
         }
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 79c8659..ecda4cf 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,6 +3,8 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { StaffListType, StaffType } from './person-interface'
 import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+import { getRoleTreeListByUser } from '@/api/system/role'
+import { roleAssign } from '@/api/system/user'
 // import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -104,6 +106,8 @@
 
 // 删除
 const remove = (row: StaffType) => {
+  // 当前用户id
+  const userId = row.userId as string
   ElMessageBox.confirm(
     `确认删除${row.name}吗？`,
     '提示',
@@ -116,11 +120,41 @@
     .then(() => {
       getStaffDelete({ id: row.id as string }).then((res) => {
         if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
+          // ElMessage({
+          //   type: 'success',
+          //   message: '删除成功',
+          // })
+          // getList()
+          // 删除用户的 计量人员 角色
+          // 获取当前用户角色
+          getRoleTreeListByUser(userId).then((res) => {
+            console.log(res.data, '角色列表')
+            // 当前用户 角色 id
+            let roleIds: string[] = []
+            // 挑选 计量人员 角色id
+            let metering = ''
+            const data = res.data
+            data.forEach((item: any) => {
+              // 当前用户角色
+              if (item.checked) {
+                roleIds.push(item.id)
+              }
+              // 计量人员角色
+              if (item.name === '计量人员') {
+                metering = item.id
+              }
+            })
+            roleIds = roleIds.filter(item => item !== metering)
+            // 设置当前用户角色
+            roleAssign(userId, roleIds).then((res) => {
+              console.log('删除计量人员角色成功')
+              ElMessage({
+                type: 'success',
+                message: '删除成功',
+              })
+              getList()
+            })
           })
-          getList()
         }
       })
     })
@@ -308,7 +342,7 @@
                 <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-show="false" v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 1b92963..54caa66 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -1,4 +1,4 @@
-// 计量人员列表查询参数类型
+// 计量人员列表查询参数类型string
 export interface StaffListType {
   staffNo: string // 人员编号
   name: string // 姓名
@@ -14,6 +14,7 @@
 }
 // 计量人员类型
 export interface StaffType {
+  userId?: string
   account: string
   administrationJob: string
   birthday: string
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: "";
diff --git a/src/views/system/user/roleAssignment.vue b/src/views/system/user/roleAssignment.vue
index be67b63..f262b91 100644
--- a/src/views/system/user/roleAssignment.vue
+++ b/src/views/system/user/roleAssignment.vue
@@ -32,6 +32,8 @@
 // 获取角色列表
 const fetchRoleTree = () => {
   getRoleTreeListByUser(userId.value).then((response) => {
+    // 过滤掉计量人员角色
+    response.data = response.data.filter((item: any) => item.name !== '计量人员')
     if (response.data) {
       roleTreeList.value = toTreeList(response.data)
       // 获取展开项和选中项
diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue
index 2e314c9..5387580 100644
--- a/src/views/system/user/userAdd.vue
+++ b/src/views/system/user/userAdd.vue
@@ -78,6 +78,8 @@
 // 加载角色树形下拉菜单
 const fetchRoleTree = () => {
   getRoleTreeList().then((res) => {
+    // 过滤掉计量人员角色
+    res.data.list = res.data.list.filter((item: any) => item.name !== '计量人员')
     if (res.data.list) { // 将列表转树结构
       roleTreeList.value = toTreeList(res.data.list, '0', true)
     }