diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 768c310..71e8b02 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -131,3 +131,12 @@
   })
 }
 
+// 未通过-驳回编辑
+export function updateFail(data: object) {
+  return request({
+    url: '/meter/file/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 768c310..71e8b02 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -131,3 +131,12 @@
   })
 }
 
+// 未通过-驳回编辑
+export function updateFail(data: object) {
+  return request({
+    url: '/meter/file/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 554a196..2f491c0 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -19,13 +19,15 @@
         已取消: '6',
       } as approvalStatus, // 审批状态
       approvalStatusListTow: {
-        全部: '0',
-        草稿箱: '1',
-        待审批: '2',
-        审批中: '3',
-        已通过: '4',
-        未通过: '5',
-        已取消: '6',
+        '全部': '0',
+        '草稿箱': '1',
+        '待审批': '2',
+        '审批中': '3',
+        '已通过': '4',
+        '未通过': '5',
+        '已取消': '6',
+        '非草稿': '7',
+        '未通过-驳回': '8',
       } as approvalStatus, // 审批状态
     }),
     getters: {

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 768c310..71e8b02 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -131,3 +131,12 @@
   })
 }
 
+// 未通过-驳回编辑
+export function updateFail(data: object) {
+  return request({
+    url: '/meter/file/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 554a196..2f491c0 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -19,13 +19,15 @@
         已取消: '6',
       } as approvalStatus, // 审批状态
       approvalStatusListTow: {
-        全部: '0',
-        草稿箱: '1',
-        待审批: '2',
-        审批中: '3',
-        已通过: '4',
-        未通过: '5',
-        已取消: '6',
+        '全部': '0',
+        '草稿箱': '1',
+        '待审批': '2',
+        '审批中': '3',
+        '已通过': '4',
+        '未通过': '5',
+        '已取消': '6',
+        '非草稿': '7',
+        '未通过-驳回': '8',
       } as approvalStatus, // 审批状态
     }),
     getters: {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 99ddb0f..1289bc8 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -489,6 +489,7 @@
 const confirmCheckoutTemplate = (val: any) => {
   formInline.value.templateId = val.id // 证书报告模板id
   formInline.value.templateName = val.templateName || '' // 证书报告模板名称
+  formInline.value.certificateReportType = val.certificationType // 证书报告类型
 }
 
 // --------------------------------------选择签章-----------------------------------
@@ -674,13 +675,13 @@
               <el-select
                 v-model="formInline.certificateReportType"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择证书报告类型'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择证书报告类型'"
                 size="default"
                 style="width: 100%;"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <el-option
-                  v-for="item in certificationClassMap"
+                  v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
                   :value="item.value"
@@ -845,7 +846,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书类别:" prop="businessOriginalRecord.businessOrder.certifications">
               <el-select
                 v-model="formInline.businessOriginalRecord.businessOrder.certifications"
@@ -862,7 +863,7 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 768c310..71e8b02 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -131,3 +131,12 @@
   })
 }
 
+// 未通过-驳回编辑
+export function updateFail(data: object) {
+  return request({
+    url: '/meter/file/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 554a196..2f491c0 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -19,13 +19,15 @@
         已取消: '6',
       } as approvalStatus, // 审批状态
       approvalStatusListTow: {
-        全部: '0',
-        草稿箱: '1',
-        待审批: '2',
-        审批中: '3',
-        已通过: '4',
-        未通过: '5',
-        已取消: '6',
+        '全部': '0',
+        '草稿箱': '1',
+        '待审批': '2',
+        '审批中': '3',
+        '已通过': '4',
+        '未通过': '5',
+        '已取消': '6',
+        '非草稿': '7',
+        '未通过-驳回': '8',
       } as approvalStatus, // 审批状态
     }),
     getters: {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 99ddb0f..1289bc8 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -489,6 +489,7 @@
 const confirmCheckoutTemplate = (val: any) => {
   formInline.value.templateId = val.id // 证书报告模板id
   formInline.value.templateName = val.templateName || '' // 证书报告模板名称
+  formInline.value.certificateReportType = val.certificationType // 证书报告类型
 }
 
 // --------------------------------------选择签章-----------------------------------
@@ -674,13 +675,13 @@
               <el-select
                 v-model="formInline.certificateReportType"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择证书报告类型'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择证书报告类型'"
                 size="default"
                 style="width: 100%;"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <el-option
-                  v-for="item in certificationClassMap"
+                  v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
                   :value="item.value"
@@ -845,7 +846,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书类别:" prop="businessOriginalRecord.businessOrder.certifications">
               <el-select
                 v-model="formInline.businessOriginalRecord.businessOrder.certifications"
@@ -862,7 +863,7 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 13e05df..ef90dd5 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -427,103 +427,11 @@
             </template>
           </el-table-column>
         </template>
-        <template #default="{ row }">
-          <el-button
-            size="small"
-            type="primary"
-            link
-            @click="handleEdit(row, '查看', 'detail')"
-          >
-            查看
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批'"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '同意')"
-          >
-            同意
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '驳回')"
-          >
-            驳回
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '拒绝')"
-          >
-            拒绝
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '编辑', 'edit')"
-          >
-            编辑
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '提交')"
-          >
-            提交
-          </el-button>
-          <!-- 是发起者且审批中可以取消 -->
-          <el-button
-            v-if="row.approvalStatusName === '审批中'"
-            size="small"
-            link
-            type="info"
-            :disabled="row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '取消')"
-          >
-            取消
-          </el-button>
-          <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-          <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-          <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
-          <el-button
-            v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-            @click="handleEdit(row, '删除')"
-          >
-            删除
-          </el-button>
-        </template>
-        <!-- ------------------------------------------------- -->
         <template #columns>
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
+            :width="(activeTitle === '全部') ? 200 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -594,20 +502,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 768c310..71e8b02 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -131,3 +131,12 @@
   })
 }
 
+// 未通过-驳回编辑
+export function updateFail(data: object) {
+  return request({
+    url: '/meter/file/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 554a196..2f491c0 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -19,13 +19,15 @@
         已取消: '6',
       } as approvalStatus, // 审批状态
       approvalStatusListTow: {
-        全部: '0',
-        草稿箱: '1',
-        待审批: '2',
-        审批中: '3',
-        已通过: '4',
-        未通过: '5',
-        已取消: '6',
+        '全部': '0',
+        '草稿箱': '1',
+        '待审批': '2',
+        '审批中': '3',
+        '已通过': '4',
+        '未通过': '5',
+        '已取消': '6',
+        '非草稿': '7',
+        '未通过-驳回': '8',
       } as approvalStatus, // 审批状态
     }),
     getters: {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 99ddb0f..1289bc8 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -489,6 +489,7 @@
 const confirmCheckoutTemplate = (val: any) => {
   formInline.value.templateId = val.id // 证书报告模板id
   formInline.value.templateName = val.templateName || '' // 证书报告模板名称
+  formInline.value.certificateReportType = val.certificationType // 证书报告类型
 }
 
 // --------------------------------------选择签章-----------------------------------
@@ -674,13 +675,13 @@
               <el-select
                 v-model="formInline.certificateReportType"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择证书报告类型'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择证书报告类型'"
                 size="default"
                 style="width: 100%;"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <el-option
-                  v-for="item in certificationClassMap"
+                  v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
                   :value="item.value"
@@ -845,7 +846,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书类别:" prop="businessOriginalRecord.businessOrder.certifications">
               <el-select
                 v-model="formInline.businessOriginalRecord.businessOrder.certifications"
@@ -862,7 +863,7 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 13e05df..ef90dd5 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -427,103 +427,11 @@
             </template>
           </el-table-column>
         </template>
-        <template #default="{ row }">
-          <el-button
-            size="small"
-            type="primary"
-            link
-            @click="handleEdit(row, '查看', 'detail')"
-          >
-            查看
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批'"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '同意')"
-          >
-            同意
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '驳回')"
-          >
-            驳回
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '拒绝')"
-          >
-            拒绝
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '编辑', 'edit')"
-          >
-            编辑
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '提交')"
-          >
-            提交
-          </el-button>
-          <!-- 是发起者且审批中可以取消 -->
-          <el-button
-            v-if="row.approvalStatusName === '审批中'"
-            size="small"
-            link
-            type="info"
-            :disabled="row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '取消')"
-          >
-            取消
-          </el-button>
-          <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-          <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-          <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
-          <el-button
-            v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-            @click="handleEdit(row, '删除')"
-          >
-            删除
-          </el-button>
-        </template>
-        <!-- ------------------------------------------------- -->
         <template #columns>
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
+            :width="(activeTitle === '全部') ? 200 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -594,20 +502,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b67d2eb..2318d82 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -13,7 +13,7 @@
   name: string
   comp: any
 }
-const menu = shallowRef<menuType[]>([
+const menu = ref<menuType[]>([
   { name: '全部', comp: all },
   { name: '草稿箱', comp: drafts },
   { name: '待审批', comp: pending },
@@ -22,8 +22,9 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(all)
+const current = ref('')
+const currentApprovalStatus = ref('0')
+const currentComp = ref(all)
 const approvalStatusMap = ref({}) as any
 const approvalStatusReserveMap = ref({}) as any
 // 获取菜单状态
@@ -33,25 +34,25 @@
     res.data.forEach((item: any) => {
       approvalStatusMap.value[`${item.value}`] = item.name
     })
-    console.log(approvalStatusMap.value)
     // 审批状态字典 {草稿箱: 1}
     res.data.forEach((item: any) => {
       approvalStatusReserveMap.value[item.name] = `${item.value}`
     })
-    console.log(approvalStatusReserveMap.value)
+    // console.log(approvalStatusReserveMap.value)
   })
 }
 
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  window.sessionStorage.setItem('approveFileMenu', newValue)
+  console.log('set', window.sessionStorage.getItem('approveFileMenu'))
 })
-onUnmounted(() => {
-  sessionStorage.setItem('approveFileMenu', current.value)
-})
-onMounted(() => {
-  getMenuStatus()
-  current.value = sessionStorage.getItem('approveFileMenu') || '全部'
-  sessionStorage.getItem('approveFileMenu') ? sessionStorage.removeItem('approveFileMenu') : ''
+
+onMounted(async () => {
+  await getMenuStatus()
+  console.log('----', window.sessionStorage.getItem('approveFileMenu'))
+
+  current.value = window.sessionStorage.getItem('approveFileMenu') || '全部'
 })
 </script>
 
@@ -66,7 +67,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
+    <component :is="currentComp" :status="currentApprovalStatus" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
   </div>
 </template>
 

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 768c310..71e8b02 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -131,3 +131,12 @@
   })
 }
 
+// 未通过-驳回编辑
+export function updateFail(data: object) {
+  return request({
+    url: '/meter/file/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 554a196..2f491c0 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -19,13 +19,15 @@
         已取消: '6',
       } as approvalStatus, // 审批状态
       approvalStatusListTow: {
-        全部: '0',
-        草稿箱: '1',
-        待审批: '2',
-        审批中: '3',
-        已通过: '4',
-        未通过: '5',
-        已取消: '6',
+        '全部': '0',
+        '草稿箱': '1',
+        '待审批': '2',
+        '审批中': '3',
+        '已通过': '4',
+        '未通过': '5',
+        '已取消': '6',
+        '非草稿': '7',
+        '未通过-驳回': '8',
       } as approvalStatus, // 审批状态
     }),
     getters: {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 99ddb0f..1289bc8 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -489,6 +489,7 @@
 const confirmCheckoutTemplate = (val: any) => {
   formInline.value.templateId = val.id // 证书报告模板id
   formInline.value.templateName = val.templateName || '' // 证书报告模板名称
+  formInline.value.certificateReportType = val.certificationType // 证书报告类型
 }
 
 // --------------------------------------选择签章-----------------------------------
@@ -674,13 +675,13 @@
               <el-select
                 v-model="formInline.certificateReportType"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择证书报告类型'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择证书报告类型'"
                 size="default"
                 style="width: 100%;"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <el-option
-                  v-for="item in certificationClassMap"
+                  v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
                   :value="item.value"
@@ -845,7 +846,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书类别:" prop="businessOriginalRecord.businessOrder.certifications">
               <el-select
                 v-model="formInline.businessOriginalRecord.businessOrder.certifications"
@@ -862,7 +863,7 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 13e05df..ef90dd5 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -427,103 +427,11 @@
             </template>
           </el-table-column>
         </template>
-        <template #default="{ row }">
-          <el-button
-            size="small"
-            type="primary"
-            link
-            @click="handleEdit(row, '查看', 'detail')"
-          >
-            查看
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批'"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '同意')"
-          >
-            同意
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '驳回')"
-          >
-            驳回
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '拒绝')"
-          >
-            拒绝
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '编辑', 'edit')"
-          >
-            编辑
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '提交')"
-          >
-            提交
-          </el-button>
-          <!-- 是发起者且审批中可以取消 -->
-          <el-button
-            v-if="row.approvalStatusName === '审批中'"
-            size="small"
-            link
-            type="info"
-            :disabled="row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '取消')"
-          >
-            取消
-          </el-button>
-          <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-          <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-          <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
-          <el-button
-            v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-            @click="handleEdit(row, '删除')"
-          >
-            删除
-          </el-button>
-        </template>
-        <!-- ------------------------------------------------- -->
         <template #columns>
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
+            :width="(activeTitle === '全部') ? 200 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -594,20 +502,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b67d2eb..2318d82 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -13,7 +13,7 @@
   name: string
   comp: any
 }
-const menu = shallowRef<menuType[]>([
+const menu = ref<menuType[]>([
   { name: '全部', comp: all },
   { name: '草稿箱', comp: drafts },
   { name: '待审批', comp: pending },
@@ -22,8 +22,9 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(all)
+const current = ref('')
+const currentApprovalStatus = ref('0')
+const currentComp = ref(all)
 const approvalStatusMap = ref({}) as any
 const approvalStatusReserveMap = ref({}) as any
 // 获取菜单状态
@@ -33,25 +34,25 @@
     res.data.forEach((item: any) => {
       approvalStatusMap.value[`${item.value}`] = item.name
     })
-    console.log(approvalStatusMap.value)
     // 审批状态字典 {草稿箱: 1}
     res.data.forEach((item: any) => {
       approvalStatusReserveMap.value[item.name] = `${item.value}`
     })
-    console.log(approvalStatusReserveMap.value)
+    // console.log(approvalStatusReserveMap.value)
   })
 }
 
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  window.sessionStorage.setItem('approveFileMenu', newValue)
+  console.log('set', window.sessionStorage.getItem('approveFileMenu'))
 })
-onUnmounted(() => {
-  sessionStorage.setItem('approveFileMenu', current.value)
-})
-onMounted(() => {
-  getMenuStatus()
-  current.value = sessionStorage.getItem('approveFileMenu') || '全部'
-  sessionStorage.getItem('approveFileMenu') ? sessionStorage.removeItem('approveFileMenu') : ''
+
+onMounted(async () => {
+  await getMenuStatus()
+  console.log('----', window.sessionStorage.getItem('approveFileMenu'))
+
+  current.value = window.sessionStorage.getItem('approveFileMenu') || '全部'
 })
 </script>
 
@@ -66,7 +67,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
+    <component :is="currentComp" :status="currentApprovalStatus" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
   </div>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index f995313..f7f5970 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -104,16 +104,17 @@
 })
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
@@ -141,12 +142,13 @@
           ElMessage.success('保存成功')
           // formEl?.resetFields()
           // $router.go(-1)
-          close()
+          // close()
         })
       })
     }
   })
 }
+// 提交
 const submitForm = () => {
   if (!submitId.value) {
     ElMessage.warning('请先保存')
@@ -162,9 +164,8 @@
     },
   ).then((res) => {
     submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-    // formEl?.resetFields()
       ElMessage.success('已提交')
-      $router.go(-1)
+      // $router.go(-1)
       close()
     })
   })
@@ -173,7 +174,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  $router.go(-1)
+  // $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -233,6 +234,9 @@
     }
   }
 })
+onMounted(() => {
+  ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+})
 </script>
 
 <template>
@@ -299,7 +303,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" disabled
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
@@ -308,7 +312,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 768c310..71e8b02 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -131,3 +131,12 @@
   })
 }
 
+// 未通过-驳回编辑
+export function updateFail(data: object) {
+  return request({
+    url: '/meter/file/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 554a196..2f491c0 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -19,13 +19,15 @@
         已取消: '6',
       } as approvalStatus, // 审批状态
       approvalStatusListTow: {
-        全部: '0',
-        草稿箱: '1',
-        待审批: '2',
-        审批中: '3',
-        已通过: '4',
-        未通过: '5',
-        已取消: '6',
+        '全部': '0',
+        '草稿箱': '1',
+        '待审批': '2',
+        '审批中': '3',
+        '已通过': '4',
+        '未通过': '5',
+        '已取消': '6',
+        '非草稿': '7',
+        '未通过-驳回': '8',
       } as approvalStatus, // 审批状态
     }),
     getters: {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 99ddb0f..1289bc8 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -489,6 +489,7 @@
 const confirmCheckoutTemplate = (val: any) => {
   formInline.value.templateId = val.id // 证书报告模板id
   formInline.value.templateName = val.templateName || '' // 证书报告模板名称
+  formInline.value.certificateReportType = val.certificationType // 证书报告类型
 }
 
 // --------------------------------------选择签章-----------------------------------
@@ -674,13 +675,13 @@
               <el-select
                 v-model="formInline.certificateReportType"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择证书报告类型'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择证书报告类型'"
                 size="default"
                 style="width: 100%;"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <el-option
-                  v-for="item in certificationClassMap"
+                  v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
                   :value="item.value"
@@ -845,7 +846,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书类别:" prop="businessOriginalRecord.businessOrder.certifications">
               <el-select
                 v-model="formInline.businessOriginalRecord.businessOrder.certifications"
@@ -862,7 +863,7 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 13e05df..ef90dd5 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -427,103 +427,11 @@
             </template>
           </el-table-column>
         </template>
-        <template #default="{ row }">
-          <el-button
-            size="small"
-            type="primary"
-            link
-            @click="handleEdit(row, '查看', 'detail')"
-          >
-            查看
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批'"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '同意')"
-          >
-            同意
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '驳回')"
-          >
-            驳回
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '拒绝')"
-          >
-            拒绝
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '编辑', 'edit')"
-          >
-            编辑
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '提交')"
-          >
-            提交
-          </el-button>
-          <!-- 是发起者且审批中可以取消 -->
-          <el-button
-            v-if="row.approvalStatusName === '审批中'"
-            size="small"
-            link
-            type="info"
-            :disabled="row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '取消')"
-          >
-            取消
-          </el-button>
-          <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-          <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-          <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
-          <el-button
-            v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-            @click="handleEdit(row, '删除')"
-          >
-            删除
-          </el-button>
-        </template>
-        <!-- ------------------------------------------------- -->
         <template #columns>
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
+            :width="(activeTitle === '全部') ? 200 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -594,20 +502,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b67d2eb..2318d82 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -13,7 +13,7 @@
   name: string
   comp: any
 }
-const menu = shallowRef<menuType[]>([
+const menu = ref<menuType[]>([
   { name: '全部', comp: all },
   { name: '草稿箱', comp: drafts },
   { name: '待审批', comp: pending },
@@ -22,8 +22,9 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(all)
+const current = ref('')
+const currentApprovalStatus = ref('0')
+const currentComp = ref(all)
 const approvalStatusMap = ref({}) as any
 const approvalStatusReserveMap = ref({}) as any
 // 获取菜单状态
@@ -33,25 +34,25 @@
     res.data.forEach((item: any) => {
       approvalStatusMap.value[`${item.value}`] = item.name
     })
-    console.log(approvalStatusMap.value)
     // 审批状态字典 {草稿箱: 1}
     res.data.forEach((item: any) => {
       approvalStatusReserveMap.value[item.name] = `${item.value}`
     })
-    console.log(approvalStatusReserveMap.value)
+    // console.log(approvalStatusReserveMap.value)
   })
 }
 
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  window.sessionStorage.setItem('approveFileMenu', newValue)
+  console.log('set', window.sessionStorage.getItem('approveFileMenu'))
 })
-onUnmounted(() => {
-  sessionStorage.setItem('approveFileMenu', current.value)
-})
-onMounted(() => {
-  getMenuStatus()
-  current.value = sessionStorage.getItem('approveFileMenu') || '全部'
-  sessionStorage.getItem('approveFileMenu') ? sessionStorage.removeItem('approveFileMenu') : ''
+
+onMounted(async () => {
+  await getMenuStatus()
+  console.log('----', window.sessionStorage.getItem('approveFileMenu'))
+
+  current.value = window.sessionStorage.getItem('approveFileMenu') || '全部'
 })
 </script>
 
@@ -66,7 +67,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
+    <component :is="currentComp" :status="currentApprovalStatus" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
   </div>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index f995313..f7f5970 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -104,16 +104,17 @@
 })
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
@@ -141,12 +142,13 @@
           ElMessage.success('保存成功')
           // formEl?.resetFields()
           // $router.go(-1)
-          close()
+          // close()
         })
       })
     }
   })
 }
+// 提交
 const submitForm = () => {
   if (!submitId.value) {
     ElMessage.warning('请先保存')
@@ -162,9 +164,8 @@
     },
   ).then((res) => {
     submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-    // formEl?.resetFields()
       ElMessage.success('已提交')
-      $router.go(-1)
+      // $router.go(-1)
       close()
     })
   })
@@ -173,7 +174,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  $router.go(-1)
+  // $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -233,6 +234,9 @@
     }
   }
 })
+onMounted(() => {
+  ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+})
 </script>
 
 <template>
@@ -299,7 +303,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" disabled
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
@@ -308,7 +312,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/addDialog.vue b/src/views/measure/file/components/approve/addDialog.vue
index 7b77c83..f5f34e6 100644
--- a/src/views/measure/file/components/approve/addDialog.vue
+++ b/src/views/measure/file/components/approve/addDialog.vue
@@ -1,7 +1,7 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../../file-interface'
 import type { TableRow } from './approve-interface'
@@ -11,10 +11,11 @@
 import { toTreeList } from '@/utils/structure'
 import { printHtml } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts } from '@/api/measure/file'
+import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts, updateFail } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval, fetchApproval } from '@/api/approval'
 
 const $route = useRoute()
 const $router = useRouter()
@@ -97,31 +98,33 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    approvalStatusName.value = row.approvalStatusName
+    approvalStatusName.value = row.approvalStatusName // 审批状态名称
+    if (approvalStatusName.value !== '草稿箱') {
+      getApprovalRecord($route.query.processId as string) // 查询审批记录
+    }
   }
 }
-onMounted(() => {
-  initDialog($route.query)
-})
+
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.publishTime = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.publishTime = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
-// 提交
-const submitForm = () => {
+// 保存
+const saveForm = () => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    '确认保存吗？',
     '提示',
     {
       confirmButtonText: '确认',
@@ -129,96 +132,96 @@
       type: 'warning',
     },
   ).then((res) => {
-    if (approvalStatusName.value !== '草稿箱') {
+    if (title.value === '新建') {
       confirmDrafts(ruleForm).then((res) => {
         if (res.code === 200) {
           console.log(res.data, '保存成功')
           submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
             ElMessage.success('提交成功')
-            $router.go(-1)
             close()
           })
         }
       })
     }
-    else {
-      // 保存（草稿箱）
-      updateDrafts(ruleForm).then((res) => {
-        ElMessage.success('保存成功')
-        $router.go(-1)
-        close()
-      })
+    else if (title.value === '编辑') {
+      if (approvalStatusName.value === '未通过-驳回') {
+        const params = {
+          ...ruleForm,
+          processId: $route.query.processId,
+        }
+        updateFail(params).then((res) => {
+          ElMessage.success('保存成功')
+          close()
+        })
+      }
+      else { // 草稿箱、已取消
+        // 保存（草稿箱）
+        updateDrafts(ruleForm).then((res) => {
+          ElMessage.success('保存成功')
+          close()
+        })
+      }
     }
   })
 }
-// 编辑
-const update = (row: TableRow) => {
-  initDialog({
-    ...row,
-    title: '编辑',
-  })
-}
-// 删除
-const remove = (row: TableRow) => {
-  ElMessageBox.confirm(
-    '确认删除吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      if (row.approvalStatusName === '待审批') {
-        approvalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            $router.go(-1)
-          }
-        })
-      }
-      else {
-        deleteApi({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            $router.go(-1)
-          }
-        })
-      }
-    })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
-  close()
-  $router.go(-1)
+
+// -----------------------------------------审批--------------------------------------
+const approvalDialog = ref()
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (title.value !== '新建') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
 }
 // 审批结束回调
 const approvalSuccess = () => {
   close()
-  $router.go(-1)
 }
-const approvalDialog = ref()
-// 审批操作
-const approval = (type: string, processId: string) => {
-  approvalDialog.value.initDialog(type, processId)
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: $route.query.processId! as string,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', $route.query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', $route.query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', $route.query.taskId)
+  }
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: `文件审批${title.value}`, // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// -----------------------------------------------------------------------------------
 
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -227,6 +230,10 @@
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -234,9 +241,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -270,53 +279,34 @@
     }
   }
 })
+
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container>
     <detail-page :title="`文件审批-${title}`">
       <template #btns>
-        <div v-if="approvalStatusName === '草稿箱' || approvalStatusName === '已取消'">
-          <el-button v-if="title !== '编辑'" type="primary" @click="update(formDataRow)">
-            编辑
-          </el-button>
-          <el-button v-else type="primary" @click="submitForm">
-            {{ approvalStatusName === '草稿箱' ? '保存' : '提交' }}
-          </el-button>
-          <el-button type="primary" @click="remove(formDataRow)">
-            删除
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="approvalStatusName === '待审批'">
-          <el-button type="primary" @click="approval('agree', formDataRow.taskId)">
-            同意
-          </el-button>
-          <el-button type="primary" @click="approval('reject', formDataRow.taskId)">
-            驳回
-          </el-button>
-          <el-button type="primary" @click="approval('refuse', formDataRow.taskId)">
-            拒绝
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="approvalStatusName === '已通过' || approvalStatusName === '未通过'">
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="['全部', '审批中'].includes(approvalStatusName)">
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批' && $route.query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批' && $route.query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button v-if="title === '新建' || title === '编辑'" type="primary" @click="saveForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
       </template>
 
       <el-form id="print" ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
@@ -368,16 +358,17 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -417,6 +408,10 @@
         </el-row>
       </el-form>
     </detail-page>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && title !== '新建'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 768c310..71e8b02 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -131,3 +131,12 @@
   })
 }
 
+// 未通过-驳回编辑
+export function updateFail(data: object) {
+  return request({
+    url: '/meter/file/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 554a196..2f491c0 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -19,13 +19,15 @@
         已取消: '6',
       } as approvalStatus, // 审批状态
       approvalStatusListTow: {
-        全部: '0',
-        草稿箱: '1',
-        待审批: '2',
-        审批中: '3',
-        已通过: '4',
-        未通过: '5',
-        已取消: '6',
+        '全部': '0',
+        '草稿箱': '1',
+        '待审批': '2',
+        '审批中': '3',
+        '已通过': '4',
+        '未通过': '5',
+        '已取消': '6',
+        '非草稿': '7',
+        '未通过-驳回': '8',
       } as approvalStatus, // 审批状态
     }),
     getters: {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 99ddb0f..1289bc8 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -489,6 +489,7 @@
 const confirmCheckoutTemplate = (val: any) => {
   formInline.value.templateId = val.id // 证书报告模板id
   formInline.value.templateName = val.templateName || '' // 证书报告模板名称
+  formInline.value.certificateReportType = val.certificationType // 证书报告类型
 }
 
 // --------------------------------------选择签章-----------------------------------
@@ -674,13 +675,13 @@
               <el-select
                 v-model="formInline.certificateReportType"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择证书报告类型'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择证书报告类型'"
                 size="default"
                 style="width: 100%;"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <el-option
-                  v-for="item in certificationClassMap"
+                  v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
                   :value="item.value"
@@ -845,7 +846,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书类别:" prop="businessOriginalRecord.businessOrder.certifications">
               <el-select
                 v-model="formInline.businessOriginalRecord.businessOrder.certifications"
@@ -862,7 +863,7 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 13e05df..ef90dd5 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -427,103 +427,11 @@
             </template>
           </el-table-column>
         </template>
-        <template #default="{ row }">
-          <el-button
-            size="small"
-            type="primary"
-            link
-            @click="handleEdit(row, '查看', 'detail')"
-          >
-            查看
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批'"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '同意')"
-          >
-            同意
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '驳回')"
-          >
-            驳回
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '拒绝')"
-          >
-            拒绝
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '编辑', 'edit')"
-          >
-            编辑
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '提交')"
-          >
-            提交
-          </el-button>
-          <!-- 是发起者且审批中可以取消 -->
-          <el-button
-            v-if="row.approvalStatusName === '审批中'"
-            size="small"
-            link
-            type="info"
-            :disabled="row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '取消')"
-          >
-            取消
-          </el-button>
-          <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-          <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-          <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
-          <el-button
-            v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-            @click="handleEdit(row, '删除')"
-          >
-            删除
-          </el-button>
-        </template>
-        <!-- ------------------------------------------------- -->
         <template #columns>
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
+            :width="(activeTitle === '全部') ? 200 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -594,20 +502,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b67d2eb..2318d82 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -13,7 +13,7 @@
   name: string
   comp: any
 }
-const menu = shallowRef<menuType[]>([
+const menu = ref<menuType[]>([
   { name: '全部', comp: all },
   { name: '草稿箱', comp: drafts },
   { name: '待审批', comp: pending },
@@ -22,8 +22,9 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(all)
+const current = ref('')
+const currentApprovalStatus = ref('0')
+const currentComp = ref(all)
 const approvalStatusMap = ref({}) as any
 const approvalStatusReserveMap = ref({}) as any
 // 获取菜单状态
@@ -33,25 +34,25 @@
     res.data.forEach((item: any) => {
       approvalStatusMap.value[`${item.value}`] = item.name
     })
-    console.log(approvalStatusMap.value)
     // 审批状态字典 {草稿箱: 1}
     res.data.forEach((item: any) => {
       approvalStatusReserveMap.value[item.name] = `${item.value}`
     })
-    console.log(approvalStatusReserveMap.value)
+    // console.log(approvalStatusReserveMap.value)
   })
 }
 
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  window.sessionStorage.setItem('approveFileMenu', newValue)
+  console.log('set', window.sessionStorage.getItem('approveFileMenu'))
 })
-onUnmounted(() => {
-  sessionStorage.setItem('approveFileMenu', current.value)
-})
-onMounted(() => {
-  getMenuStatus()
-  current.value = sessionStorage.getItem('approveFileMenu') || '全部'
-  sessionStorage.getItem('approveFileMenu') ? sessionStorage.removeItem('approveFileMenu') : ''
+
+onMounted(async () => {
+  await getMenuStatus()
+  console.log('----', window.sessionStorage.getItem('approveFileMenu'))
+
+  current.value = window.sessionStorage.getItem('approveFileMenu') || '全部'
 })
 </script>
 
@@ -66,7 +67,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
+    <component :is="currentComp" :status="currentApprovalStatus" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
   </div>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index f995313..f7f5970 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -104,16 +104,17 @@
 })
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
@@ -141,12 +142,13 @@
           ElMessage.success('保存成功')
           // formEl?.resetFields()
           // $router.go(-1)
-          close()
+          // close()
         })
       })
     }
   })
 }
+// 提交
 const submitForm = () => {
   if (!submitId.value) {
     ElMessage.warning('请先保存')
@@ -162,9 +164,8 @@
     },
   ).then((res) => {
     submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-    // formEl?.resetFields()
       ElMessage.success('已提交')
-      $router.go(-1)
+      // $router.go(-1)
       close()
     })
   })
@@ -173,7 +174,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  $router.go(-1)
+  // $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -233,6 +234,9 @@
     }
   }
 })
+onMounted(() => {
+  ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+})
 </script>
 
 <template>
@@ -299,7 +303,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" disabled
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
@@ -308,7 +312,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/addDialog.vue b/src/views/measure/file/components/approve/addDialog.vue
index 7b77c83..f5f34e6 100644
--- a/src/views/measure/file/components/approve/addDialog.vue
+++ b/src/views/measure/file/components/approve/addDialog.vue
@@ -1,7 +1,7 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../../file-interface'
 import type { TableRow } from './approve-interface'
@@ -11,10 +11,11 @@
 import { toTreeList } from '@/utils/structure'
 import { printHtml } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts } from '@/api/measure/file'
+import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts, updateFail } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval, fetchApproval } from '@/api/approval'
 
 const $route = useRoute()
 const $router = useRouter()
@@ -97,31 +98,33 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    approvalStatusName.value = row.approvalStatusName
+    approvalStatusName.value = row.approvalStatusName // 审批状态名称
+    if (approvalStatusName.value !== '草稿箱') {
+      getApprovalRecord($route.query.processId as string) // 查询审批记录
+    }
   }
 }
-onMounted(() => {
-  initDialog($route.query)
-})
+
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.publishTime = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.publishTime = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
-// 提交
-const submitForm = () => {
+// 保存
+const saveForm = () => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    '确认保存吗？',
     '提示',
     {
       confirmButtonText: '确认',
@@ -129,96 +132,96 @@
       type: 'warning',
     },
   ).then((res) => {
-    if (approvalStatusName.value !== '草稿箱') {
+    if (title.value === '新建') {
       confirmDrafts(ruleForm).then((res) => {
         if (res.code === 200) {
           console.log(res.data, '保存成功')
           submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
             ElMessage.success('提交成功')
-            $router.go(-1)
             close()
           })
         }
       })
     }
-    else {
-      // 保存（草稿箱）
-      updateDrafts(ruleForm).then((res) => {
-        ElMessage.success('保存成功')
-        $router.go(-1)
-        close()
-      })
+    else if (title.value === '编辑') {
+      if (approvalStatusName.value === '未通过-驳回') {
+        const params = {
+          ...ruleForm,
+          processId: $route.query.processId,
+        }
+        updateFail(params).then((res) => {
+          ElMessage.success('保存成功')
+          close()
+        })
+      }
+      else { // 草稿箱、已取消
+        // 保存（草稿箱）
+        updateDrafts(ruleForm).then((res) => {
+          ElMessage.success('保存成功')
+          close()
+        })
+      }
     }
   })
 }
-// 编辑
-const update = (row: TableRow) => {
-  initDialog({
-    ...row,
-    title: '编辑',
-  })
-}
-// 删除
-const remove = (row: TableRow) => {
-  ElMessageBox.confirm(
-    '确认删除吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      if (row.approvalStatusName === '待审批') {
-        approvalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            $router.go(-1)
-          }
-        })
-      }
-      else {
-        deleteApi({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            $router.go(-1)
-          }
-        })
-      }
-    })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
-  close()
-  $router.go(-1)
+
+// -----------------------------------------审批--------------------------------------
+const approvalDialog = ref()
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (title.value !== '新建') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
 }
 // 审批结束回调
 const approvalSuccess = () => {
   close()
-  $router.go(-1)
 }
-const approvalDialog = ref()
-// 审批操作
-const approval = (type: string, processId: string) => {
-  approvalDialog.value.initDialog(type, processId)
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: $route.query.processId! as string,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', $route.query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', $route.query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', $route.query.taskId)
+  }
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: `文件审批${title.value}`, // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// -----------------------------------------------------------------------------------
 
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -227,6 +230,10 @@
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -234,9 +241,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -270,53 +279,34 @@
     }
   }
 })
+
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container>
     <detail-page :title="`文件审批-${title}`">
       <template #btns>
-        <div v-if="approvalStatusName === '草稿箱' || approvalStatusName === '已取消'">
-          <el-button v-if="title !== '编辑'" type="primary" @click="update(formDataRow)">
-            编辑
-          </el-button>
-          <el-button v-else type="primary" @click="submitForm">
-            {{ approvalStatusName === '草稿箱' ? '保存' : '提交' }}
-          </el-button>
-          <el-button type="primary" @click="remove(formDataRow)">
-            删除
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="approvalStatusName === '待审批'">
-          <el-button type="primary" @click="approval('agree', formDataRow.taskId)">
-            同意
-          </el-button>
-          <el-button type="primary" @click="approval('reject', formDataRow.taskId)">
-            驳回
-          </el-button>
-          <el-button type="primary" @click="approval('refuse', formDataRow.taskId)">
-            拒绝
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="approvalStatusName === '已通过' || approvalStatusName === '未通过'">
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="['全部', '审批中'].includes(approvalStatusName)">
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批' && $route.query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批' && $route.query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button v-if="title === '新建' || title === '编辑'" type="primary" @click="saveForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
       </template>
 
       <el-form id="print" ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
@@ -368,16 +358,17 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -417,6 +408,10 @@
         </el-row>
       </el-form>
     </detail-page>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && title !== '新建'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
index 8f0a408..a8133de 100644
--- a/src/views/measure/file/components/approve/all.vue
+++ b/src/views/measure/file/components/approve/all.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="全部" />
+  <template-pag name="全部" status="0" />
 </template>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 768c310..71e8b02 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -131,3 +131,12 @@
   })
 }
 
+// 未通过-驳回编辑
+export function updateFail(data: object) {
+  return request({
+    url: '/meter/file/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 554a196..2f491c0 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -19,13 +19,15 @@
         已取消: '6',
       } as approvalStatus, // 审批状态
       approvalStatusListTow: {
-        全部: '0',
-        草稿箱: '1',
-        待审批: '2',
-        审批中: '3',
-        已通过: '4',
-        未通过: '5',
-        已取消: '6',
+        '全部': '0',
+        '草稿箱': '1',
+        '待审批': '2',
+        '审批中': '3',
+        '已通过': '4',
+        '未通过': '5',
+        '已取消': '6',
+        '非草稿': '7',
+        '未通过-驳回': '8',
       } as approvalStatus, // 审批状态
     }),
     getters: {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 99ddb0f..1289bc8 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -489,6 +489,7 @@
 const confirmCheckoutTemplate = (val: any) => {
   formInline.value.templateId = val.id // 证书报告模板id
   formInline.value.templateName = val.templateName || '' // 证书报告模板名称
+  formInline.value.certificateReportType = val.certificationType // 证书报告类型
 }
 
 // --------------------------------------选择签章-----------------------------------
@@ -674,13 +675,13 @@
               <el-select
                 v-model="formInline.certificateReportType"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择证书报告类型'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择证书报告类型'"
                 size="default"
                 style="width: 100%;"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <el-option
-                  v-for="item in certificationClassMap"
+                  v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
                   :value="item.value"
@@ -845,7 +846,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书类别:" prop="businessOriginalRecord.businessOrder.certifications">
               <el-select
                 v-model="formInline.businessOriginalRecord.businessOrder.certifications"
@@ -862,7 +863,7 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 13e05df..ef90dd5 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -427,103 +427,11 @@
             </template>
           </el-table-column>
         </template>
-        <template #default="{ row }">
-          <el-button
-            size="small"
-            type="primary"
-            link
-            @click="handleEdit(row, '查看', 'detail')"
-          >
-            查看
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批'"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '同意')"
-          >
-            同意
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '驳回')"
-          >
-            驳回
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '拒绝')"
-          >
-            拒绝
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '编辑', 'edit')"
-          >
-            编辑
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '提交')"
-          >
-            提交
-          </el-button>
-          <!-- 是发起者且审批中可以取消 -->
-          <el-button
-            v-if="row.approvalStatusName === '审批中'"
-            size="small"
-            link
-            type="info"
-            :disabled="row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '取消')"
-          >
-            取消
-          </el-button>
-          <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-          <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-          <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
-          <el-button
-            v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-            @click="handleEdit(row, '删除')"
-          >
-            删除
-          </el-button>
-        </template>
-        <!-- ------------------------------------------------- -->
         <template #columns>
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
+            :width="(activeTitle === '全部') ? 200 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -594,20 +502,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b67d2eb..2318d82 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -13,7 +13,7 @@
   name: string
   comp: any
 }
-const menu = shallowRef<menuType[]>([
+const menu = ref<menuType[]>([
   { name: '全部', comp: all },
   { name: '草稿箱', comp: drafts },
   { name: '待审批', comp: pending },
@@ -22,8 +22,9 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(all)
+const current = ref('')
+const currentApprovalStatus = ref('0')
+const currentComp = ref(all)
 const approvalStatusMap = ref({}) as any
 const approvalStatusReserveMap = ref({}) as any
 // 获取菜单状态
@@ -33,25 +34,25 @@
     res.data.forEach((item: any) => {
       approvalStatusMap.value[`${item.value}`] = item.name
     })
-    console.log(approvalStatusMap.value)
     // 审批状态字典 {草稿箱: 1}
     res.data.forEach((item: any) => {
       approvalStatusReserveMap.value[item.name] = `${item.value}`
     })
-    console.log(approvalStatusReserveMap.value)
+    // console.log(approvalStatusReserveMap.value)
   })
 }
 
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  window.sessionStorage.setItem('approveFileMenu', newValue)
+  console.log('set', window.sessionStorage.getItem('approveFileMenu'))
 })
-onUnmounted(() => {
-  sessionStorage.setItem('approveFileMenu', current.value)
-})
-onMounted(() => {
-  getMenuStatus()
-  current.value = sessionStorage.getItem('approveFileMenu') || '全部'
-  sessionStorage.getItem('approveFileMenu') ? sessionStorage.removeItem('approveFileMenu') : ''
+
+onMounted(async () => {
+  await getMenuStatus()
+  console.log('----', window.sessionStorage.getItem('approveFileMenu'))
+
+  current.value = window.sessionStorage.getItem('approveFileMenu') || '全部'
 })
 </script>
 
@@ -66,7 +67,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
+    <component :is="currentComp" :status="currentApprovalStatus" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
   </div>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index f995313..f7f5970 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -104,16 +104,17 @@
 })
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
@@ -141,12 +142,13 @@
           ElMessage.success('保存成功')
           // formEl?.resetFields()
           // $router.go(-1)
-          close()
+          // close()
         })
       })
     }
   })
 }
+// 提交
 const submitForm = () => {
   if (!submitId.value) {
     ElMessage.warning('请先保存')
@@ -162,9 +164,8 @@
     },
   ).then((res) => {
     submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-    // formEl?.resetFields()
       ElMessage.success('已提交')
-      $router.go(-1)
+      // $router.go(-1)
       close()
     })
   })
@@ -173,7 +174,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  $router.go(-1)
+  // $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -233,6 +234,9 @@
     }
   }
 })
+onMounted(() => {
+  ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+})
 </script>
 
 <template>
@@ -299,7 +303,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" disabled
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
@@ -308,7 +312,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/addDialog.vue b/src/views/measure/file/components/approve/addDialog.vue
index 7b77c83..f5f34e6 100644
--- a/src/views/measure/file/components/approve/addDialog.vue
+++ b/src/views/measure/file/components/approve/addDialog.vue
@@ -1,7 +1,7 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../../file-interface'
 import type { TableRow } from './approve-interface'
@@ -11,10 +11,11 @@
 import { toTreeList } from '@/utils/structure'
 import { printHtml } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts } from '@/api/measure/file'
+import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts, updateFail } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval, fetchApproval } from '@/api/approval'
 
 const $route = useRoute()
 const $router = useRouter()
@@ -97,31 +98,33 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    approvalStatusName.value = row.approvalStatusName
+    approvalStatusName.value = row.approvalStatusName // 审批状态名称
+    if (approvalStatusName.value !== '草稿箱') {
+      getApprovalRecord($route.query.processId as string) // 查询审批记录
+    }
   }
 }
-onMounted(() => {
-  initDialog($route.query)
-})
+
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.publishTime = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.publishTime = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
-// 提交
-const submitForm = () => {
+// 保存
+const saveForm = () => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    '确认保存吗？',
     '提示',
     {
       confirmButtonText: '确认',
@@ -129,96 +132,96 @@
       type: 'warning',
     },
   ).then((res) => {
-    if (approvalStatusName.value !== '草稿箱') {
+    if (title.value === '新建') {
       confirmDrafts(ruleForm).then((res) => {
         if (res.code === 200) {
           console.log(res.data, '保存成功')
           submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
             ElMessage.success('提交成功')
-            $router.go(-1)
             close()
           })
         }
       })
     }
-    else {
-      // 保存（草稿箱）
-      updateDrafts(ruleForm).then((res) => {
-        ElMessage.success('保存成功')
-        $router.go(-1)
-        close()
-      })
+    else if (title.value === '编辑') {
+      if (approvalStatusName.value === '未通过-驳回') {
+        const params = {
+          ...ruleForm,
+          processId: $route.query.processId,
+        }
+        updateFail(params).then((res) => {
+          ElMessage.success('保存成功')
+          close()
+        })
+      }
+      else { // 草稿箱、已取消
+        // 保存（草稿箱）
+        updateDrafts(ruleForm).then((res) => {
+          ElMessage.success('保存成功')
+          close()
+        })
+      }
     }
   })
 }
-// 编辑
-const update = (row: TableRow) => {
-  initDialog({
-    ...row,
-    title: '编辑',
-  })
-}
-// 删除
-const remove = (row: TableRow) => {
-  ElMessageBox.confirm(
-    '确认删除吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      if (row.approvalStatusName === '待审批') {
-        approvalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            $router.go(-1)
-          }
-        })
-      }
-      else {
-        deleteApi({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            $router.go(-1)
-          }
-        })
-      }
-    })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
-  close()
-  $router.go(-1)
+
+// -----------------------------------------审批--------------------------------------
+const approvalDialog = ref()
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (title.value !== '新建') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
 }
 // 审批结束回调
 const approvalSuccess = () => {
   close()
-  $router.go(-1)
 }
-const approvalDialog = ref()
-// 审批操作
-const approval = (type: string, processId: string) => {
-  approvalDialog.value.initDialog(type, processId)
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: $route.query.processId! as string,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', $route.query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', $route.query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', $route.query.taskId)
+  }
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: `文件审批${title.value}`, // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// -----------------------------------------------------------------------------------
 
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -227,6 +230,10 @@
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -234,9 +241,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -270,53 +279,34 @@
     }
   }
 })
+
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container>
     <detail-page :title="`文件审批-${title}`">
       <template #btns>
-        <div v-if="approvalStatusName === '草稿箱' || approvalStatusName === '已取消'">
-          <el-button v-if="title !== '编辑'" type="primary" @click="update(formDataRow)">
-            编辑
-          </el-button>
-          <el-button v-else type="primary" @click="submitForm">
-            {{ approvalStatusName === '草稿箱' ? '保存' : '提交' }}
-          </el-button>
-          <el-button type="primary" @click="remove(formDataRow)">
-            删除
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="approvalStatusName === '待审批'">
-          <el-button type="primary" @click="approval('agree', formDataRow.taskId)">
-            同意
-          </el-button>
-          <el-button type="primary" @click="approval('reject', formDataRow.taskId)">
-            驳回
-          </el-button>
-          <el-button type="primary" @click="approval('refuse', formDataRow.taskId)">
-            拒绝
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="approvalStatusName === '已通过' || approvalStatusName === '未通过'">
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="['全部', '审批中'].includes(approvalStatusName)">
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批' && $route.query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批' && $route.query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button v-if="title === '新建' || title === '编辑'" type="primary" @click="saveForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
       </template>
 
       <el-form id="print" ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
@@ -368,16 +358,17 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -417,6 +408,10 @@
         </el-row>
       </el-form>
     </detail-page>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && title !== '新建'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
index 8f0a408..a8133de 100644
--- a/src/views/measure/file/components/approve/all.vue
+++ b/src/views/measure/file/components/approve/all.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="全部" />
+  <template-pag name="全部" status="0" />
 </template>
diff --git a/src/views/measure/file/components/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
index 37f69fe..8cdbbb5 100644
--- a/src/views/measure/file/components/approve/cancel.vue
+++ b/src/views/measure/file/components/approve/cancel.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="已取消" />
+  <template-pag name="已取消" status="6" />
 </template>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 768c310..71e8b02 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -131,3 +131,12 @@
   })
 }
 
+// 未通过-驳回编辑
+export function updateFail(data: object) {
+  return request({
+    url: '/meter/file/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 554a196..2f491c0 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -19,13 +19,15 @@
         已取消: '6',
       } as approvalStatus, // 审批状态
       approvalStatusListTow: {
-        全部: '0',
-        草稿箱: '1',
-        待审批: '2',
-        审批中: '3',
-        已通过: '4',
-        未通过: '5',
-        已取消: '6',
+        '全部': '0',
+        '草稿箱': '1',
+        '待审批': '2',
+        '审批中': '3',
+        '已通过': '4',
+        '未通过': '5',
+        '已取消': '6',
+        '非草稿': '7',
+        '未通过-驳回': '8',
       } as approvalStatus, // 审批状态
     }),
     getters: {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 99ddb0f..1289bc8 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -489,6 +489,7 @@
 const confirmCheckoutTemplate = (val: any) => {
   formInline.value.templateId = val.id // 证书报告模板id
   formInline.value.templateName = val.templateName || '' // 证书报告模板名称
+  formInline.value.certificateReportType = val.certificationType // 证书报告类型
 }
 
 // --------------------------------------选择签章-----------------------------------
@@ -674,13 +675,13 @@
               <el-select
                 v-model="formInline.certificateReportType"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择证书报告类型'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择证书报告类型'"
                 size="default"
                 style="width: 100%;"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <el-option
-                  v-for="item in certificationClassMap"
+                  v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
                   :value="item.value"
@@ -845,7 +846,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书类别:" prop="businessOriginalRecord.businessOrder.certifications">
               <el-select
                 v-model="formInline.businessOriginalRecord.businessOrder.certifications"
@@ -862,7 +863,7 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 13e05df..ef90dd5 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -427,103 +427,11 @@
             </template>
           </el-table-column>
         </template>
-        <template #default="{ row }">
-          <el-button
-            size="small"
-            type="primary"
-            link
-            @click="handleEdit(row, '查看', 'detail')"
-          >
-            查看
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批'"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '同意')"
-          >
-            同意
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '驳回')"
-          >
-            驳回
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '拒绝')"
-          >
-            拒绝
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '编辑', 'edit')"
-          >
-            编辑
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '提交')"
-          >
-            提交
-          </el-button>
-          <!-- 是发起者且审批中可以取消 -->
-          <el-button
-            v-if="row.approvalStatusName === '审批中'"
-            size="small"
-            link
-            type="info"
-            :disabled="row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '取消')"
-          >
-            取消
-          </el-button>
-          <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-          <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-          <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
-          <el-button
-            v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-            @click="handleEdit(row, '删除')"
-          >
-            删除
-          </el-button>
-        </template>
-        <!-- ------------------------------------------------- -->
         <template #columns>
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
+            :width="(activeTitle === '全部') ? 200 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -594,20 +502,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b67d2eb..2318d82 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -13,7 +13,7 @@
   name: string
   comp: any
 }
-const menu = shallowRef<menuType[]>([
+const menu = ref<menuType[]>([
   { name: '全部', comp: all },
   { name: '草稿箱', comp: drafts },
   { name: '待审批', comp: pending },
@@ -22,8 +22,9 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(all)
+const current = ref('')
+const currentApprovalStatus = ref('0')
+const currentComp = ref(all)
 const approvalStatusMap = ref({}) as any
 const approvalStatusReserveMap = ref({}) as any
 // 获取菜单状态
@@ -33,25 +34,25 @@
     res.data.forEach((item: any) => {
       approvalStatusMap.value[`${item.value}`] = item.name
     })
-    console.log(approvalStatusMap.value)
     // 审批状态字典 {草稿箱: 1}
     res.data.forEach((item: any) => {
       approvalStatusReserveMap.value[item.name] = `${item.value}`
     })
-    console.log(approvalStatusReserveMap.value)
+    // console.log(approvalStatusReserveMap.value)
   })
 }
 
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  window.sessionStorage.setItem('approveFileMenu', newValue)
+  console.log('set', window.sessionStorage.getItem('approveFileMenu'))
 })
-onUnmounted(() => {
-  sessionStorage.setItem('approveFileMenu', current.value)
-})
-onMounted(() => {
-  getMenuStatus()
-  current.value = sessionStorage.getItem('approveFileMenu') || '全部'
-  sessionStorage.getItem('approveFileMenu') ? sessionStorage.removeItem('approveFileMenu') : ''
+
+onMounted(async () => {
+  await getMenuStatus()
+  console.log('----', window.sessionStorage.getItem('approveFileMenu'))
+
+  current.value = window.sessionStorage.getItem('approveFileMenu') || '全部'
 })
 </script>
 
@@ -66,7 +67,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
+    <component :is="currentComp" :status="currentApprovalStatus" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
   </div>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index f995313..f7f5970 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -104,16 +104,17 @@
 })
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
@@ -141,12 +142,13 @@
           ElMessage.success('保存成功')
           // formEl?.resetFields()
           // $router.go(-1)
-          close()
+          // close()
         })
       })
     }
   })
 }
+// 提交
 const submitForm = () => {
   if (!submitId.value) {
     ElMessage.warning('请先保存')
@@ -162,9 +164,8 @@
     },
   ).then((res) => {
     submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-    // formEl?.resetFields()
       ElMessage.success('已提交')
-      $router.go(-1)
+      // $router.go(-1)
       close()
     })
   })
@@ -173,7 +174,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  $router.go(-1)
+  // $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -233,6 +234,9 @@
     }
   }
 })
+onMounted(() => {
+  ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+})
 </script>
 
 <template>
@@ -299,7 +303,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" disabled
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
@@ -308,7 +312,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/addDialog.vue b/src/views/measure/file/components/approve/addDialog.vue
index 7b77c83..f5f34e6 100644
--- a/src/views/measure/file/components/approve/addDialog.vue
+++ b/src/views/measure/file/components/approve/addDialog.vue
@@ -1,7 +1,7 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../../file-interface'
 import type { TableRow } from './approve-interface'
@@ -11,10 +11,11 @@
 import { toTreeList } from '@/utils/structure'
 import { printHtml } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts } from '@/api/measure/file'
+import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts, updateFail } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval, fetchApproval } from '@/api/approval'
 
 const $route = useRoute()
 const $router = useRouter()
@@ -97,31 +98,33 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    approvalStatusName.value = row.approvalStatusName
+    approvalStatusName.value = row.approvalStatusName // 审批状态名称
+    if (approvalStatusName.value !== '草稿箱') {
+      getApprovalRecord($route.query.processId as string) // 查询审批记录
+    }
   }
 }
-onMounted(() => {
-  initDialog($route.query)
-})
+
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.publishTime = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.publishTime = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
-// 提交
-const submitForm = () => {
+// 保存
+const saveForm = () => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    '确认保存吗？',
     '提示',
     {
       confirmButtonText: '确认',
@@ -129,96 +132,96 @@
       type: 'warning',
     },
   ).then((res) => {
-    if (approvalStatusName.value !== '草稿箱') {
+    if (title.value === '新建') {
       confirmDrafts(ruleForm).then((res) => {
         if (res.code === 200) {
           console.log(res.data, '保存成功')
           submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
             ElMessage.success('提交成功')
-            $router.go(-1)
             close()
           })
         }
       })
     }
-    else {
-      // 保存（草稿箱）
-      updateDrafts(ruleForm).then((res) => {
-        ElMessage.success('保存成功')
-        $router.go(-1)
-        close()
-      })
+    else if (title.value === '编辑') {
+      if (approvalStatusName.value === '未通过-驳回') {
+        const params = {
+          ...ruleForm,
+          processId: $route.query.processId,
+        }
+        updateFail(params).then((res) => {
+          ElMessage.success('保存成功')
+          close()
+        })
+      }
+      else { // 草稿箱、已取消
+        // 保存（草稿箱）
+        updateDrafts(ruleForm).then((res) => {
+          ElMessage.success('保存成功')
+          close()
+        })
+      }
     }
   })
 }
-// 编辑
-const update = (row: TableRow) => {
-  initDialog({
-    ...row,
-    title: '编辑',
-  })
-}
-// 删除
-const remove = (row: TableRow) => {
-  ElMessageBox.confirm(
-    '确认删除吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      if (row.approvalStatusName === '待审批') {
-        approvalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            $router.go(-1)
-          }
-        })
-      }
-      else {
-        deleteApi({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            $router.go(-1)
-          }
-        })
-      }
-    })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
-  close()
-  $router.go(-1)
+
+// -----------------------------------------审批--------------------------------------
+const approvalDialog = ref()
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (title.value !== '新建') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
 }
 // 审批结束回调
 const approvalSuccess = () => {
   close()
-  $router.go(-1)
 }
-const approvalDialog = ref()
-// 审批操作
-const approval = (type: string, processId: string) => {
-  approvalDialog.value.initDialog(type, processId)
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: $route.query.processId! as string,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', $route.query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', $route.query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', $route.query.taskId)
+  }
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: `文件审批${title.value}`, // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// -----------------------------------------------------------------------------------
 
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -227,6 +230,10 @@
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -234,9 +241,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -270,53 +279,34 @@
     }
   }
 })
+
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container>
     <detail-page :title="`文件审批-${title}`">
       <template #btns>
-        <div v-if="approvalStatusName === '草稿箱' || approvalStatusName === '已取消'">
-          <el-button v-if="title !== '编辑'" type="primary" @click="update(formDataRow)">
-            编辑
-          </el-button>
-          <el-button v-else type="primary" @click="submitForm">
-            {{ approvalStatusName === '草稿箱' ? '保存' : '提交' }}
-          </el-button>
-          <el-button type="primary" @click="remove(formDataRow)">
-            删除
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="approvalStatusName === '待审批'">
-          <el-button type="primary" @click="approval('agree', formDataRow.taskId)">
-            同意
-          </el-button>
-          <el-button type="primary" @click="approval('reject', formDataRow.taskId)">
-            驳回
-          </el-button>
-          <el-button type="primary" @click="approval('refuse', formDataRow.taskId)">
-            拒绝
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="approvalStatusName === '已通过' || approvalStatusName === '未通过'">
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="['全部', '审批中'].includes(approvalStatusName)">
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批' && $route.query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批' && $route.query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button v-if="title === '新建' || title === '编辑'" type="primary" @click="saveForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
       </template>
 
       <el-form id="print" ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
@@ -368,16 +358,17 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -417,6 +408,10 @@
         </el-row>
       </el-form>
     </detail-page>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && title !== '新建'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
index 8f0a408..a8133de 100644
--- a/src/views/measure/file/components/approve/all.vue
+++ b/src/views/measure/file/components/approve/all.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="全部" />
+  <template-pag name="全部" status="0" />
 </template>
diff --git a/src/views/measure/file/components/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
index 37f69fe..8cdbbb5 100644
--- a/src/views/measure/file/components/approve/cancel.vue
+++ b/src/views/measure/file/components/approve/cancel.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="已取消" />
+  <template-pag name="已取消" status="6" />
 </template>
diff --git a/src/views/measure/file/components/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
index 033e874..d1f7274 100644
--- a/src/views/measure/file/components/approve/drafts.vue
+++ b/src/views/measure/file/components/approve/drafts.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="草稿箱" />
+  <template-pag name="草稿箱" status="1" />
 </template>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 768c310..71e8b02 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -131,3 +131,12 @@
   })
 }
 
+// 未通过-驳回编辑
+export function updateFail(data: object) {
+  return request({
+    url: '/meter/file/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 554a196..2f491c0 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -19,13 +19,15 @@
         已取消: '6',
       } as approvalStatus, // 审批状态
       approvalStatusListTow: {
-        全部: '0',
-        草稿箱: '1',
-        待审批: '2',
-        审批中: '3',
-        已通过: '4',
-        未通过: '5',
-        已取消: '6',
+        '全部': '0',
+        '草稿箱': '1',
+        '待审批': '2',
+        '审批中': '3',
+        '已通过': '4',
+        '未通过': '5',
+        '已取消': '6',
+        '非草稿': '7',
+        '未通过-驳回': '8',
       } as approvalStatus, // 审批状态
     }),
     getters: {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 99ddb0f..1289bc8 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -489,6 +489,7 @@
 const confirmCheckoutTemplate = (val: any) => {
   formInline.value.templateId = val.id // 证书报告模板id
   formInline.value.templateName = val.templateName || '' // 证书报告模板名称
+  formInline.value.certificateReportType = val.certificationType // 证书报告类型
 }
 
 // --------------------------------------选择签章-----------------------------------
@@ -674,13 +675,13 @@
               <el-select
                 v-model="formInline.certificateReportType"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择证书报告类型'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择证书报告类型'"
                 size="default"
                 style="width: 100%;"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <el-option
-                  v-for="item in certificationClassMap"
+                  v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
                   :value="item.value"
@@ -845,7 +846,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书类别:" prop="businessOriginalRecord.businessOrder.certifications">
               <el-select
                 v-model="formInline.businessOriginalRecord.businessOrder.certifications"
@@ -862,7 +863,7 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 13e05df..ef90dd5 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -427,103 +427,11 @@
             </template>
           </el-table-column>
         </template>
-        <template #default="{ row }">
-          <el-button
-            size="small"
-            type="primary"
-            link
-            @click="handleEdit(row, '查看', 'detail')"
-          >
-            查看
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批'"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '同意')"
-          >
-            同意
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '驳回')"
-          >
-            驳回
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '拒绝')"
-          >
-            拒绝
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '编辑', 'edit')"
-          >
-            编辑
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '提交')"
-          >
-            提交
-          </el-button>
-          <!-- 是发起者且审批中可以取消 -->
-          <el-button
-            v-if="row.approvalStatusName === '审批中'"
-            size="small"
-            link
-            type="info"
-            :disabled="row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '取消')"
-          >
-            取消
-          </el-button>
-          <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-          <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-          <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
-          <el-button
-            v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-            @click="handleEdit(row, '删除')"
-          >
-            删除
-          </el-button>
-        </template>
-        <!-- ------------------------------------------------- -->
         <template #columns>
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
+            :width="(activeTitle === '全部') ? 200 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -594,20 +502,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b67d2eb..2318d82 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -13,7 +13,7 @@
   name: string
   comp: any
 }
-const menu = shallowRef<menuType[]>([
+const menu = ref<menuType[]>([
   { name: '全部', comp: all },
   { name: '草稿箱', comp: drafts },
   { name: '待审批', comp: pending },
@@ -22,8 +22,9 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(all)
+const current = ref('')
+const currentApprovalStatus = ref('0')
+const currentComp = ref(all)
 const approvalStatusMap = ref({}) as any
 const approvalStatusReserveMap = ref({}) as any
 // 获取菜单状态
@@ -33,25 +34,25 @@
     res.data.forEach((item: any) => {
       approvalStatusMap.value[`${item.value}`] = item.name
     })
-    console.log(approvalStatusMap.value)
     // 审批状态字典 {草稿箱: 1}
     res.data.forEach((item: any) => {
       approvalStatusReserveMap.value[item.name] = `${item.value}`
     })
-    console.log(approvalStatusReserveMap.value)
+    // console.log(approvalStatusReserveMap.value)
   })
 }
 
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  window.sessionStorage.setItem('approveFileMenu', newValue)
+  console.log('set', window.sessionStorage.getItem('approveFileMenu'))
 })
-onUnmounted(() => {
-  sessionStorage.setItem('approveFileMenu', current.value)
-})
-onMounted(() => {
-  getMenuStatus()
-  current.value = sessionStorage.getItem('approveFileMenu') || '全部'
-  sessionStorage.getItem('approveFileMenu') ? sessionStorage.removeItem('approveFileMenu') : ''
+
+onMounted(async () => {
+  await getMenuStatus()
+  console.log('----', window.sessionStorage.getItem('approveFileMenu'))
+
+  current.value = window.sessionStorage.getItem('approveFileMenu') || '全部'
 })
 </script>
 
@@ -66,7 +67,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
+    <component :is="currentComp" :status="currentApprovalStatus" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
   </div>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index f995313..f7f5970 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -104,16 +104,17 @@
 })
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
@@ -141,12 +142,13 @@
           ElMessage.success('保存成功')
           // formEl?.resetFields()
           // $router.go(-1)
-          close()
+          // close()
         })
       })
     }
   })
 }
+// 提交
 const submitForm = () => {
   if (!submitId.value) {
     ElMessage.warning('请先保存')
@@ -162,9 +164,8 @@
     },
   ).then((res) => {
     submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-    // formEl?.resetFields()
       ElMessage.success('已提交')
-      $router.go(-1)
+      // $router.go(-1)
       close()
     })
   })
@@ -173,7 +174,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  $router.go(-1)
+  // $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -233,6 +234,9 @@
     }
   }
 })
+onMounted(() => {
+  ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+})
 </script>
 
 <template>
@@ -299,7 +303,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" disabled
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
@@ -308,7 +312,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/addDialog.vue b/src/views/measure/file/components/approve/addDialog.vue
index 7b77c83..f5f34e6 100644
--- a/src/views/measure/file/components/approve/addDialog.vue
+++ b/src/views/measure/file/components/approve/addDialog.vue
@@ -1,7 +1,7 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../../file-interface'
 import type { TableRow } from './approve-interface'
@@ -11,10 +11,11 @@
 import { toTreeList } from '@/utils/structure'
 import { printHtml } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts } from '@/api/measure/file'
+import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts, updateFail } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval, fetchApproval } from '@/api/approval'
 
 const $route = useRoute()
 const $router = useRouter()
@@ -97,31 +98,33 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    approvalStatusName.value = row.approvalStatusName
+    approvalStatusName.value = row.approvalStatusName // 审批状态名称
+    if (approvalStatusName.value !== '草稿箱') {
+      getApprovalRecord($route.query.processId as string) // 查询审批记录
+    }
   }
 }
-onMounted(() => {
-  initDialog($route.query)
-})
+
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.publishTime = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.publishTime = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
-// 提交
-const submitForm = () => {
+// 保存
+const saveForm = () => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    '确认保存吗？',
     '提示',
     {
       confirmButtonText: '确认',
@@ -129,96 +132,96 @@
       type: 'warning',
     },
   ).then((res) => {
-    if (approvalStatusName.value !== '草稿箱') {
+    if (title.value === '新建') {
       confirmDrafts(ruleForm).then((res) => {
         if (res.code === 200) {
           console.log(res.data, '保存成功')
           submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
             ElMessage.success('提交成功')
-            $router.go(-1)
             close()
           })
         }
       })
     }
-    else {
-      // 保存（草稿箱）
-      updateDrafts(ruleForm).then((res) => {
-        ElMessage.success('保存成功')
-        $router.go(-1)
-        close()
-      })
+    else if (title.value === '编辑') {
+      if (approvalStatusName.value === '未通过-驳回') {
+        const params = {
+          ...ruleForm,
+          processId: $route.query.processId,
+        }
+        updateFail(params).then((res) => {
+          ElMessage.success('保存成功')
+          close()
+        })
+      }
+      else { // 草稿箱、已取消
+        // 保存（草稿箱）
+        updateDrafts(ruleForm).then((res) => {
+          ElMessage.success('保存成功')
+          close()
+        })
+      }
     }
   })
 }
-// 编辑
-const update = (row: TableRow) => {
-  initDialog({
-    ...row,
-    title: '编辑',
-  })
-}
-// 删除
-const remove = (row: TableRow) => {
-  ElMessageBox.confirm(
-    '确认删除吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      if (row.approvalStatusName === '待审批') {
-        approvalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            $router.go(-1)
-          }
-        })
-      }
-      else {
-        deleteApi({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            $router.go(-1)
-          }
-        })
-      }
-    })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
-  close()
-  $router.go(-1)
+
+// -----------------------------------------审批--------------------------------------
+const approvalDialog = ref()
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (title.value !== '新建') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
 }
 // 审批结束回调
 const approvalSuccess = () => {
   close()
-  $router.go(-1)
 }
-const approvalDialog = ref()
-// 审批操作
-const approval = (type: string, processId: string) => {
-  approvalDialog.value.initDialog(type, processId)
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: $route.query.processId! as string,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', $route.query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', $route.query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', $route.query.taskId)
+  }
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: `文件审批${title.value}`, // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// -----------------------------------------------------------------------------------
 
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -227,6 +230,10 @@
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -234,9 +241,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -270,53 +279,34 @@
     }
   }
 })
+
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container>
     <detail-page :title="`文件审批-${title}`">
       <template #btns>
-        <div v-if="approvalStatusName === '草稿箱' || approvalStatusName === '已取消'">
-          <el-button v-if="title !== '编辑'" type="primary" @click="update(formDataRow)">
-            编辑
-          </el-button>
-          <el-button v-else type="primary" @click="submitForm">
-            {{ approvalStatusName === '草稿箱' ? '保存' : '提交' }}
-          </el-button>
-          <el-button type="primary" @click="remove(formDataRow)">
-            删除
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="approvalStatusName === '待审批'">
-          <el-button type="primary" @click="approval('agree', formDataRow.taskId)">
-            同意
-          </el-button>
-          <el-button type="primary" @click="approval('reject', formDataRow.taskId)">
-            驳回
-          </el-button>
-          <el-button type="primary" @click="approval('refuse', formDataRow.taskId)">
-            拒绝
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="approvalStatusName === '已通过' || approvalStatusName === '未通过'">
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="['全部', '审批中'].includes(approvalStatusName)">
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批' && $route.query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批' && $route.query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button v-if="title === '新建' || title === '编辑'" type="primary" @click="saveForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
       </template>
 
       <el-form id="print" ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
@@ -368,16 +358,17 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -417,6 +408,10 @@
         </el-row>
       </el-form>
     </detail-page>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && title !== '新建'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
index 8f0a408..a8133de 100644
--- a/src/views/measure/file/components/approve/all.vue
+++ b/src/views/measure/file/components/approve/all.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="全部" />
+  <template-pag name="全部" status="0" />
 </template>
diff --git a/src/views/measure/file/components/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
index 37f69fe..8cdbbb5 100644
--- a/src/views/measure/file/components/approve/cancel.vue
+++ b/src/views/measure/file/components/approve/cancel.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="已取消" />
+  <template-pag name="已取消" status="6" />
 </template>
diff --git a/src/views/measure/file/components/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
index 033e874..d1f7274 100644
--- a/src/views/measure/file/components/approve/drafts.vue
+++ b/src/views/measure/file/components/approve/drafts.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="草稿箱" />
+  <template-pag name="草稿箱" status="1" />
 </template>
diff --git a/src/views/measure/file/components/approve/inApproval.vue b/src/views/measure/file/components/approve/inApproval.vue
index 78adba8..e96f449 100644
--- a/src/views/measure/file/components/approve/inApproval.vue
+++ b/src/views/measure/file/components/approve/inApproval.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="审批中" />
+  <template-pag name="审批中" status="3" />
 </template>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 768c310..71e8b02 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -131,3 +131,12 @@
   })
 }
 
+// 未通过-驳回编辑
+export function updateFail(data: object) {
+  return request({
+    url: '/meter/file/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 554a196..2f491c0 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -19,13 +19,15 @@
         已取消: '6',
       } as approvalStatus, // 审批状态
       approvalStatusListTow: {
-        全部: '0',
-        草稿箱: '1',
-        待审批: '2',
-        审批中: '3',
-        已通过: '4',
-        未通过: '5',
-        已取消: '6',
+        '全部': '0',
+        '草稿箱': '1',
+        '待审批': '2',
+        '审批中': '3',
+        '已通过': '4',
+        '未通过': '5',
+        '已取消': '6',
+        '非草稿': '7',
+        '未通过-驳回': '8',
       } as approvalStatus, // 审批状态
     }),
     getters: {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 99ddb0f..1289bc8 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -489,6 +489,7 @@
 const confirmCheckoutTemplate = (val: any) => {
   formInline.value.templateId = val.id // 证书报告模板id
   formInline.value.templateName = val.templateName || '' // 证书报告模板名称
+  formInline.value.certificateReportType = val.certificationType // 证书报告类型
 }
 
 // --------------------------------------选择签章-----------------------------------
@@ -674,13 +675,13 @@
               <el-select
                 v-model="formInline.certificateReportType"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择证书报告类型'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择证书报告类型'"
                 size="default"
                 style="width: 100%;"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <el-option
-                  v-for="item in certificationClassMap"
+                  v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
                   :value="item.value"
@@ -845,7 +846,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书类别:" prop="businessOriginalRecord.businessOrder.certifications">
               <el-select
                 v-model="formInline.businessOriginalRecord.businessOrder.certifications"
@@ -862,7 +863,7 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 13e05df..ef90dd5 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -427,103 +427,11 @@
             </template>
           </el-table-column>
         </template>
-        <template #default="{ row }">
-          <el-button
-            size="small"
-            type="primary"
-            link
-            @click="handleEdit(row, '查看', 'detail')"
-          >
-            查看
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批'"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '同意')"
-          >
-            同意
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '驳回')"
-          >
-            驳回
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '拒绝')"
-          >
-            拒绝
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '编辑', 'edit')"
-          >
-            编辑
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '提交')"
-          >
-            提交
-          </el-button>
-          <!-- 是发起者且审批中可以取消 -->
-          <el-button
-            v-if="row.approvalStatusName === '审批中'"
-            size="small"
-            link
-            type="info"
-            :disabled="row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '取消')"
-          >
-            取消
-          </el-button>
-          <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-          <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-          <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
-          <el-button
-            v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-            @click="handleEdit(row, '删除')"
-          >
-            删除
-          </el-button>
-        </template>
-        <!-- ------------------------------------------------- -->
         <template #columns>
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
+            :width="(activeTitle === '全部') ? 200 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -594,20 +502,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b67d2eb..2318d82 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -13,7 +13,7 @@
   name: string
   comp: any
 }
-const menu = shallowRef<menuType[]>([
+const menu = ref<menuType[]>([
   { name: '全部', comp: all },
   { name: '草稿箱', comp: drafts },
   { name: '待审批', comp: pending },
@@ -22,8 +22,9 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(all)
+const current = ref('')
+const currentApprovalStatus = ref('0')
+const currentComp = ref(all)
 const approvalStatusMap = ref({}) as any
 const approvalStatusReserveMap = ref({}) as any
 // 获取菜单状态
@@ -33,25 +34,25 @@
     res.data.forEach((item: any) => {
       approvalStatusMap.value[`${item.value}`] = item.name
     })
-    console.log(approvalStatusMap.value)
     // 审批状态字典 {草稿箱: 1}
     res.data.forEach((item: any) => {
       approvalStatusReserveMap.value[item.name] = `${item.value}`
     })
-    console.log(approvalStatusReserveMap.value)
+    // console.log(approvalStatusReserveMap.value)
   })
 }
 
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  window.sessionStorage.setItem('approveFileMenu', newValue)
+  console.log('set', window.sessionStorage.getItem('approveFileMenu'))
 })
-onUnmounted(() => {
-  sessionStorage.setItem('approveFileMenu', current.value)
-})
-onMounted(() => {
-  getMenuStatus()
-  current.value = sessionStorage.getItem('approveFileMenu') || '全部'
-  sessionStorage.getItem('approveFileMenu') ? sessionStorage.removeItem('approveFileMenu') : ''
+
+onMounted(async () => {
+  await getMenuStatus()
+  console.log('----', window.sessionStorage.getItem('approveFileMenu'))
+
+  current.value = window.sessionStorage.getItem('approveFileMenu') || '全部'
 })
 </script>
 
@@ -66,7 +67,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
+    <component :is="currentComp" :status="currentApprovalStatus" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
   </div>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index f995313..f7f5970 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -104,16 +104,17 @@
 })
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
@@ -141,12 +142,13 @@
           ElMessage.success('保存成功')
           // formEl?.resetFields()
           // $router.go(-1)
-          close()
+          // close()
         })
       })
     }
   })
 }
+// 提交
 const submitForm = () => {
   if (!submitId.value) {
     ElMessage.warning('请先保存')
@@ -162,9 +164,8 @@
     },
   ).then((res) => {
     submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-    // formEl?.resetFields()
       ElMessage.success('已提交')
-      $router.go(-1)
+      // $router.go(-1)
       close()
     })
   })
@@ -173,7 +174,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  $router.go(-1)
+  // $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -233,6 +234,9 @@
     }
   }
 })
+onMounted(() => {
+  ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+})
 </script>
 
 <template>
@@ -299,7 +303,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" disabled
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
@@ -308,7 +312,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/addDialog.vue b/src/views/measure/file/components/approve/addDialog.vue
index 7b77c83..f5f34e6 100644
--- a/src/views/measure/file/components/approve/addDialog.vue
+++ b/src/views/measure/file/components/approve/addDialog.vue
@@ -1,7 +1,7 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../../file-interface'
 import type { TableRow } from './approve-interface'
@@ -11,10 +11,11 @@
 import { toTreeList } from '@/utils/structure'
 import { printHtml } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts } from '@/api/measure/file'
+import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts, updateFail } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval, fetchApproval } from '@/api/approval'
 
 const $route = useRoute()
 const $router = useRouter()
@@ -97,31 +98,33 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    approvalStatusName.value = row.approvalStatusName
+    approvalStatusName.value = row.approvalStatusName // 审批状态名称
+    if (approvalStatusName.value !== '草稿箱') {
+      getApprovalRecord($route.query.processId as string) // 查询审批记录
+    }
   }
 }
-onMounted(() => {
-  initDialog($route.query)
-})
+
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.publishTime = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.publishTime = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
-// 提交
-const submitForm = () => {
+// 保存
+const saveForm = () => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    '确认保存吗？',
     '提示',
     {
       confirmButtonText: '确认',
@@ -129,96 +132,96 @@
       type: 'warning',
     },
   ).then((res) => {
-    if (approvalStatusName.value !== '草稿箱') {
+    if (title.value === '新建') {
       confirmDrafts(ruleForm).then((res) => {
         if (res.code === 200) {
           console.log(res.data, '保存成功')
           submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
             ElMessage.success('提交成功')
-            $router.go(-1)
             close()
           })
         }
       })
     }
-    else {
-      // 保存（草稿箱）
-      updateDrafts(ruleForm).then((res) => {
-        ElMessage.success('保存成功')
-        $router.go(-1)
-        close()
-      })
+    else if (title.value === '编辑') {
+      if (approvalStatusName.value === '未通过-驳回') {
+        const params = {
+          ...ruleForm,
+          processId: $route.query.processId,
+        }
+        updateFail(params).then((res) => {
+          ElMessage.success('保存成功')
+          close()
+        })
+      }
+      else { // 草稿箱、已取消
+        // 保存（草稿箱）
+        updateDrafts(ruleForm).then((res) => {
+          ElMessage.success('保存成功')
+          close()
+        })
+      }
     }
   })
 }
-// 编辑
-const update = (row: TableRow) => {
-  initDialog({
-    ...row,
-    title: '编辑',
-  })
-}
-// 删除
-const remove = (row: TableRow) => {
-  ElMessageBox.confirm(
-    '确认删除吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      if (row.approvalStatusName === '待审批') {
-        approvalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            $router.go(-1)
-          }
-        })
-      }
-      else {
-        deleteApi({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            $router.go(-1)
-          }
-        })
-      }
-    })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
-  close()
-  $router.go(-1)
+
+// -----------------------------------------审批--------------------------------------
+const approvalDialog = ref()
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (title.value !== '新建') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
 }
 // 审批结束回调
 const approvalSuccess = () => {
   close()
-  $router.go(-1)
 }
-const approvalDialog = ref()
-// 审批操作
-const approval = (type: string, processId: string) => {
-  approvalDialog.value.initDialog(type, processId)
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: $route.query.processId! as string,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', $route.query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', $route.query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', $route.query.taskId)
+  }
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: `文件审批${title.value}`, // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// -----------------------------------------------------------------------------------
 
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -227,6 +230,10 @@
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -234,9 +241,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -270,53 +279,34 @@
     }
   }
 })
+
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container>
     <detail-page :title="`文件审批-${title}`">
       <template #btns>
-        <div v-if="approvalStatusName === '草稿箱' || approvalStatusName === '已取消'">
-          <el-button v-if="title !== '编辑'" type="primary" @click="update(formDataRow)">
-            编辑
-          </el-button>
-          <el-button v-else type="primary" @click="submitForm">
-            {{ approvalStatusName === '草稿箱' ? '保存' : '提交' }}
-          </el-button>
-          <el-button type="primary" @click="remove(formDataRow)">
-            删除
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="approvalStatusName === '待审批'">
-          <el-button type="primary" @click="approval('agree', formDataRow.taskId)">
-            同意
-          </el-button>
-          <el-button type="primary" @click="approval('reject', formDataRow.taskId)">
-            驳回
-          </el-button>
-          <el-button type="primary" @click="approval('refuse', formDataRow.taskId)">
-            拒绝
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="approvalStatusName === '已通过' || approvalStatusName === '未通过'">
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="['全部', '审批中'].includes(approvalStatusName)">
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批' && $route.query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批' && $route.query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button v-if="title === '新建' || title === '编辑'" type="primary" @click="saveForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
       </template>
 
       <el-form id="print" ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
@@ -368,16 +358,17 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -417,6 +408,10 @@
         </el-row>
       </el-form>
     </detail-page>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && title !== '新建'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
index 8f0a408..a8133de 100644
--- a/src/views/measure/file/components/approve/all.vue
+++ b/src/views/measure/file/components/approve/all.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="全部" />
+  <template-pag name="全部" status="0" />
 </template>
diff --git a/src/views/measure/file/components/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
index 37f69fe..8cdbbb5 100644
--- a/src/views/measure/file/components/approve/cancel.vue
+++ b/src/views/measure/file/components/approve/cancel.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="已取消" />
+  <template-pag name="已取消" status="6" />
 </template>
diff --git a/src/views/measure/file/components/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
index 033e874..d1f7274 100644
--- a/src/views/measure/file/components/approve/drafts.vue
+++ b/src/views/measure/file/components/approve/drafts.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="草稿箱" />
+  <template-pag name="草稿箱" status="1" />
 </template>
diff --git a/src/views/measure/file/components/approve/inApproval.vue b/src/views/measure/file/components/approve/inApproval.vue
index 78adba8..e96f449 100644
--- a/src/views/measure/file/components/approve/inApproval.vue
+++ b/src/views/measure/file/components/approve/inApproval.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="审批中" />
+  <template-pag name="审批中" status="3" />
 </template>
diff --git a/src/views/measure/file/components/approve/passed.vue b/src/views/measure/file/components/approve/passed.vue
index 50ea492..fbdef76 100644
--- a/src/views/measure/file/components/approve/passed.vue
+++ b/src/views/measure/file/components/approve/passed.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="已通过" value="4" />
+  <template-pag name="已通过" value="4" status="4" />
 </template>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 768c310..71e8b02 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -131,3 +131,12 @@
   })
 }
 
+// 未通过-驳回编辑
+export function updateFail(data: object) {
+  return request({
+    url: '/meter/file/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 554a196..2f491c0 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -19,13 +19,15 @@
         已取消: '6',
       } as approvalStatus, // 审批状态
       approvalStatusListTow: {
-        全部: '0',
-        草稿箱: '1',
-        待审批: '2',
-        审批中: '3',
-        已通过: '4',
-        未通过: '5',
-        已取消: '6',
+        '全部': '0',
+        '草稿箱': '1',
+        '待审批': '2',
+        '审批中': '3',
+        '已通过': '4',
+        '未通过': '5',
+        '已取消': '6',
+        '非草稿': '7',
+        '未通过-驳回': '8',
       } as approvalStatus, // 审批状态
     }),
     getters: {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 99ddb0f..1289bc8 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -489,6 +489,7 @@
 const confirmCheckoutTemplate = (val: any) => {
   formInline.value.templateId = val.id // 证书报告模板id
   formInline.value.templateName = val.templateName || '' // 证书报告模板名称
+  formInline.value.certificateReportType = val.certificationType // 证书报告类型
 }
 
 // --------------------------------------选择签章-----------------------------------
@@ -674,13 +675,13 @@
               <el-select
                 v-model="formInline.certificateReportType"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择证书报告类型'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择证书报告类型'"
                 size="default"
                 style="width: 100%;"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <el-option
-                  v-for="item in certificationClassMap"
+                  v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
                   :value="item.value"
@@ -845,7 +846,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书类别:" prop="businessOriginalRecord.businessOrder.certifications">
               <el-select
                 v-model="formInline.businessOriginalRecord.businessOrder.certifications"
@@ -862,7 +863,7 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 13e05df..ef90dd5 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -427,103 +427,11 @@
             </template>
           </el-table-column>
         </template>
-        <template #default="{ row }">
-          <el-button
-            size="small"
-            type="primary"
-            link
-            @click="handleEdit(row, '查看', 'detail')"
-          >
-            查看
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批'"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '同意')"
-          >
-            同意
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '驳回')"
-          >
-            驳回
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '拒绝')"
-          >
-            拒绝
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '编辑', 'edit')"
-          >
-            编辑
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '提交')"
-          >
-            提交
-          </el-button>
-          <!-- 是发起者且审批中可以取消 -->
-          <el-button
-            v-if="row.approvalStatusName === '审批中'"
-            size="small"
-            link
-            type="info"
-            :disabled="row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '取消')"
-          >
-            取消
-          </el-button>
-          <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-          <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-          <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
-          <el-button
-            v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-            @click="handleEdit(row, '删除')"
-          >
-            删除
-          </el-button>
-        </template>
-        <!-- ------------------------------------------------- -->
         <template #columns>
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
+            :width="(activeTitle === '全部') ? 200 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -594,20 +502,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b67d2eb..2318d82 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -13,7 +13,7 @@
   name: string
   comp: any
 }
-const menu = shallowRef<menuType[]>([
+const menu = ref<menuType[]>([
   { name: '全部', comp: all },
   { name: '草稿箱', comp: drafts },
   { name: '待审批', comp: pending },
@@ -22,8 +22,9 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(all)
+const current = ref('')
+const currentApprovalStatus = ref('0')
+const currentComp = ref(all)
 const approvalStatusMap = ref({}) as any
 const approvalStatusReserveMap = ref({}) as any
 // 获取菜单状态
@@ -33,25 +34,25 @@
     res.data.forEach((item: any) => {
       approvalStatusMap.value[`${item.value}`] = item.name
     })
-    console.log(approvalStatusMap.value)
     // 审批状态字典 {草稿箱: 1}
     res.data.forEach((item: any) => {
       approvalStatusReserveMap.value[item.name] = `${item.value}`
     })
-    console.log(approvalStatusReserveMap.value)
+    // console.log(approvalStatusReserveMap.value)
   })
 }
 
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  window.sessionStorage.setItem('approveFileMenu', newValue)
+  console.log('set', window.sessionStorage.getItem('approveFileMenu'))
 })
-onUnmounted(() => {
-  sessionStorage.setItem('approveFileMenu', current.value)
-})
-onMounted(() => {
-  getMenuStatus()
-  current.value = sessionStorage.getItem('approveFileMenu') || '全部'
-  sessionStorage.getItem('approveFileMenu') ? sessionStorage.removeItem('approveFileMenu') : ''
+
+onMounted(async () => {
+  await getMenuStatus()
+  console.log('----', window.sessionStorage.getItem('approveFileMenu'))
+
+  current.value = window.sessionStorage.getItem('approveFileMenu') || '全部'
 })
 </script>
 
@@ -66,7 +67,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
+    <component :is="currentComp" :status="currentApprovalStatus" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
   </div>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index f995313..f7f5970 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -104,16 +104,17 @@
 })
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
@@ -141,12 +142,13 @@
           ElMessage.success('保存成功')
           // formEl?.resetFields()
           // $router.go(-1)
-          close()
+          // close()
         })
       })
     }
   })
 }
+// 提交
 const submitForm = () => {
   if (!submitId.value) {
     ElMessage.warning('请先保存')
@@ -162,9 +164,8 @@
     },
   ).then((res) => {
     submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-    // formEl?.resetFields()
       ElMessage.success('已提交')
-      $router.go(-1)
+      // $router.go(-1)
       close()
     })
   })
@@ -173,7 +174,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  $router.go(-1)
+  // $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -233,6 +234,9 @@
     }
   }
 })
+onMounted(() => {
+  ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+})
 </script>
 
 <template>
@@ -299,7 +303,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" disabled
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
@@ -308,7 +312,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/addDialog.vue b/src/views/measure/file/components/approve/addDialog.vue
index 7b77c83..f5f34e6 100644
--- a/src/views/measure/file/components/approve/addDialog.vue
+++ b/src/views/measure/file/components/approve/addDialog.vue
@@ -1,7 +1,7 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../../file-interface'
 import type { TableRow } from './approve-interface'
@@ -11,10 +11,11 @@
 import { toTreeList } from '@/utils/structure'
 import { printHtml } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts } from '@/api/measure/file'
+import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts, updateFail } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval, fetchApproval } from '@/api/approval'
 
 const $route = useRoute()
 const $router = useRouter()
@@ -97,31 +98,33 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    approvalStatusName.value = row.approvalStatusName
+    approvalStatusName.value = row.approvalStatusName // 审批状态名称
+    if (approvalStatusName.value !== '草稿箱') {
+      getApprovalRecord($route.query.processId as string) // 查询审批记录
+    }
   }
 }
-onMounted(() => {
-  initDialog($route.query)
-})
+
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.publishTime = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.publishTime = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
-// 提交
-const submitForm = () => {
+// 保存
+const saveForm = () => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    '确认保存吗？',
     '提示',
     {
       confirmButtonText: '确认',
@@ -129,96 +132,96 @@
       type: 'warning',
     },
   ).then((res) => {
-    if (approvalStatusName.value !== '草稿箱') {
+    if (title.value === '新建') {
       confirmDrafts(ruleForm).then((res) => {
         if (res.code === 200) {
           console.log(res.data, '保存成功')
           submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
             ElMessage.success('提交成功')
-            $router.go(-1)
             close()
           })
         }
       })
     }
-    else {
-      // 保存（草稿箱）
-      updateDrafts(ruleForm).then((res) => {
-        ElMessage.success('保存成功')
-        $router.go(-1)
-        close()
-      })
+    else if (title.value === '编辑') {
+      if (approvalStatusName.value === '未通过-驳回') {
+        const params = {
+          ...ruleForm,
+          processId: $route.query.processId,
+        }
+        updateFail(params).then((res) => {
+          ElMessage.success('保存成功')
+          close()
+        })
+      }
+      else { // 草稿箱、已取消
+        // 保存（草稿箱）
+        updateDrafts(ruleForm).then((res) => {
+          ElMessage.success('保存成功')
+          close()
+        })
+      }
     }
   })
 }
-// 编辑
-const update = (row: TableRow) => {
-  initDialog({
-    ...row,
-    title: '编辑',
-  })
-}
-// 删除
-const remove = (row: TableRow) => {
-  ElMessageBox.confirm(
-    '确认删除吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      if (row.approvalStatusName === '待审批') {
-        approvalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            $router.go(-1)
-          }
-        })
-      }
-      else {
-        deleteApi({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            $router.go(-1)
-          }
-        })
-      }
-    })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
-  close()
-  $router.go(-1)
+
+// -----------------------------------------审批--------------------------------------
+const approvalDialog = ref()
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (title.value !== '新建') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
 }
 // 审批结束回调
 const approvalSuccess = () => {
   close()
-  $router.go(-1)
 }
-const approvalDialog = ref()
-// 审批操作
-const approval = (type: string, processId: string) => {
-  approvalDialog.value.initDialog(type, processId)
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: $route.query.processId! as string,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', $route.query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', $route.query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', $route.query.taskId)
+  }
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: `文件审批${title.value}`, // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// -----------------------------------------------------------------------------------
 
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -227,6 +230,10 @@
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -234,9 +241,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -270,53 +279,34 @@
     }
   }
 })
+
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container>
     <detail-page :title="`文件审批-${title}`">
       <template #btns>
-        <div v-if="approvalStatusName === '草稿箱' || approvalStatusName === '已取消'">
-          <el-button v-if="title !== '编辑'" type="primary" @click="update(formDataRow)">
-            编辑
-          </el-button>
-          <el-button v-else type="primary" @click="submitForm">
-            {{ approvalStatusName === '草稿箱' ? '保存' : '提交' }}
-          </el-button>
-          <el-button type="primary" @click="remove(formDataRow)">
-            删除
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="approvalStatusName === '待审批'">
-          <el-button type="primary" @click="approval('agree', formDataRow.taskId)">
-            同意
-          </el-button>
-          <el-button type="primary" @click="approval('reject', formDataRow.taskId)">
-            驳回
-          </el-button>
-          <el-button type="primary" @click="approval('refuse', formDataRow.taskId)">
-            拒绝
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="approvalStatusName === '已通过' || approvalStatusName === '未通过'">
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="['全部', '审批中'].includes(approvalStatusName)">
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批' && $route.query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批' && $route.query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button v-if="title === '新建' || title === '编辑'" type="primary" @click="saveForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
       </template>
 
       <el-form id="print" ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
@@ -368,16 +358,17 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -417,6 +408,10 @@
         </el-row>
       </el-form>
     </detail-page>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && title !== '新建'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
index 8f0a408..a8133de 100644
--- a/src/views/measure/file/components/approve/all.vue
+++ b/src/views/measure/file/components/approve/all.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="全部" />
+  <template-pag name="全部" status="0" />
 </template>
diff --git a/src/views/measure/file/components/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
index 37f69fe..8cdbbb5 100644
--- a/src/views/measure/file/components/approve/cancel.vue
+++ b/src/views/measure/file/components/approve/cancel.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="已取消" />
+  <template-pag name="已取消" status="6" />
 </template>
diff --git a/src/views/measure/file/components/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
index 033e874..d1f7274 100644
--- a/src/views/measure/file/components/approve/drafts.vue
+++ b/src/views/measure/file/components/approve/drafts.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="草稿箱" />
+  <template-pag name="草稿箱" status="1" />
 </template>
diff --git a/src/views/measure/file/components/approve/inApproval.vue b/src/views/measure/file/components/approve/inApproval.vue
index 78adba8..e96f449 100644
--- a/src/views/measure/file/components/approve/inApproval.vue
+++ b/src/views/measure/file/components/approve/inApproval.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="审批中" />
+  <template-pag name="审批中" status="3" />
 </template>
diff --git a/src/views/measure/file/components/approve/passed.vue b/src/views/measure/file/components/approve/passed.vue
index 50ea492..fbdef76 100644
--- a/src/views/measure/file/components/approve/passed.vue
+++ b/src/views/measure/file/components/approve/passed.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="已通过" value="4" />
+  <template-pag name="已通过" value="4" status="4" />
 </template>
diff --git a/src/views/measure/file/components/approve/pending.vue b/src/views/measure/file/components/approve/pending.vue
index 8f06880..8984484 100644
--- a/src/views/measure/file/components/approve/pending.vue
+++ b/src/views/measure/file/components/approve/pending.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="待审批" />
+  <template-pag name="待审批" status="2" />
 </template>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 768c310..71e8b02 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -131,3 +131,12 @@
   })
 }
 
+// 未通过-驳回编辑
+export function updateFail(data: object) {
+  return request({
+    url: '/meter/file/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 554a196..2f491c0 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -19,13 +19,15 @@
         已取消: '6',
       } as approvalStatus, // 审批状态
       approvalStatusListTow: {
-        全部: '0',
-        草稿箱: '1',
-        待审批: '2',
-        审批中: '3',
-        已通过: '4',
-        未通过: '5',
-        已取消: '6',
+        '全部': '0',
+        '草稿箱': '1',
+        '待审批': '2',
+        '审批中': '3',
+        '已通过': '4',
+        '未通过': '5',
+        '已取消': '6',
+        '非草稿': '7',
+        '未通过-驳回': '8',
       } as approvalStatus, // 审批状态
     }),
     getters: {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 99ddb0f..1289bc8 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -489,6 +489,7 @@
 const confirmCheckoutTemplate = (val: any) => {
   formInline.value.templateId = val.id // 证书报告模板id
   formInline.value.templateName = val.templateName || '' // 证书报告模板名称
+  formInline.value.certificateReportType = val.certificationType // 证书报告类型
 }
 
 // --------------------------------------选择签章-----------------------------------
@@ -674,13 +675,13 @@
               <el-select
                 v-model="formInline.certificateReportType"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择证书报告类型'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择证书报告类型'"
                 size="default"
                 style="width: 100%;"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <el-option
-                  v-for="item in certificationClassMap"
+                  v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
                   :value="item.value"
@@ -845,7 +846,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书类别:" prop="businessOriginalRecord.businessOrder.certifications">
               <el-select
                 v-model="formInline.businessOriginalRecord.businessOrder.certifications"
@@ -862,7 +863,7 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 13e05df..ef90dd5 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -427,103 +427,11 @@
             </template>
           </el-table-column>
         </template>
-        <template #default="{ row }">
-          <el-button
-            size="small"
-            type="primary"
-            link
-            @click="handleEdit(row, '查看', 'detail')"
-          >
-            查看
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批'"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '同意')"
-          >
-            同意
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '驳回')"
-          >
-            驳回
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '拒绝')"
-          >
-            拒绝
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '编辑', 'edit')"
-          >
-            编辑
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '提交')"
-          >
-            提交
-          </el-button>
-          <!-- 是发起者且审批中可以取消 -->
-          <el-button
-            v-if="row.approvalStatusName === '审批中'"
-            size="small"
-            link
-            type="info"
-            :disabled="row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '取消')"
-          >
-            取消
-          </el-button>
-          <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-          <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-          <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
-          <el-button
-            v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-            @click="handleEdit(row, '删除')"
-          >
-            删除
-          </el-button>
-        </template>
-        <!-- ------------------------------------------------- -->
         <template #columns>
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
+            :width="(activeTitle === '全部') ? 200 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -594,20 +502,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b67d2eb..2318d82 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -13,7 +13,7 @@
   name: string
   comp: any
 }
-const menu = shallowRef<menuType[]>([
+const menu = ref<menuType[]>([
   { name: '全部', comp: all },
   { name: '草稿箱', comp: drafts },
   { name: '待审批', comp: pending },
@@ -22,8 +22,9 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(all)
+const current = ref('')
+const currentApprovalStatus = ref('0')
+const currentComp = ref(all)
 const approvalStatusMap = ref({}) as any
 const approvalStatusReserveMap = ref({}) as any
 // 获取菜单状态
@@ -33,25 +34,25 @@
     res.data.forEach((item: any) => {
       approvalStatusMap.value[`${item.value}`] = item.name
     })
-    console.log(approvalStatusMap.value)
     // 审批状态字典 {草稿箱: 1}
     res.data.forEach((item: any) => {
       approvalStatusReserveMap.value[item.name] = `${item.value}`
     })
-    console.log(approvalStatusReserveMap.value)
+    // console.log(approvalStatusReserveMap.value)
   })
 }
 
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  window.sessionStorage.setItem('approveFileMenu', newValue)
+  console.log('set', window.sessionStorage.getItem('approveFileMenu'))
 })
-onUnmounted(() => {
-  sessionStorage.setItem('approveFileMenu', current.value)
-})
-onMounted(() => {
-  getMenuStatus()
-  current.value = sessionStorage.getItem('approveFileMenu') || '全部'
-  sessionStorage.getItem('approveFileMenu') ? sessionStorage.removeItem('approveFileMenu') : ''
+
+onMounted(async () => {
+  await getMenuStatus()
+  console.log('----', window.sessionStorage.getItem('approveFileMenu'))
+
+  current.value = window.sessionStorage.getItem('approveFileMenu') || '全部'
 })
 </script>
 
@@ -66,7 +67,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
+    <component :is="currentComp" :status="currentApprovalStatus" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
   </div>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index f995313..f7f5970 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -104,16 +104,17 @@
 })
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
@@ -141,12 +142,13 @@
           ElMessage.success('保存成功')
           // formEl?.resetFields()
           // $router.go(-1)
-          close()
+          // close()
         })
       })
     }
   })
 }
+// 提交
 const submitForm = () => {
   if (!submitId.value) {
     ElMessage.warning('请先保存')
@@ -162,9 +164,8 @@
     },
   ).then((res) => {
     submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-    // formEl?.resetFields()
       ElMessage.success('已提交')
-      $router.go(-1)
+      // $router.go(-1)
       close()
     })
   })
@@ -173,7 +174,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  $router.go(-1)
+  // $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -233,6 +234,9 @@
     }
   }
 })
+onMounted(() => {
+  ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+})
 </script>
 
 <template>
@@ -299,7 +303,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" disabled
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
@@ -308,7 +312,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/addDialog.vue b/src/views/measure/file/components/approve/addDialog.vue
index 7b77c83..f5f34e6 100644
--- a/src/views/measure/file/components/approve/addDialog.vue
+++ b/src/views/measure/file/components/approve/addDialog.vue
@@ -1,7 +1,7 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../../file-interface'
 import type { TableRow } from './approve-interface'
@@ -11,10 +11,11 @@
 import { toTreeList } from '@/utils/structure'
 import { printHtml } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts } from '@/api/measure/file'
+import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts, updateFail } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval, fetchApproval } from '@/api/approval'
 
 const $route = useRoute()
 const $router = useRouter()
@@ -97,31 +98,33 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    approvalStatusName.value = row.approvalStatusName
+    approvalStatusName.value = row.approvalStatusName // 审批状态名称
+    if (approvalStatusName.value !== '草稿箱') {
+      getApprovalRecord($route.query.processId as string) // 查询审批记录
+    }
   }
 }
-onMounted(() => {
-  initDialog($route.query)
-})
+
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.publishTime = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.publishTime = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
-// 提交
-const submitForm = () => {
+// 保存
+const saveForm = () => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    '确认保存吗？',
     '提示',
     {
       confirmButtonText: '确认',
@@ -129,96 +132,96 @@
       type: 'warning',
     },
   ).then((res) => {
-    if (approvalStatusName.value !== '草稿箱') {
+    if (title.value === '新建') {
       confirmDrafts(ruleForm).then((res) => {
         if (res.code === 200) {
           console.log(res.data, '保存成功')
           submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
             ElMessage.success('提交成功')
-            $router.go(-1)
             close()
           })
         }
       })
     }
-    else {
-      // 保存（草稿箱）
-      updateDrafts(ruleForm).then((res) => {
-        ElMessage.success('保存成功')
-        $router.go(-1)
-        close()
-      })
+    else if (title.value === '编辑') {
+      if (approvalStatusName.value === '未通过-驳回') {
+        const params = {
+          ...ruleForm,
+          processId: $route.query.processId,
+        }
+        updateFail(params).then((res) => {
+          ElMessage.success('保存成功')
+          close()
+        })
+      }
+      else { // 草稿箱、已取消
+        // 保存（草稿箱）
+        updateDrafts(ruleForm).then((res) => {
+          ElMessage.success('保存成功')
+          close()
+        })
+      }
     }
   })
 }
-// 编辑
-const update = (row: TableRow) => {
-  initDialog({
-    ...row,
-    title: '编辑',
-  })
-}
-// 删除
-const remove = (row: TableRow) => {
-  ElMessageBox.confirm(
-    '确认删除吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      if (row.approvalStatusName === '待审批') {
-        approvalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            $router.go(-1)
-          }
-        })
-      }
-      else {
-        deleteApi({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            $router.go(-1)
-          }
-        })
-      }
-    })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
-  close()
-  $router.go(-1)
+
+// -----------------------------------------审批--------------------------------------
+const approvalDialog = ref()
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (title.value !== '新建') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
 }
 // 审批结束回调
 const approvalSuccess = () => {
   close()
-  $router.go(-1)
 }
-const approvalDialog = ref()
-// 审批操作
-const approval = (type: string, processId: string) => {
-  approvalDialog.value.initDialog(type, processId)
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: $route.query.processId! as string,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', $route.query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', $route.query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', $route.query.taskId)
+  }
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: `文件审批${title.value}`, // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// -----------------------------------------------------------------------------------
 
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -227,6 +230,10 @@
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -234,9 +241,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -270,53 +279,34 @@
     }
   }
 })
+
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container>
     <detail-page :title="`文件审批-${title}`">
       <template #btns>
-        <div v-if="approvalStatusName === '草稿箱' || approvalStatusName === '已取消'">
-          <el-button v-if="title !== '编辑'" type="primary" @click="update(formDataRow)">
-            编辑
-          </el-button>
-          <el-button v-else type="primary" @click="submitForm">
-            {{ approvalStatusName === '草稿箱' ? '保存' : '提交' }}
-          </el-button>
-          <el-button type="primary" @click="remove(formDataRow)">
-            删除
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="approvalStatusName === '待审批'">
-          <el-button type="primary" @click="approval('agree', formDataRow.taskId)">
-            同意
-          </el-button>
-          <el-button type="primary" @click="approval('reject', formDataRow.taskId)">
-            驳回
-          </el-button>
-          <el-button type="primary" @click="approval('refuse', formDataRow.taskId)">
-            拒绝
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="approvalStatusName === '已通过' || approvalStatusName === '未通过'">
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="['全部', '审批中'].includes(approvalStatusName)">
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批' && $route.query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批' && $route.query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button v-if="title === '新建' || title === '编辑'" type="primary" @click="saveForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
       </template>
 
       <el-form id="print" ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
@@ -368,16 +358,17 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -417,6 +408,10 @@
         </el-row>
       </el-form>
     </detail-page>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && title !== '新建'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
index 8f0a408..a8133de 100644
--- a/src/views/measure/file/components/approve/all.vue
+++ b/src/views/measure/file/components/approve/all.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="全部" />
+  <template-pag name="全部" status="0" />
 </template>
diff --git a/src/views/measure/file/components/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
index 37f69fe..8cdbbb5 100644
--- a/src/views/measure/file/components/approve/cancel.vue
+++ b/src/views/measure/file/components/approve/cancel.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="已取消" />
+  <template-pag name="已取消" status="6" />
 </template>
diff --git a/src/views/measure/file/components/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
index 033e874..d1f7274 100644
--- a/src/views/measure/file/components/approve/drafts.vue
+++ b/src/views/measure/file/components/approve/drafts.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="草稿箱" />
+  <template-pag name="草稿箱" status="1" />
 </template>
diff --git a/src/views/measure/file/components/approve/inApproval.vue b/src/views/measure/file/components/approve/inApproval.vue
index 78adba8..e96f449 100644
--- a/src/views/measure/file/components/approve/inApproval.vue
+++ b/src/views/measure/file/components/approve/inApproval.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="审批中" />
+  <template-pag name="审批中" status="3" />
 </template>
diff --git a/src/views/measure/file/components/approve/passed.vue b/src/views/measure/file/components/approve/passed.vue
index 50ea492..fbdef76 100644
--- a/src/views/measure/file/components/approve/passed.vue
+++ b/src/views/measure/file/components/approve/passed.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="已通过" value="4" />
+  <template-pag name="已通过" value="4" status="4" />
 </template>
diff --git a/src/views/measure/file/components/approve/pending.vue b/src/views/measure/file/components/approve/pending.vue
index 8f06880..8984484 100644
--- a/src/views/measure/file/components/approve/pending.vue
+++ b/src/views/measure/file/components/approve/pending.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="待审批" />
+  <template-pag name="待审批" status="2" />
 </template>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 54f1232..3163799 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -16,21 +16,24 @@
     type: String,
     default: '',
   },
-  approvalStatusMap: {
-    type: Object,
-    default: () => { return {} },
+  status: {
+    type: String,
   },
-  approvalStatusReserveMap: {
-    type: Object,
-    default: () => { return {} },
-  },
+  // approvalStatusMap: {
+  //   type: Object,
+  //   default: () => { return {} },
+  // },
+  // approvalStatusReserveMap: {
+  //   type: Object,
+  //   default: () => { return {} },
+  // },
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const approvalStatus = ref('0')
 // 审批状态字典
-const approvalStatusMap = ref({ ...props.approvalStatusMap }) // 审批状态字典{1：草稿箱}
-const approvalStatusReserveMap = ref({ ...props.approvalStatusReserveMap }) // 审批状态字典{草稿箱: 1}
+const approvalStatusMap = ref({}) as any // 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any // 审批状态字典{草稿箱: 1}
 const activeTitle = ref('') // active对应的审批状态名字
 
 const searchQuery = ref({
@@ -72,6 +75,21 @@
     searchQuery.value.createEndTime = ''
   }
 })
+
+// 获取字典
+const getDict = () => {
+  getDictByCode('approvalStatus').then((res) => {
+    // 审批状态字典 {1：草稿箱}
+    res.data.forEach((item: any) => {
+      approvalStatusMap.value[`${item.value}`] = item.name
+    })
+    // 审批状态字典 {草稿箱: 1}
+    res.data.forEach((item: any) => {
+      approvalStatusReserveMap.value[item.name] = `${item.value}`
+    })
+  })
+}
+getDict()
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -275,22 +293,44 @@
   }
 }
 
-// 监视点击名称
-watch(() => props.name, () => {
-  activeTitle.value = props.name
-  sessionStorage.setItem('approveFileMenu', props.name)
-  approvalStatus.value = approvalStatusReserveMap.value[props.name]
-  // approvalStatus.value = approvalStatusReserveMap.value[props.name] // 失效
-  searchQuery.value.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
-  $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
+const approvalStatusListTow = {
+  '全部': '0',
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+} as any
+// watch(() => props.name, async (newVal) => {
+//   await getDict()
+//   console.log('===', approvalStatusReserveMap.value)
 
-  getList()
-  // 缓存名称
-}, { deep: true, immediate: true })
+//   window.sessionStorage.setItem('approveFileMenu', newVal)
+//   sessionStorage.setItem('approveFileMenu', newVal!)
+//   approvalStatus.value = approvalStatusListTow[newVal]
+//   searchQuery.value.approvalStatus = approvalStatus.value
+//   $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
 
-onMounted(() => {
+//   getList()
+//   // 缓存名称
+// },
+// { deep: true },
+// )
+onMounted(async () => {
+  await getDict()
+  const getApproveFileMenu = window.sessionStorage.getItem('approveFileMenu')
+  if (getApproveFileMenu === undefined || getApproveFileMenu === 'undefined' || getApproveFileMenu === 'null' || getApproveFileMenu === null || getApproveFileMenu === '') {
+    approvalStatus.value = '0' // 全部
+  }
+  else {
+    approvalStatus.value = approvalStatusListTow[getApproveFileMenu!] as string
+    searchQuery.value.approvalStatus = approvalStatus.value
+  }
   getFileType()
-  // getList()
+  getList()
 })
 </script>
 
@@ -349,7 +389,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" fixed="right" :width="(activeTitle === '全部') ? 150 : (activeTitle === '草稿箱' || activeTitle === '已取消') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过' || activeTitle === '审批中') ? 100 : 150">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
@@ -387,16 +427,16 @@
                 </el-button>
                 <el-button
                   v-if="proxy.buttonPerm.refuse.if(row, '/file/approve/refuse')"
-                  size="small" type="primary" link
+                  size="small" type="danger" link
                   :disabled="proxy.buttonPerm.refuse.disabled(row)"
                   @click="approval('refuse', row.taskId)"
                 >
                   拒绝
                 </el-button>
                 <el-button
-                  v-if="proxy.buttonPerm.cancel.if(row, '/file/approve/cancel')"
+                  v-if="proxy.buttonPerm.cancel.if(row, '/file/approve/cancle')"
                   :disabled="proxy.buttonPerm.cancel.disabled(row)"
-                  size="small" type="primary"
+                  size="small" type="info"
                   link @click="cancel(row)"
                 >
                   取消

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 768c310..71e8b02 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -131,3 +131,12 @@
   })
 }
 
+// 未通过-驳回编辑
+export function updateFail(data: object) {
+  return request({
+    url: '/meter/file/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 554a196..2f491c0 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -19,13 +19,15 @@
         已取消: '6',
       } as approvalStatus, // 审批状态
       approvalStatusListTow: {
-        全部: '0',
-        草稿箱: '1',
-        待审批: '2',
-        审批中: '3',
-        已通过: '4',
-        未通过: '5',
-        已取消: '6',
+        '全部': '0',
+        '草稿箱': '1',
+        '待审批': '2',
+        '审批中': '3',
+        '已通过': '4',
+        '未通过': '5',
+        '已取消': '6',
+        '非草稿': '7',
+        '未通过-驳回': '8',
       } as approvalStatus, // 审批状态
     }),
     getters: {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 99ddb0f..1289bc8 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -489,6 +489,7 @@
 const confirmCheckoutTemplate = (val: any) => {
   formInline.value.templateId = val.id // 证书报告模板id
   formInline.value.templateName = val.templateName || '' // 证书报告模板名称
+  formInline.value.certificateReportType = val.certificationType // 证书报告类型
 }
 
 // --------------------------------------选择签章-----------------------------------
@@ -674,13 +675,13 @@
               <el-select
                 v-model="formInline.certificateReportType"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择证书报告类型'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择证书报告类型'"
                 size="default"
                 style="width: 100%;"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <el-option
-                  v-for="item in certificationClassMap"
+                  v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
                   :value="item.value"
@@ -845,7 +846,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书类别:" prop="businessOriginalRecord.businessOrder.certifications">
               <el-select
                 v-model="formInline.businessOriginalRecord.businessOrder.certifications"
@@ -862,7 +863,7 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 13e05df..ef90dd5 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -427,103 +427,11 @@
             </template>
           </el-table-column>
         </template>
-        <template #default="{ row }">
-          <el-button
-            size="small"
-            type="primary"
-            link
-            @click="handleEdit(row, '查看', 'detail')"
-          >
-            查看
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批'"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '同意')"
-          >
-            同意
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '驳回')"
-          >
-            驳回
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '拒绝')"
-          >
-            拒绝
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '编辑', 'edit')"
-          >
-            编辑
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '提交')"
-          >
-            提交
-          </el-button>
-          <!-- 是发起者且审批中可以取消 -->
-          <el-button
-            v-if="row.approvalStatusName === '审批中'"
-            size="small"
-            link
-            type="info"
-            :disabled="row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '取消')"
-          >
-            取消
-          </el-button>
-          <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-          <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-          <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
-          <el-button
-            v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-            @click="handleEdit(row, '删除')"
-          >
-            删除
-          </el-button>
-        </template>
-        <!-- ------------------------------------------------- -->
         <template #columns>
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
+            :width="(activeTitle === '全部') ? 200 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -594,20 +502,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b67d2eb..2318d82 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -13,7 +13,7 @@
   name: string
   comp: any
 }
-const menu = shallowRef<menuType[]>([
+const menu = ref<menuType[]>([
   { name: '全部', comp: all },
   { name: '草稿箱', comp: drafts },
   { name: '待审批', comp: pending },
@@ -22,8 +22,9 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(all)
+const current = ref('')
+const currentApprovalStatus = ref('0')
+const currentComp = ref(all)
 const approvalStatusMap = ref({}) as any
 const approvalStatusReserveMap = ref({}) as any
 // 获取菜单状态
@@ -33,25 +34,25 @@
     res.data.forEach((item: any) => {
       approvalStatusMap.value[`${item.value}`] = item.name
     })
-    console.log(approvalStatusMap.value)
     // 审批状态字典 {草稿箱: 1}
     res.data.forEach((item: any) => {
       approvalStatusReserveMap.value[item.name] = `${item.value}`
     })
-    console.log(approvalStatusReserveMap.value)
+    // console.log(approvalStatusReserveMap.value)
   })
 }
 
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  window.sessionStorage.setItem('approveFileMenu', newValue)
+  console.log('set', window.sessionStorage.getItem('approveFileMenu'))
 })
-onUnmounted(() => {
-  sessionStorage.setItem('approveFileMenu', current.value)
-})
-onMounted(() => {
-  getMenuStatus()
-  current.value = sessionStorage.getItem('approveFileMenu') || '全部'
-  sessionStorage.getItem('approveFileMenu') ? sessionStorage.removeItem('approveFileMenu') : ''
+
+onMounted(async () => {
+  await getMenuStatus()
+  console.log('----', window.sessionStorage.getItem('approveFileMenu'))
+
+  current.value = window.sessionStorage.getItem('approveFileMenu') || '全部'
 })
 </script>
 
@@ -66,7 +67,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
+    <component :is="currentComp" :status="currentApprovalStatus" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
   </div>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index f995313..f7f5970 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -104,16 +104,17 @@
 })
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
@@ -141,12 +142,13 @@
           ElMessage.success('保存成功')
           // formEl?.resetFields()
           // $router.go(-1)
-          close()
+          // close()
         })
       })
     }
   })
 }
+// 提交
 const submitForm = () => {
   if (!submitId.value) {
     ElMessage.warning('请先保存')
@@ -162,9 +164,8 @@
     },
   ).then((res) => {
     submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-    // formEl?.resetFields()
       ElMessage.success('已提交')
-      $router.go(-1)
+      // $router.go(-1)
       close()
     })
   })
@@ -173,7 +174,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  $router.go(-1)
+  // $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -233,6 +234,9 @@
     }
   }
 })
+onMounted(() => {
+  ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+})
 </script>
 
 <template>
@@ -299,7 +303,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" disabled
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
@@ -308,7 +312,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/addDialog.vue b/src/views/measure/file/components/approve/addDialog.vue
index 7b77c83..f5f34e6 100644
--- a/src/views/measure/file/components/approve/addDialog.vue
+++ b/src/views/measure/file/components/approve/addDialog.vue
@@ -1,7 +1,7 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../../file-interface'
 import type { TableRow } from './approve-interface'
@@ -11,10 +11,11 @@
 import { toTreeList } from '@/utils/structure'
 import { printHtml } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts } from '@/api/measure/file'
+import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts, updateFail } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval, fetchApproval } from '@/api/approval'
 
 const $route = useRoute()
 const $router = useRouter()
@@ -97,31 +98,33 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    approvalStatusName.value = row.approvalStatusName
+    approvalStatusName.value = row.approvalStatusName // 审批状态名称
+    if (approvalStatusName.value !== '草稿箱') {
+      getApprovalRecord($route.query.processId as string) // 查询审批记录
+    }
   }
 }
-onMounted(() => {
-  initDialog($route.query)
-})
+
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.publishTime = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.publishTime = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
-// 提交
-const submitForm = () => {
+// 保存
+const saveForm = () => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    '确认保存吗？',
     '提示',
     {
       confirmButtonText: '确认',
@@ -129,96 +132,96 @@
       type: 'warning',
     },
   ).then((res) => {
-    if (approvalStatusName.value !== '草稿箱') {
+    if (title.value === '新建') {
       confirmDrafts(ruleForm).then((res) => {
         if (res.code === 200) {
           console.log(res.data, '保存成功')
           submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
             ElMessage.success('提交成功')
-            $router.go(-1)
             close()
           })
         }
       })
     }
-    else {
-      // 保存（草稿箱）
-      updateDrafts(ruleForm).then((res) => {
-        ElMessage.success('保存成功')
-        $router.go(-1)
-        close()
-      })
+    else if (title.value === '编辑') {
+      if (approvalStatusName.value === '未通过-驳回') {
+        const params = {
+          ...ruleForm,
+          processId: $route.query.processId,
+        }
+        updateFail(params).then((res) => {
+          ElMessage.success('保存成功')
+          close()
+        })
+      }
+      else { // 草稿箱、已取消
+        // 保存（草稿箱）
+        updateDrafts(ruleForm).then((res) => {
+          ElMessage.success('保存成功')
+          close()
+        })
+      }
     }
   })
 }
-// 编辑
-const update = (row: TableRow) => {
-  initDialog({
-    ...row,
-    title: '编辑',
-  })
-}
-// 删除
-const remove = (row: TableRow) => {
-  ElMessageBox.confirm(
-    '确认删除吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      if (row.approvalStatusName === '待审批') {
-        approvalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            $router.go(-1)
-          }
-        })
-      }
-      else {
-        deleteApi({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            $router.go(-1)
-          }
-        })
-      }
-    })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
-  close()
-  $router.go(-1)
+
+// -----------------------------------------审批--------------------------------------
+const approvalDialog = ref()
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (title.value !== '新建') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
 }
 // 审批结束回调
 const approvalSuccess = () => {
   close()
-  $router.go(-1)
 }
-const approvalDialog = ref()
-// 审批操作
-const approval = (type: string, processId: string) => {
-  approvalDialog.value.initDialog(type, processId)
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: $route.query.processId! as string,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', $route.query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', $route.query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', $route.query.taskId)
+  }
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: `文件审批${title.value}`, // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// -----------------------------------------------------------------------------------
 
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -227,6 +230,10 @@
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -234,9 +241,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -270,53 +279,34 @@
     }
   }
 })
+
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container>
     <detail-page :title="`文件审批-${title}`">
       <template #btns>
-        <div v-if="approvalStatusName === '草稿箱' || approvalStatusName === '已取消'">
-          <el-button v-if="title !== '编辑'" type="primary" @click="update(formDataRow)">
-            编辑
-          </el-button>
-          <el-button v-else type="primary" @click="submitForm">
-            {{ approvalStatusName === '草稿箱' ? '保存' : '提交' }}
-          </el-button>
-          <el-button type="primary" @click="remove(formDataRow)">
-            删除
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="approvalStatusName === '待审批'">
-          <el-button type="primary" @click="approval('agree', formDataRow.taskId)">
-            同意
-          </el-button>
-          <el-button type="primary" @click="approval('reject', formDataRow.taskId)">
-            驳回
-          </el-button>
-          <el-button type="primary" @click="approval('refuse', formDataRow.taskId)">
-            拒绝
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="approvalStatusName === '已通过' || approvalStatusName === '未通过'">
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="['全部', '审批中'].includes(approvalStatusName)">
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批' && $route.query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批' && $route.query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button v-if="title === '新建' || title === '编辑'" type="primary" @click="saveForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
       </template>
 
       <el-form id="print" ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
@@ -368,16 +358,17 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -417,6 +408,10 @@
         </el-row>
       </el-form>
     </detail-page>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && title !== '新建'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
index 8f0a408..a8133de 100644
--- a/src/views/measure/file/components/approve/all.vue
+++ b/src/views/measure/file/components/approve/all.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="全部" />
+  <template-pag name="全部" status="0" />
 </template>
diff --git a/src/views/measure/file/components/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
index 37f69fe..8cdbbb5 100644
--- a/src/views/measure/file/components/approve/cancel.vue
+++ b/src/views/measure/file/components/approve/cancel.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="已取消" />
+  <template-pag name="已取消" status="6" />
 </template>
diff --git a/src/views/measure/file/components/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
index 033e874..d1f7274 100644
--- a/src/views/measure/file/components/approve/drafts.vue
+++ b/src/views/measure/file/components/approve/drafts.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="草稿箱" />
+  <template-pag name="草稿箱" status="1" />
 </template>
diff --git a/src/views/measure/file/components/approve/inApproval.vue b/src/views/measure/file/components/approve/inApproval.vue
index 78adba8..e96f449 100644
--- a/src/views/measure/file/components/approve/inApproval.vue
+++ b/src/views/measure/file/components/approve/inApproval.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="审批中" />
+  <template-pag name="审批中" status="3" />
 </template>
diff --git a/src/views/measure/file/components/approve/passed.vue b/src/views/measure/file/components/approve/passed.vue
index 50ea492..fbdef76 100644
--- a/src/views/measure/file/components/approve/passed.vue
+++ b/src/views/measure/file/components/approve/passed.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="已通过" value="4" />
+  <template-pag name="已通过" value="4" status="4" />
 </template>
diff --git a/src/views/measure/file/components/approve/pending.vue b/src/views/measure/file/components/approve/pending.vue
index 8f06880..8984484 100644
--- a/src/views/measure/file/components/approve/pending.vue
+++ b/src/views/measure/file/components/approve/pending.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="待审批" />
+  <template-pag name="待审批" status="2" />
 </template>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 54f1232..3163799 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -16,21 +16,24 @@
     type: String,
     default: '',
   },
-  approvalStatusMap: {
-    type: Object,
-    default: () => { return {} },
+  status: {
+    type: String,
   },
-  approvalStatusReserveMap: {
-    type: Object,
-    default: () => { return {} },
-  },
+  // approvalStatusMap: {
+  //   type: Object,
+  //   default: () => { return {} },
+  // },
+  // approvalStatusReserveMap: {
+  //   type: Object,
+  //   default: () => { return {} },
+  // },
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const approvalStatus = ref('0')
 // 审批状态字典
-const approvalStatusMap = ref({ ...props.approvalStatusMap }) // 审批状态字典{1：草稿箱}
-const approvalStatusReserveMap = ref({ ...props.approvalStatusReserveMap }) // 审批状态字典{草稿箱: 1}
+const approvalStatusMap = ref({}) as any // 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any // 审批状态字典{草稿箱: 1}
 const activeTitle = ref('') // active对应的审批状态名字
 
 const searchQuery = ref({
@@ -72,6 +75,21 @@
     searchQuery.value.createEndTime = ''
   }
 })
+
+// 获取字典
+const getDict = () => {
+  getDictByCode('approvalStatus').then((res) => {
+    // 审批状态字典 {1：草稿箱}
+    res.data.forEach((item: any) => {
+      approvalStatusMap.value[`${item.value}`] = item.name
+    })
+    // 审批状态字典 {草稿箱: 1}
+    res.data.forEach((item: any) => {
+      approvalStatusReserveMap.value[item.name] = `${item.value}`
+    })
+  })
+}
+getDict()
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -275,22 +293,44 @@
   }
 }
 
-// 监视点击名称
-watch(() => props.name, () => {
-  activeTitle.value = props.name
-  sessionStorage.setItem('approveFileMenu', props.name)
-  approvalStatus.value = approvalStatusReserveMap.value[props.name]
-  // approvalStatus.value = approvalStatusReserveMap.value[props.name] // 失效
-  searchQuery.value.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
-  $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
+const approvalStatusListTow = {
+  '全部': '0',
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+} as any
+// watch(() => props.name, async (newVal) => {
+//   await getDict()
+//   console.log('===', approvalStatusReserveMap.value)
 
-  getList()
-  // 缓存名称
-}, { deep: true, immediate: true })
+//   window.sessionStorage.setItem('approveFileMenu', newVal)
+//   sessionStorage.setItem('approveFileMenu', newVal!)
+//   approvalStatus.value = approvalStatusListTow[newVal]
+//   searchQuery.value.approvalStatus = approvalStatus.value
+//   $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
 
-onMounted(() => {
+//   getList()
+//   // 缓存名称
+// },
+// { deep: true },
+// )
+onMounted(async () => {
+  await getDict()
+  const getApproveFileMenu = window.sessionStorage.getItem('approveFileMenu')
+  if (getApproveFileMenu === undefined || getApproveFileMenu === 'undefined' || getApproveFileMenu === 'null' || getApproveFileMenu === null || getApproveFileMenu === '') {
+    approvalStatus.value = '0' // 全部
+  }
+  else {
+    approvalStatus.value = approvalStatusListTow[getApproveFileMenu!] as string
+    searchQuery.value.approvalStatus = approvalStatus.value
+  }
   getFileType()
-  // getList()
+  getList()
 })
 </script>
 
@@ -349,7 +389,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" fixed="right" :width="(activeTitle === '全部') ? 150 : (activeTitle === '草稿箱' || activeTitle === '已取消') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过' || activeTitle === '审批中') ? 100 : 150">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
@@ -387,16 +427,16 @@
                 </el-button>
                 <el-button
                   v-if="proxy.buttonPerm.refuse.if(row, '/file/approve/refuse')"
-                  size="small" type="primary" link
+                  size="small" type="danger" link
                   :disabled="proxy.buttonPerm.refuse.disabled(row)"
                   @click="approval('refuse', row.taskId)"
                 >
                   拒绝
                 </el-button>
                 <el-button
-                  v-if="proxy.buttonPerm.cancel.if(row, '/file/approve/cancel')"
+                  v-if="proxy.buttonPerm.cancel.if(row, '/file/approve/cancle')"
                   :disabled="proxy.buttonPerm.cancel.disabled(row)"
-                  size="small" type="primary"
+                  size="small" type="info"
                   link @click="cancel(row)"
                 >
                   取消
diff --git a/src/views/measure/file/components/approve/unPassed.vue b/src/views/measure/file/components/approve/unPassed.vue
index eb00217..1c9f317 100644
--- a/src/views/measure/file/components/approve/unPassed.vue
+++ b/src/views/measure/file/components/approve/unPassed.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="未通过" />
+  <template-pag name="未通过" status="5" />
 </template>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 768c310..71e8b02 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -131,3 +131,12 @@
   })
 }
 
+// 未通过-驳回编辑
+export function updateFail(data: object) {
+  return request({
+    url: '/meter/file/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 554a196..2f491c0 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -19,13 +19,15 @@
         已取消: '6',
       } as approvalStatus, // 审批状态
       approvalStatusListTow: {
-        全部: '0',
-        草稿箱: '1',
-        待审批: '2',
-        审批中: '3',
-        已通过: '4',
-        未通过: '5',
-        已取消: '6',
+        '全部': '0',
+        '草稿箱': '1',
+        '待审批': '2',
+        '审批中': '3',
+        '已通过': '4',
+        '未通过': '5',
+        '已取消': '6',
+        '非草稿': '7',
+        '未通过-驳回': '8',
       } as approvalStatus, // 审批状态
     }),
     getters: {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 99ddb0f..1289bc8 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -489,6 +489,7 @@
 const confirmCheckoutTemplate = (val: any) => {
   formInline.value.templateId = val.id // 证书报告模板id
   formInline.value.templateName = val.templateName || '' // 证书报告模板名称
+  formInline.value.certificateReportType = val.certificationType // 证书报告类型
 }
 
 // --------------------------------------选择签章-----------------------------------
@@ -674,13 +675,13 @@
               <el-select
                 v-model="formInline.certificateReportType"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择证书报告类型'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择证书报告类型'"
                 size="default"
                 style="width: 100%;"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <el-option
-                  v-for="item in certificationClassMap"
+                  v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
                   :value="item.value"
@@ -845,7 +846,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书类别:" prop="businessOriginalRecord.businessOrder.certifications">
               <el-select
                 v-model="formInline.businessOriginalRecord.businessOrder.certifications"
@@ -862,7 +863,7 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 13e05df..ef90dd5 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -427,103 +427,11 @@
             </template>
           </el-table-column>
         </template>
-        <template #default="{ row }">
-          <el-button
-            size="small"
-            type="primary"
-            link
-            @click="handleEdit(row, '查看', 'detail')"
-          >
-            查看
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批'"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '同意')"
-          >
-            同意
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '驳回')"
-          >
-            驳回
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '拒绝')"
-          >
-            拒绝
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '编辑', 'edit')"
-          >
-            编辑
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '提交')"
-          >
-            提交
-          </el-button>
-          <!-- 是发起者且审批中可以取消 -->
-          <el-button
-            v-if="row.approvalStatusName === '审批中'"
-            size="small"
-            link
-            type="info"
-            :disabled="row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '取消')"
-          >
-            取消
-          </el-button>
-          <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-          <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-          <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
-          <el-button
-            v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-            @click="handleEdit(row, '删除')"
-          >
-            删除
-          </el-button>
-        </template>
-        <!-- ------------------------------------------------- -->
         <template #columns>
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
+            :width="(activeTitle === '全部') ? 200 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -594,20 +502,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b67d2eb..2318d82 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -13,7 +13,7 @@
   name: string
   comp: any
 }
-const menu = shallowRef<menuType[]>([
+const menu = ref<menuType[]>([
   { name: '全部', comp: all },
   { name: '草稿箱', comp: drafts },
   { name: '待审批', comp: pending },
@@ -22,8 +22,9 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(all)
+const current = ref('')
+const currentApprovalStatus = ref('0')
+const currentComp = ref(all)
 const approvalStatusMap = ref({}) as any
 const approvalStatusReserveMap = ref({}) as any
 // 获取菜单状态
@@ -33,25 +34,25 @@
     res.data.forEach((item: any) => {
       approvalStatusMap.value[`${item.value}`] = item.name
     })
-    console.log(approvalStatusMap.value)
     // 审批状态字典 {草稿箱: 1}
     res.data.forEach((item: any) => {
       approvalStatusReserveMap.value[item.name] = `${item.value}`
     })
-    console.log(approvalStatusReserveMap.value)
+    // console.log(approvalStatusReserveMap.value)
   })
 }
 
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  window.sessionStorage.setItem('approveFileMenu', newValue)
+  console.log('set', window.sessionStorage.getItem('approveFileMenu'))
 })
-onUnmounted(() => {
-  sessionStorage.setItem('approveFileMenu', current.value)
-})
-onMounted(() => {
-  getMenuStatus()
-  current.value = sessionStorage.getItem('approveFileMenu') || '全部'
-  sessionStorage.getItem('approveFileMenu') ? sessionStorage.removeItem('approveFileMenu') : ''
+
+onMounted(async () => {
+  await getMenuStatus()
+  console.log('----', window.sessionStorage.getItem('approveFileMenu'))
+
+  current.value = window.sessionStorage.getItem('approveFileMenu') || '全部'
 })
 </script>
 
@@ -66,7 +67,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
+    <component :is="currentComp" :status="currentApprovalStatus" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
   </div>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index f995313..f7f5970 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -104,16 +104,17 @@
 })
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
@@ -141,12 +142,13 @@
           ElMessage.success('保存成功')
           // formEl?.resetFields()
           // $router.go(-1)
-          close()
+          // close()
         })
       })
     }
   })
 }
+// 提交
 const submitForm = () => {
   if (!submitId.value) {
     ElMessage.warning('请先保存')
@@ -162,9 +164,8 @@
     },
   ).then((res) => {
     submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-    // formEl?.resetFields()
       ElMessage.success('已提交')
-      $router.go(-1)
+      // $router.go(-1)
       close()
     })
   })
@@ -173,7 +174,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  $router.go(-1)
+  // $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -233,6 +234,9 @@
     }
   }
 })
+onMounted(() => {
+  ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+})
 </script>
 
 <template>
@@ -299,7 +303,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" disabled
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
@@ -308,7 +312,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/addDialog.vue b/src/views/measure/file/components/approve/addDialog.vue
index 7b77c83..f5f34e6 100644
--- a/src/views/measure/file/components/approve/addDialog.vue
+++ b/src/views/measure/file/components/approve/addDialog.vue
@@ -1,7 +1,7 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../../file-interface'
 import type { TableRow } from './approve-interface'
@@ -11,10 +11,11 @@
 import { toTreeList } from '@/utils/structure'
 import { printHtml } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts } from '@/api/measure/file'
+import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts, updateFail } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval, fetchApproval } from '@/api/approval'
 
 const $route = useRoute()
 const $router = useRouter()
@@ -97,31 +98,33 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    approvalStatusName.value = row.approvalStatusName
+    approvalStatusName.value = row.approvalStatusName // 审批状态名称
+    if (approvalStatusName.value !== '草稿箱') {
+      getApprovalRecord($route.query.processId as string) // 查询审批记录
+    }
   }
 }
-onMounted(() => {
-  initDialog($route.query)
-})
+
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.publishTime = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.publishTime = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
-// 提交
-const submitForm = () => {
+// 保存
+const saveForm = () => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    '确认保存吗？',
     '提示',
     {
       confirmButtonText: '确认',
@@ -129,96 +132,96 @@
       type: 'warning',
     },
   ).then((res) => {
-    if (approvalStatusName.value !== '草稿箱') {
+    if (title.value === '新建') {
       confirmDrafts(ruleForm).then((res) => {
         if (res.code === 200) {
           console.log(res.data, '保存成功')
           submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
             ElMessage.success('提交成功')
-            $router.go(-1)
             close()
           })
         }
       })
     }
-    else {
-      // 保存（草稿箱）
-      updateDrafts(ruleForm).then((res) => {
-        ElMessage.success('保存成功')
-        $router.go(-1)
-        close()
-      })
+    else if (title.value === '编辑') {
+      if (approvalStatusName.value === '未通过-驳回') {
+        const params = {
+          ...ruleForm,
+          processId: $route.query.processId,
+        }
+        updateFail(params).then((res) => {
+          ElMessage.success('保存成功')
+          close()
+        })
+      }
+      else { // 草稿箱、已取消
+        // 保存（草稿箱）
+        updateDrafts(ruleForm).then((res) => {
+          ElMessage.success('保存成功')
+          close()
+        })
+      }
     }
   })
 }
-// 编辑
-const update = (row: TableRow) => {
-  initDialog({
-    ...row,
-    title: '编辑',
-  })
-}
-// 删除
-const remove = (row: TableRow) => {
-  ElMessageBox.confirm(
-    '确认删除吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      if (row.approvalStatusName === '待审批') {
-        approvalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            $router.go(-1)
-          }
-        })
-      }
-      else {
-        deleteApi({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            $router.go(-1)
-          }
-        })
-      }
-    })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
-  close()
-  $router.go(-1)
+
+// -----------------------------------------审批--------------------------------------
+const approvalDialog = ref()
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (title.value !== '新建') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
 }
 // 审批结束回调
 const approvalSuccess = () => {
   close()
-  $router.go(-1)
 }
-const approvalDialog = ref()
-// 审批操作
-const approval = (type: string, processId: string) => {
-  approvalDialog.value.initDialog(type, processId)
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: $route.query.processId! as string,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', $route.query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', $route.query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', $route.query.taskId)
+  }
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: `文件审批${title.value}`, // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// -----------------------------------------------------------------------------------
 
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -227,6 +230,10 @@
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -234,9 +241,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -270,53 +279,34 @@
     }
   }
 })
+
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container>
     <detail-page :title="`文件审批-${title}`">
       <template #btns>
-        <div v-if="approvalStatusName === '草稿箱' || approvalStatusName === '已取消'">
-          <el-button v-if="title !== '编辑'" type="primary" @click="update(formDataRow)">
-            编辑
-          </el-button>
-          <el-button v-else type="primary" @click="submitForm">
-            {{ approvalStatusName === '草稿箱' ? '保存' : '提交' }}
-          </el-button>
-          <el-button type="primary" @click="remove(formDataRow)">
-            删除
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="approvalStatusName === '待审批'">
-          <el-button type="primary" @click="approval('agree', formDataRow.taskId)">
-            同意
-          </el-button>
-          <el-button type="primary" @click="approval('reject', formDataRow.taskId)">
-            驳回
-          </el-button>
-          <el-button type="primary" @click="approval('refuse', formDataRow.taskId)">
-            拒绝
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="approvalStatusName === '已通过' || approvalStatusName === '未通过'">
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="['全部', '审批中'].includes(approvalStatusName)">
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批' && $route.query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批' && $route.query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button v-if="title === '新建' || title === '编辑'" type="primary" @click="saveForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
       </template>
 
       <el-form id="print" ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
@@ -368,16 +358,17 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -417,6 +408,10 @@
         </el-row>
       </el-form>
     </detail-page>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && title !== '新建'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
index 8f0a408..a8133de 100644
--- a/src/views/measure/file/components/approve/all.vue
+++ b/src/views/measure/file/components/approve/all.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="全部" />
+  <template-pag name="全部" status="0" />
 </template>
diff --git a/src/views/measure/file/components/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
index 37f69fe..8cdbbb5 100644
--- a/src/views/measure/file/components/approve/cancel.vue
+++ b/src/views/measure/file/components/approve/cancel.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="已取消" />
+  <template-pag name="已取消" status="6" />
 </template>
diff --git a/src/views/measure/file/components/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
index 033e874..d1f7274 100644
--- a/src/views/measure/file/components/approve/drafts.vue
+++ b/src/views/measure/file/components/approve/drafts.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="草稿箱" />
+  <template-pag name="草稿箱" status="1" />
 </template>
diff --git a/src/views/measure/file/components/approve/inApproval.vue b/src/views/measure/file/components/approve/inApproval.vue
index 78adba8..e96f449 100644
--- a/src/views/measure/file/components/approve/inApproval.vue
+++ b/src/views/measure/file/components/approve/inApproval.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="审批中" />
+  <template-pag name="审批中" status="3" />
 </template>
diff --git a/src/views/measure/file/components/approve/passed.vue b/src/views/measure/file/components/approve/passed.vue
index 50ea492..fbdef76 100644
--- a/src/views/measure/file/components/approve/passed.vue
+++ b/src/views/measure/file/components/approve/passed.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="已通过" value="4" />
+  <template-pag name="已通过" value="4" status="4" />
 </template>
diff --git a/src/views/measure/file/components/approve/pending.vue b/src/views/measure/file/components/approve/pending.vue
index 8f06880..8984484 100644
--- a/src/views/measure/file/components/approve/pending.vue
+++ b/src/views/measure/file/components/approve/pending.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="待审批" />
+  <template-pag name="待审批" status="2" />
 </template>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 54f1232..3163799 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -16,21 +16,24 @@
     type: String,
     default: '',
   },
-  approvalStatusMap: {
-    type: Object,
-    default: () => { return {} },
+  status: {
+    type: String,
   },
-  approvalStatusReserveMap: {
-    type: Object,
-    default: () => { return {} },
-  },
+  // approvalStatusMap: {
+  //   type: Object,
+  //   default: () => { return {} },
+  // },
+  // approvalStatusReserveMap: {
+  //   type: Object,
+  //   default: () => { return {} },
+  // },
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const approvalStatus = ref('0')
 // 审批状态字典
-const approvalStatusMap = ref({ ...props.approvalStatusMap }) // 审批状态字典{1：草稿箱}
-const approvalStatusReserveMap = ref({ ...props.approvalStatusReserveMap }) // 审批状态字典{草稿箱: 1}
+const approvalStatusMap = ref({}) as any // 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any // 审批状态字典{草稿箱: 1}
 const activeTitle = ref('') // active对应的审批状态名字
 
 const searchQuery = ref({
@@ -72,6 +75,21 @@
     searchQuery.value.createEndTime = ''
   }
 })
+
+// 获取字典
+const getDict = () => {
+  getDictByCode('approvalStatus').then((res) => {
+    // 审批状态字典 {1：草稿箱}
+    res.data.forEach((item: any) => {
+      approvalStatusMap.value[`${item.value}`] = item.name
+    })
+    // 审批状态字典 {草稿箱: 1}
+    res.data.forEach((item: any) => {
+      approvalStatusReserveMap.value[item.name] = `${item.value}`
+    })
+  })
+}
+getDict()
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -275,22 +293,44 @@
   }
 }
 
-// 监视点击名称
-watch(() => props.name, () => {
-  activeTitle.value = props.name
-  sessionStorage.setItem('approveFileMenu', props.name)
-  approvalStatus.value = approvalStatusReserveMap.value[props.name]
-  // approvalStatus.value = approvalStatusReserveMap.value[props.name] // 失效
-  searchQuery.value.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
-  $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
+const approvalStatusListTow = {
+  '全部': '0',
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+} as any
+// watch(() => props.name, async (newVal) => {
+//   await getDict()
+//   console.log('===', approvalStatusReserveMap.value)
 
-  getList()
-  // 缓存名称
-}, { deep: true, immediate: true })
+//   window.sessionStorage.setItem('approveFileMenu', newVal)
+//   sessionStorage.setItem('approveFileMenu', newVal!)
+//   approvalStatus.value = approvalStatusListTow[newVal]
+//   searchQuery.value.approvalStatus = approvalStatus.value
+//   $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
 
-onMounted(() => {
+//   getList()
+//   // 缓存名称
+// },
+// { deep: true },
+// )
+onMounted(async () => {
+  await getDict()
+  const getApproveFileMenu = window.sessionStorage.getItem('approveFileMenu')
+  if (getApproveFileMenu === undefined || getApproveFileMenu === 'undefined' || getApproveFileMenu === 'null' || getApproveFileMenu === null || getApproveFileMenu === '') {
+    approvalStatus.value = '0' // 全部
+  }
+  else {
+    approvalStatus.value = approvalStatusListTow[getApproveFileMenu!] as string
+    searchQuery.value.approvalStatus = approvalStatus.value
+  }
   getFileType()
-  // getList()
+  getList()
 })
 </script>
 
@@ -349,7 +389,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" fixed="right" :width="(activeTitle === '全部') ? 150 : (activeTitle === '草稿箱' || activeTitle === '已取消') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过' || activeTitle === '审批中') ? 100 : 150">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
@@ -387,16 +427,16 @@
                 </el-button>
                 <el-button
                   v-if="proxy.buttonPerm.refuse.if(row, '/file/approve/refuse')"
-                  size="small" type="primary" link
+                  size="small" type="danger" link
                   :disabled="proxy.buttonPerm.refuse.disabled(row)"
                   @click="approval('refuse', row.taskId)"
                 >
                   拒绝
                 </el-button>
                 <el-button
-                  v-if="proxy.buttonPerm.cancel.if(row, '/file/approve/cancel')"
+                  v-if="proxy.buttonPerm.cancel.if(row, '/file/approve/cancle')"
                   :disabled="proxy.buttonPerm.cancel.disabled(row)"
-                  size="small" type="primary"
+                  size="small" type="info"
                   link @click="cancel(row)"
                 >
                   取消
diff --git a/src/views/measure/file/components/approve/unPassed.vue b/src/views/measure/file/components/approve/unPassed.vue
index eb00217..1c9f317 100644
--- a/src/views/measure/file/components/approve/unPassed.vue
+++ b/src/views/measure/file/components/approve/unPassed.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="未通过" />
+  <template-pag name="未通过" status="5" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index d169e6e..d602a9b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -64,8 +64,8 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
-  { text: '名称', value: 'fileName', align: 'center', width: '130' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center', width: '160' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
   { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
@@ -325,6 +325,16 @@
           </el-select>
         </search-item> -->
         <search-item>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable style="width: 187px;">
+            <el-option
+              v-for="item in effectiveStatusSelect"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
           <el-date-picker
             v-model="publishTime"
             type="datetimerange"
@@ -333,12 +343,7 @@
             start-placeholder="发布开始时间"
             end-placeholder="发布结束时间"
             clearable
-            style="width: 360px;"
           />
-          <!-- <el-date-picker
-            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="发布时间"
-          /> -->
         </search-item>
         <search-item>
           <el-date-picker
@@ -349,22 +354,7 @@
             start-placeholder="实施开始时间"
             end-placeholder="实施结束时间"
             clearable
-            style="width: 360px;"
           />
-          <!-- <el-date-picker
-            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="实施时间"
-          /> -->
-        </search-item>
-        <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable style="width: 187px;">
-            <el-option
-              v-for="item in effectiveStatusSelect"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
         </search-item>
       </search-area>
       <table-container>
@@ -394,7 +384,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="170">
+            <el-table-column label="操作" align="center" width="110" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
@@ -402,7 +392,7 @@
                 <!-- <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button> -->
-                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`) && row.effectiveStatus !== '3'" size="small" type="info" link :disabled="row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
                 <el-button v-show="false" v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 768c310..71e8b02 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -131,3 +131,12 @@
   })
 }
 
+// 未通过-驳回编辑
+export function updateFail(data: object) {
+  return request({
+    url: '/meter/file/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 554a196..2f491c0 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -19,13 +19,15 @@
         已取消: '6',
       } as approvalStatus, // 审批状态
       approvalStatusListTow: {
-        全部: '0',
-        草稿箱: '1',
-        待审批: '2',
-        审批中: '3',
-        已通过: '4',
-        未通过: '5',
-        已取消: '6',
+        '全部': '0',
+        '草稿箱': '1',
+        '待审批': '2',
+        '审批中': '3',
+        '已通过': '4',
+        '未通过': '5',
+        '已取消': '6',
+        '非草稿': '7',
+        '未通过-驳回': '8',
       } as approvalStatus, // 审批状态
     }),
     getters: {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 99ddb0f..1289bc8 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -489,6 +489,7 @@
 const confirmCheckoutTemplate = (val: any) => {
   formInline.value.templateId = val.id // 证书报告模板id
   formInline.value.templateName = val.templateName || '' // 证书报告模板名称
+  formInline.value.certificateReportType = val.certificationType // 证书报告类型
 }
 
 // --------------------------------------选择签章-----------------------------------
@@ -674,13 +675,13 @@
               <el-select
                 v-model="formInline.certificateReportType"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择证书报告类型'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择证书报告类型'"
                 size="default"
                 style="width: 100%;"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <el-option
-                  v-for="item in certificationClassMap"
+                  v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
                   :value="item.value"
@@ -845,7 +846,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书类别:" prop="businessOriginalRecord.businessOrder.certifications">
               <el-select
                 v-model="formInline.businessOriginalRecord.businessOrder.certifications"
@@ -862,7 +863,7 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 13e05df..ef90dd5 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -427,103 +427,11 @@
             </template>
           </el-table-column>
         </template>
-        <template #default="{ row }">
-          <el-button
-            size="small"
-            type="primary"
-            link
-            @click="handleEdit(row, '查看', 'detail')"
-          >
-            查看
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批'"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '同意')"
-          >
-            同意
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '驳回')"
-          >
-            驳回
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '拒绝')"
-          >
-            拒绝
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '编辑', 'edit')"
-          >
-            编辑
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '提交')"
-          >
-            提交
-          </el-button>
-          <!-- 是发起者且审批中可以取消 -->
-          <el-button
-            v-if="row.approvalStatusName === '审批中'"
-            size="small"
-            link
-            type="info"
-            :disabled="row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '取消')"
-          >
-            取消
-          </el-button>
-          <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-          <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-          <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
-          <el-button
-            v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-            @click="handleEdit(row, '删除')"
-          >
-            删除
-          </el-button>
-        </template>
-        <!-- ------------------------------------------------- -->
         <template #columns>
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
+            :width="(activeTitle === '全部') ? 200 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -594,20 +502,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b67d2eb..2318d82 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -13,7 +13,7 @@
   name: string
   comp: any
 }
-const menu = shallowRef<menuType[]>([
+const menu = ref<menuType[]>([
   { name: '全部', comp: all },
   { name: '草稿箱', comp: drafts },
   { name: '待审批', comp: pending },
@@ -22,8 +22,9 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(all)
+const current = ref('')
+const currentApprovalStatus = ref('0')
+const currentComp = ref(all)
 const approvalStatusMap = ref({}) as any
 const approvalStatusReserveMap = ref({}) as any
 // 获取菜单状态
@@ -33,25 +34,25 @@
     res.data.forEach((item: any) => {
       approvalStatusMap.value[`${item.value}`] = item.name
     })
-    console.log(approvalStatusMap.value)
     // 审批状态字典 {草稿箱: 1}
     res.data.forEach((item: any) => {
       approvalStatusReserveMap.value[item.name] = `${item.value}`
     })
-    console.log(approvalStatusReserveMap.value)
+    // console.log(approvalStatusReserveMap.value)
   })
 }
 
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  window.sessionStorage.setItem('approveFileMenu', newValue)
+  console.log('set', window.sessionStorage.getItem('approveFileMenu'))
 })
-onUnmounted(() => {
-  sessionStorage.setItem('approveFileMenu', current.value)
-})
-onMounted(() => {
-  getMenuStatus()
-  current.value = sessionStorage.getItem('approveFileMenu') || '全部'
-  sessionStorage.getItem('approveFileMenu') ? sessionStorage.removeItem('approveFileMenu') : ''
+
+onMounted(async () => {
+  await getMenuStatus()
+  console.log('----', window.sessionStorage.getItem('approveFileMenu'))
+
+  current.value = window.sessionStorage.getItem('approveFileMenu') || '全部'
 })
 </script>
 
@@ -66,7 +67,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
+    <component :is="currentComp" :status="currentApprovalStatus" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
   </div>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index f995313..f7f5970 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -104,16 +104,17 @@
 })
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
@@ -141,12 +142,13 @@
           ElMessage.success('保存成功')
           // formEl?.resetFields()
           // $router.go(-1)
-          close()
+          // close()
         })
       })
     }
   })
 }
+// 提交
 const submitForm = () => {
   if (!submitId.value) {
     ElMessage.warning('请先保存')
@@ -162,9 +164,8 @@
     },
   ).then((res) => {
     submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-    // formEl?.resetFields()
       ElMessage.success('已提交')
-      $router.go(-1)
+      // $router.go(-1)
       close()
     })
   })
@@ -173,7 +174,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  $router.go(-1)
+  // $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -233,6 +234,9 @@
     }
   }
 })
+onMounted(() => {
+  ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+})
 </script>
 
 <template>
@@ -299,7 +303,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" disabled
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
@@ -308,7 +312,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/addDialog.vue b/src/views/measure/file/components/approve/addDialog.vue
index 7b77c83..f5f34e6 100644
--- a/src/views/measure/file/components/approve/addDialog.vue
+++ b/src/views/measure/file/components/approve/addDialog.vue
@@ -1,7 +1,7 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../../file-interface'
 import type { TableRow } from './approve-interface'
@@ -11,10 +11,11 @@
 import { toTreeList } from '@/utils/structure'
 import { printHtml } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts } from '@/api/measure/file'
+import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts, updateFail } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval, fetchApproval } from '@/api/approval'
 
 const $route = useRoute()
 const $router = useRouter()
@@ -97,31 +98,33 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    approvalStatusName.value = row.approvalStatusName
+    approvalStatusName.value = row.approvalStatusName // 审批状态名称
+    if (approvalStatusName.value !== '草稿箱') {
+      getApprovalRecord($route.query.processId as string) // 查询审批记录
+    }
   }
 }
-onMounted(() => {
-  initDialog($route.query)
-})
+
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.publishTime = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.publishTime = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
-// 提交
-const submitForm = () => {
+// 保存
+const saveForm = () => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    '确认保存吗？',
     '提示',
     {
       confirmButtonText: '确认',
@@ -129,96 +132,96 @@
       type: 'warning',
     },
   ).then((res) => {
-    if (approvalStatusName.value !== '草稿箱') {
+    if (title.value === '新建') {
       confirmDrafts(ruleForm).then((res) => {
         if (res.code === 200) {
           console.log(res.data, '保存成功')
           submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
             ElMessage.success('提交成功')
-            $router.go(-1)
             close()
           })
         }
       })
     }
-    else {
-      // 保存（草稿箱）
-      updateDrafts(ruleForm).then((res) => {
-        ElMessage.success('保存成功')
-        $router.go(-1)
-        close()
-      })
+    else if (title.value === '编辑') {
+      if (approvalStatusName.value === '未通过-驳回') {
+        const params = {
+          ...ruleForm,
+          processId: $route.query.processId,
+        }
+        updateFail(params).then((res) => {
+          ElMessage.success('保存成功')
+          close()
+        })
+      }
+      else { // 草稿箱、已取消
+        // 保存（草稿箱）
+        updateDrafts(ruleForm).then((res) => {
+          ElMessage.success('保存成功')
+          close()
+        })
+      }
     }
   })
 }
-// 编辑
-const update = (row: TableRow) => {
-  initDialog({
-    ...row,
-    title: '编辑',
-  })
-}
-// 删除
-const remove = (row: TableRow) => {
-  ElMessageBox.confirm(
-    '确认删除吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      if (row.approvalStatusName === '待审批') {
-        approvalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            $router.go(-1)
-          }
-        })
-      }
-      else {
-        deleteApi({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            $router.go(-1)
-          }
-        })
-      }
-    })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
-  close()
-  $router.go(-1)
+
+// -----------------------------------------审批--------------------------------------
+const approvalDialog = ref()
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (title.value !== '新建') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
 }
 // 审批结束回调
 const approvalSuccess = () => {
   close()
-  $router.go(-1)
 }
-const approvalDialog = ref()
-// 审批操作
-const approval = (type: string, processId: string) => {
-  approvalDialog.value.initDialog(type, processId)
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: $route.query.processId! as string,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', $route.query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', $route.query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', $route.query.taskId)
+  }
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: `文件审批${title.value}`, // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// -----------------------------------------------------------------------------------
 
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -227,6 +230,10 @@
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -234,9 +241,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -270,53 +279,34 @@
     }
   }
 })
+
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container>
     <detail-page :title="`文件审批-${title}`">
       <template #btns>
-        <div v-if="approvalStatusName === '草稿箱' || approvalStatusName === '已取消'">
-          <el-button v-if="title !== '编辑'" type="primary" @click="update(formDataRow)">
-            编辑
-          </el-button>
-          <el-button v-else type="primary" @click="submitForm">
-            {{ approvalStatusName === '草稿箱' ? '保存' : '提交' }}
-          </el-button>
-          <el-button type="primary" @click="remove(formDataRow)">
-            删除
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="approvalStatusName === '待审批'">
-          <el-button type="primary" @click="approval('agree', formDataRow.taskId)">
-            同意
-          </el-button>
-          <el-button type="primary" @click="approval('reject', formDataRow.taskId)">
-            驳回
-          </el-button>
-          <el-button type="primary" @click="approval('refuse', formDataRow.taskId)">
-            拒绝
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="approvalStatusName === '已通过' || approvalStatusName === '未通过'">
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="['全部', '审批中'].includes(approvalStatusName)">
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批' && $route.query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批' && $route.query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button v-if="title === '新建' || title === '编辑'" type="primary" @click="saveForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
       </template>
 
       <el-form id="print" ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
@@ -368,16 +358,17 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -417,6 +408,10 @@
         </el-row>
       </el-form>
     </detail-page>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && title !== '新建'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
index 8f0a408..a8133de 100644
--- a/src/views/measure/file/components/approve/all.vue
+++ b/src/views/measure/file/components/approve/all.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="全部" />
+  <template-pag name="全部" status="0" />
 </template>
diff --git a/src/views/measure/file/components/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
index 37f69fe..8cdbbb5 100644
--- a/src/views/measure/file/components/approve/cancel.vue
+++ b/src/views/measure/file/components/approve/cancel.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="已取消" />
+  <template-pag name="已取消" status="6" />
 </template>
diff --git a/src/views/measure/file/components/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
index 033e874..d1f7274 100644
--- a/src/views/measure/file/components/approve/drafts.vue
+++ b/src/views/measure/file/components/approve/drafts.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="草稿箱" />
+  <template-pag name="草稿箱" status="1" />
 </template>
diff --git a/src/views/measure/file/components/approve/inApproval.vue b/src/views/measure/file/components/approve/inApproval.vue
index 78adba8..e96f449 100644
--- a/src/views/measure/file/components/approve/inApproval.vue
+++ b/src/views/measure/file/components/approve/inApproval.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="审批中" />
+  <template-pag name="审批中" status="3" />
 </template>
diff --git a/src/views/measure/file/components/approve/passed.vue b/src/views/measure/file/components/approve/passed.vue
index 50ea492..fbdef76 100644
--- a/src/views/measure/file/components/approve/passed.vue
+++ b/src/views/measure/file/components/approve/passed.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="已通过" value="4" />
+  <template-pag name="已通过" value="4" status="4" />
 </template>
diff --git a/src/views/measure/file/components/approve/pending.vue b/src/views/measure/file/components/approve/pending.vue
index 8f06880..8984484 100644
--- a/src/views/measure/file/components/approve/pending.vue
+++ b/src/views/measure/file/components/approve/pending.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="待审批" />
+  <template-pag name="待审批" status="2" />
 </template>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 54f1232..3163799 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -16,21 +16,24 @@
     type: String,
     default: '',
   },
-  approvalStatusMap: {
-    type: Object,
-    default: () => { return {} },
+  status: {
+    type: String,
   },
-  approvalStatusReserveMap: {
-    type: Object,
-    default: () => { return {} },
-  },
+  // approvalStatusMap: {
+  //   type: Object,
+  //   default: () => { return {} },
+  // },
+  // approvalStatusReserveMap: {
+  //   type: Object,
+  //   default: () => { return {} },
+  // },
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const approvalStatus = ref('0')
 // 审批状态字典
-const approvalStatusMap = ref({ ...props.approvalStatusMap }) // 审批状态字典{1：草稿箱}
-const approvalStatusReserveMap = ref({ ...props.approvalStatusReserveMap }) // 审批状态字典{草稿箱: 1}
+const approvalStatusMap = ref({}) as any // 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any // 审批状态字典{草稿箱: 1}
 const activeTitle = ref('') // active对应的审批状态名字
 
 const searchQuery = ref({
@@ -72,6 +75,21 @@
     searchQuery.value.createEndTime = ''
   }
 })
+
+// 获取字典
+const getDict = () => {
+  getDictByCode('approvalStatus').then((res) => {
+    // 审批状态字典 {1：草稿箱}
+    res.data.forEach((item: any) => {
+      approvalStatusMap.value[`${item.value}`] = item.name
+    })
+    // 审批状态字典 {草稿箱: 1}
+    res.data.forEach((item: any) => {
+      approvalStatusReserveMap.value[item.name] = `${item.value}`
+    })
+  })
+}
+getDict()
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -275,22 +293,44 @@
   }
 }
 
-// 监视点击名称
-watch(() => props.name, () => {
-  activeTitle.value = props.name
-  sessionStorage.setItem('approveFileMenu', props.name)
-  approvalStatus.value = approvalStatusReserveMap.value[props.name]
-  // approvalStatus.value = approvalStatusReserveMap.value[props.name] // 失效
-  searchQuery.value.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
-  $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
+const approvalStatusListTow = {
+  '全部': '0',
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+} as any
+// watch(() => props.name, async (newVal) => {
+//   await getDict()
+//   console.log('===', approvalStatusReserveMap.value)
 
-  getList()
-  // 缓存名称
-}, { deep: true, immediate: true })
+//   window.sessionStorage.setItem('approveFileMenu', newVal)
+//   sessionStorage.setItem('approveFileMenu', newVal!)
+//   approvalStatus.value = approvalStatusListTow[newVal]
+//   searchQuery.value.approvalStatus = approvalStatus.value
+//   $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
 
-onMounted(() => {
+//   getList()
+//   // 缓存名称
+// },
+// { deep: true },
+// )
+onMounted(async () => {
+  await getDict()
+  const getApproveFileMenu = window.sessionStorage.getItem('approveFileMenu')
+  if (getApproveFileMenu === undefined || getApproveFileMenu === 'undefined' || getApproveFileMenu === 'null' || getApproveFileMenu === null || getApproveFileMenu === '') {
+    approvalStatus.value = '0' // 全部
+  }
+  else {
+    approvalStatus.value = approvalStatusListTow[getApproveFileMenu!] as string
+    searchQuery.value.approvalStatus = approvalStatus.value
+  }
   getFileType()
-  // getList()
+  getList()
 })
 </script>
 
@@ -349,7 +389,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" fixed="right" :width="(activeTitle === '全部') ? 150 : (activeTitle === '草稿箱' || activeTitle === '已取消') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过' || activeTitle === '审批中') ? 100 : 150">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
@@ -387,16 +427,16 @@
                 </el-button>
                 <el-button
                   v-if="proxy.buttonPerm.refuse.if(row, '/file/approve/refuse')"
-                  size="small" type="primary" link
+                  size="small" type="danger" link
                   :disabled="proxy.buttonPerm.refuse.disabled(row)"
                   @click="approval('refuse', row.taskId)"
                 >
                   拒绝
                 </el-button>
                 <el-button
-                  v-if="proxy.buttonPerm.cancel.if(row, '/file/approve/cancel')"
+                  v-if="proxy.buttonPerm.cancel.if(row, '/file/approve/cancle')"
                   :disabled="proxy.buttonPerm.cancel.disabled(row)"
-                  size="small" type="primary"
+                  size="small" type="info"
                   link @click="cancel(row)"
                 >
                   取消
diff --git a/src/views/measure/file/components/approve/unPassed.vue b/src/views/measure/file/components/approve/unPassed.vue
index eb00217..1c9f317 100644
--- a/src/views/measure/file/components/approve/unPassed.vue
+++ b/src/views/measure/file/components/approve/unPassed.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="未通过" />
+  <template-pag name="未通过" status="5" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index d169e6e..d602a9b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -64,8 +64,8 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
-  { text: '名称', value: 'fileName', align: 'center', width: '130' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center', width: '160' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
   { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
@@ -325,6 +325,16 @@
           </el-select>
         </search-item> -->
         <search-item>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable style="width: 187px;">
+            <el-option
+              v-for="item in effectiveStatusSelect"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
           <el-date-picker
             v-model="publishTime"
             type="datetimerange"
@@ -333,12 +343,7 @@
             start-placeholder="发布开始时间"
             end-placeholder="发布结束时间"
             clearable
-            style="width: 360px;"
           />
-          <!-- <el-date-picker
-            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="发布时间"
-          /> -->
         </search-item>
         <search-item>
           <el-date-picker
@@ -349,22 +354,7 @@
             start-placeholder="实施开始时间"
             end-placeholder="实施结束时间"
             clearable
-            style="width: 360px;"
           />
-          <!-- <el-date-picker
-            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="实施时间"
-          /> -->
-        </search-item>
-        <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable style="width: 187px;">
-            <el-option
-              v-for="item in effectiveStatusSelect"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
         </search-item>
       </search-area>
       <table-container>
@@ -394,7 +384,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="170">
+            <el-table-column label="操作" align="center" width="110" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
@@ -402,7 +392,7 @@
                 <!-- <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button> -->
-                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`) && row.effectiveStatus !== '3'" size="small" type="info" link :disabled="row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
                 <el-button v-show="false" v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 155ae81..d73c996 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -3,17 +3,19 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
-import type { templateType } from '../tool_interface'
+import type { dictType, templateType } from '../tool_interface'
 import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
+import { getDictByCode } from '@/api/system/dict'
 import { templateAdd, templatePageDetail, templateUpdate } from '@/api/system/tool'
 import type { userType } from '@/views/system/user/user-interface'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive<templateType>({
   // userIdList: [], // 可使用人列表
-  templateType: '', // 类型
+  templateType: '', // 类型 1原始记录模板 2 证书报告模板
+  certificationType: '', // 证书报告模板类型
   templateName: '', // 名称
   templateCreator: '', // 负责人
   minioFileName: '', // 上传文件名
@@ -28,6 +30,7 @@
   templateName: [{ required: true, message: '模板名称必填', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '模板负责人必填', trigger: 'blur' }],
   minioFileName: [{ required: true, message: '上传附件必填', trigger: 'blur' }],
+  certificationType: [{ required: true, message: '证书报告类型必填', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 // const userList = ref<userType[]>([]) // 可使用人列表
@@ -37,6 +40,14 @@
 //   })
 // }
 // 获取可使用人列表
+const certificationTypeMap = ref<dictType[]>([]) // 证书报告类型
+// 获取字典值
+async function getDict() {
+  // 证书类型
+  const resCertificationClass = await getDictByCode('certificationType')
+  certificationTypeMap.value = resCertificationClass.data
+}
+getDict()
 // 弹窗初始化
 const initDialog = (row: templateType) => {
   title.value = row.title as string
@@ -44,13 +55,10 @@
   ruleForm.templateName = ''
   ruleForm.createTime = ''
   ruleForm.templateDesc = ''
-  ruleForm.minioFileName = ''
-  // ruleForm.userIdList = []
+  ruleForm.minioFileName = '' // 附件
+  ruleForm.certificationType = '' // 证书报告类型
   ruleForm.templateCreator = ''
   dialogVisible.value = true
-  // ruleForm.noticePublisher = userInfo.$state.name
-  // ruleForm.noticeCompany = userInfo.$state.deptName
-  // ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
   if (row.title === '新增') {
     // 新增
     ruleFormRef.value?.resetFields()
@@ -59,40 +67,28 @@
   else if (row.title === '编辑') {
     ruleForm.templateNo = row.templateNo
     ruleForm.templateName = row.templateName
-    // ruleForm.createTime = row.createTime
+    ruleForm.createTime = row.createTime
     ruleForm.templateDesc = row.templateDesc
     ruleForm.minioFileName = row.minioFileName
-    // ruleForm.userIdList = row.userIdList
     ruleForm.templateCreator = row.templateCreator
+    ruleForm.certificationType = row.certificationType
     ruleForm.id = row.id
-    ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
     templatePageDetail({ ...row }).then((res) => {
       ruleForm.id = res.data.id
-      // res.data.userList.forEach((element: userType) => {
-      //   ruleForm.userIdList?.push(element.id)
-      // })
     })
-    // 修改
   }
   else {
     // 详情
     ruleForm.templateNo = row.templateNo
     ruleForm.templateName = row.templateName
-    ruleForm.createTime = row.createTime
+    ruleForm.createTime = row.createTime // 创建时间
     ruleForm.templateDesc = row.templateDesc
     ruleForm.minioFileName = row.minioFileName
-    // ruleForm.userIdList = row.userIdList
     ruleForm.templateCreator = row.templateCreator
-    // 获取详情列表
-    // templatePageDetail({ ...row }).then((res) => {
-    //   res.data.userList.forEach((element: userType) => {
-    //     ruleForm.userIdList?.push(element.id)
-    //   })
-    // })
+    ruleForm.certificationType = row.certificationType
   }
-  ruleForm.templateType = row.templateType
-  // getuser()
+  ruleForm.templateType = row.templateType // 模板类型
 }
 defineExpose({ initDialog })
 // 关闭弹窗
@@ -169,8 +165,27 @@
             <el-input v-model.trim="ruleForm.templateName" placeholder="模板名称" :disabled="title === '详情'" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="模板类型:" prop="certificationType">
+            <el-select
+              v-model="ruleForm.certificationType"
+              clearable
+              :placeholder="title === '详情' ? ' ' : '请选择证书报告类型'"
+              size="default"
+              style="width: 100%;"
+              :disabled="title === '详情'"
+            >
+              <el-option
+                v-for="item in certificationTypeMap"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <!-- </el-row> -->
+        <!-- <el-row :gutter="20"> -->
         <el-col :span="12">
           <el-form-item label="创建时间">
             <el-input v-model.trim="ruleForm.createTime" disabled />
@@ -183,7 +198,7 @@
         </el-col>
       </el-row>
       <el-form-item label="模板描述" prop="templateDesc">
-        <el-input v-model.trim="ruleForm.templateDesc" placeholder="模板描述" :disabled="title === '详情'" />
+        <el-input v-model.trim="ruleForm.templateDesc" type="textarea" autosize placeholder="模板描述" :disabled="title === '详情'" />
       </el-form-item>
       <!-- <el-form-item label="可使用人" prop="userIdList">
         <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 768c310..71e8b02 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -131,3 +131,12 @@
   })
 }
 
+// 未通过-驳回编辑
+export function updateFail(data: object) {
+  return request({
+    url: '/meter/file/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 554a196..2f491c0 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -19,13 +19,15 @@
         已取消: '6',
       } as approvalStatus, // 审批状态
       approvalStatusListTow: {
-        全部: '0',
-        草稿箱: '1',
-        待审批: '2',
-        审批中: '3',
-        已通过: '4',
-        未通过: '5',
-        已取消: '6',
+        '全部': '0',
+        '草稿箱': '1',
+        '待审批': '2',
+        '审批中': '3',
+        '已通过': '4',
+        '未通过': '5',
+        '已取消': '6',
+        '非草稿': '7',
+        '未通过-驳回': '8',
       } as approvalStatus, // 审批状态
     }),
     getters: {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 99ddb0f..1289bc8 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -489,6 +489,7 @@
 const confirmCheckoutTemplate = (val: any) => {
   formInline.value.templateId = val.id // 证书报告模板id
   formInline.value.templateName = val.templateName || '' // 证书报告模板名称
+  formInline.value.certificateReportType = val.certificationType // 证书报告类型
 }
 
 // --------------------------------------选择签章-----------------------------------
@@ -674,13 +675,13 @@
               <el-select
                 v-model="formInline.certificateReportType"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择证书报告类型'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择证书报告类型'"
                 size="default"
                 style="width: 100%;"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <el-option
-                  v-for="item in certificationClassMap"
+                  v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
                   :value="item.value"
@@ -845,7 +846,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书类别:" prop="businessOriginalRecord.businessOrder.certifications">
               <el-select
                 v-model="formInline.businessOriginalRecord.businessOrder.certifications"
@@ -862,7 +863,7 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 13e05df..ef90dd5 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -427,103 +427,11 @@
             </template>
           </el-table-column>
         </template>
-        <template #default="{ row }">
-          <el-button
-            size="small"
-            type="primary"
-            link
-            @click="handleEdit(row, '查看', 'detail')"
-          >
-            查看
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批'"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '同意')"
-          >
-            同意
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '驳回')"
-          >
-            驳回
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '拒绝')"
-          >
-            拒绝
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '编辑', 'edit')"
-          >
-            编辑
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '提交')"
-          >
-            提交
-          </el-button>
-          <!-- 是发起者且审批中可以取消 -->
-          <el-button
-            v-if="row.approvalStatusName === '审批中'"
-            size="small"
-            link
-            type="info"
-            :disabled="row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '取消')"
-          >
-            取消
-          </el-button>
-          <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-          <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-          <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
-          <el-button
-            v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-            @click="handleEdit(row, '删除')"
-          >
-            删除
-          </el-button>
-        </template>
-        <!-- ------------------------------------------------- -->
         <template #columns>
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
+            :width="(activeTitle === '全部') ? 200 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -594,20 +502,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b67d2eb..2318d82 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -13,7 +13,7 @@
   name: string
   comp: any
 }
-const menu = shallowRef<menuType[]>([
+const menu = ref<menuType[]>([
   { name: '全部', comp: all },
   { name: '草稿箱', comp: drafts },
   { name: '待审批', comp: pending },
@@ -22,8 +22,9 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(all)
+const current = ref('')
+const currentApprovalStatus = ref('0')
+const currentComp = ref(all)
 const approvalStatusMap = ref({}) as any
 const approvalStatusReserveMap = ref({}) as any
 // 获取菜单状态
@@ -33,25 +34,25 @@
     res.data.forEach((item: any) => {
       approvalStatusMap.value[`${item.value}`] = item.name
     })
-    console.log(approvalStatusMap.value)
     // 审批状态字典 {草稿箱: 1}
     res.data.forEach((item: any) => {
       approvalStatusReserveMap.value[item.name] = `${item.value}`
     })
-    console.log(approvalStatusReserveMap.value)
+    // console.log(approvalStatusReserveMap.value)
   })
 }
 
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  window.sessionStorage.setItem('approveFileMenu', newValue)
+  console.log('set', window.sessionStorage.getItem('approveFileMenu'))
 })
-onUnmounted(() => {
-  sessionStorage.setItem('approveFileMenu', current.value)
-})
-onMounted(() => {
-  getMenuStatus()
-  current.value = sessionStorage.getItem('approveFileMenu') || '全部'
-  sessionStorage.getItem('approveFileMenu') ? sessionStorage.removeItem('approveFileMenu') : ''
+
+onMounted(async () => {
+  await getMenuStatus()
+  console.log('----', window.sessionStorage.getItem('approveFileMenu'))
+
+  current.value = window.sessionStorage.getItem('approveFileMenu') || '全部'
 })
 </script>
 
@@ -66,7 +67,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
+    <component :is="currentComp" :status="currentApprovalStatus" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
   </div>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index f995313..f7f5970 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -104,16 +104,17 @@
 })
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
@@ -141,12 +142,13 @@
           ElMessage.success('保存成功')
           // formEl?.resetFields()
           // $router.go(-1)
-          close()
+          // close()
         })
       })
     }
   })
 }
+// 提交
 const submitForm = () => {
   if (!submitId.value) {
     ElMessage.warning('请先保存')
@@ -162,9 +164,8 @@
     },
   ).then((res) => {
     submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-    // formEl?.resetFields()
       ElMessage.success('已提交')
-      $router.go(-1)
+      // $router.go(-1)
       close()
     })
   })
@@ -173,7 +174,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  $router.go(-1)
+  // $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -233,6 +234,9 @@
     }
   }
 })
+onMounted(() => {
+  ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+})
 </script>
 
 <template>
@@ -299,7 +303,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" disabled
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
@@ -308,7 +312,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/addDialog.vue b/src/views/measure/file/components/approve/addDialog.vue
index 7b77c83..f5f34e6 100644
--- a/src/views/measure/file/components/approve/addDialog.vue
+++ b/src/views/measure/file/components/approve/addDialog.vue
@@ -1,7 +1,7 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../../file-interface'
 import type { TableRow } from './approve-interface'
@@ -11,10 +11,11 @@
 import { toTreeList } from '@/utils/structure'
 import { printHtml } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts } from '@/api/measure/file'
+import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts, updateFail } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval, fetchApproval } from '@/api/approval'
 
 const $route = useRoute()
 const $router = useRouter()
@@ -97,31 +98,33 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    approvalStatusName.value = row.approvalStatusName
+    approvalStatusName.value = row.approvalStatusName // 审批状态名称
+    if (approvalStatusName.value !== '草稿箱') {
+      getApprovalRecord($route.query.processId as string) // 查询审批记录
+    }
   }
 }
-onMounted(() => {
-  initDialog($route.query)
-})
+
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.publishTime = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.publishTime = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
-// 提交
-const submitForm = () => {
+// 保存
+const saveForm = () => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    '确认保存吗？',
     '提示',
     {
       confirmButtonText: '确认',
@@ -129,96 +132,96 @@
       type: 'warning',
     },
   ).then((res) => {
-    if (approvalStatusName.value !== '草稿箱') {
+    if (title.value === '新建') {
       confirmDrafts(ruleForm).then((res) => {
         if (res.code === 200) {
           console.log(res.data, '保存成功')
           submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
             ElMessage.success('提交成功')
-            $router.go(-1)
             close()
           })
         }
       })
     }
-    else {
-      // 保存（草稿箱）
-      updateDrafts(ruleForm).then((res) => {
-        ElMessage.success('保存成功')
-        $router.go(-1)
-        close()
-      })
+    else if (title.value === '编辑') {
+      if (approvalStatusName.value === '未通过-驳回') {
+        const params = {
+          ...ruleForm,
+          processId: $route.query.processId,
+        }
+        updateFail(params).then((res) => {
+          ElMessage.success('保存成功')
+          close()
+        })
+      }
+      else { // 草稿箱、已取消
+        // 保存（草稿箱）
+        updateDrafts(ruleForm).then((res) => {
+          ElMessage.success('保存成功')
+          close()
+        })
+      }
     }
   })
 }
-// 编辑
-const update = (row: TableRow) => {
-  initDialog({
-    ...row,
-    title: '编辑',
-  })
-}
-// 删除
-const remove = (row: TableRow) => {
-  ElMessageBox.confirm(
-    '确认删除吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      if (row.approvalStatusName === '待审批') {
-        approvalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            $router.go(-1)
-          }
-        })
-      }
-      else {
-        deleteApi({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            $router.go(-1)
-          }
-        })
-      }
-    })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
-  close()
-  $router.go(-1)
+
+// -----------------------------------------审批--------------------------------------
+const approvalDialog = ref()
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (title.value !== '新建') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
 }
 // 审批结束回调
 const approvalSuccess = () => {
   close()
-  $router.go(-1)
 }
-const approvalDialog = ref()
-// 审批操作
-const approval = (type: string, processId: string) => {
-  approvalDialog.value.initDialog(type, processId)
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: $route.query.processId! as string,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', $route.query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', $route.query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', $route.query.taskId)
+  }
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: `文件审批${title.value}`, // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// -----------------------------------------------------------------------------------
 
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -227,6 +230,10 @@
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -234,9 +241,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -270,53 +279,34 @@
     }
   }
 })
+
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container>
     <detail-page :title="`文件审批-${title}`">
       <template #btns>
-        <div v-if="approvalStatusName === '草稿箱' || approvalStatusName === '已取消'">
-          <el-button v-if="title !== '编辑'" type="primary" @click="update(formDataRow)">
-            编辑
-          </el-button>
-          <el-button v-else type="primary" @click="submitForm">
-            {{ approvalStatusName === '草稿箱' ? '保存' : '提交' }}
-          </el-button>
-          <el-button type="primary" @click="remove(formDataRow)">
-            删除
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="approvalStatusName === '待审批'">
-          <el-button type="primary" @click="approval('agree', formDataRow.taskId)">
-            同意
-          </el-button>
-          <el-button type="primary" @click="approval('reject', formDataRow.taskId)">
-            驳回
-          </el-button>
-          <el-button type="primary" @click="approval('refuse', formDataRow.taskId)">
-            拒绝
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="approvalStatusName === '已通过' || approvalStatusName === '未通过'">
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="['全部', '审批中'].includes(approvalStatusName)">
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批' && $route.query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批' && $route.query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button v-if="title === '新建' || title === '编辑'" type="primary" @click="saveForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
       </template>
 
       <el-form id="print" ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
@@ -368,16 +358,17 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -417,6 +408,10 @@
         </el-row>
       </el-form>
     </detail-page>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && title !== '新建'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
index 8f0a408..a8133de 100644
--- a/src/views/measure/file/components/approve/all.vue
+++ b/src/views/measure/file/components/approve/all.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="全部" />
+  <template-pag name="全部" status="0" />
 </template>
diff --git a/src/views/measure/file/components/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
index 37f69fe..8cdbbb5 100644
--- a/src/views/measure/file/components/approve/cancel.vue
+++ b/src/views/measure/file/components/approve/cancel.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="已取消" />
+  <template-pag name="已取消" status="6" />
 </template>
diff --git a/src/views/measure/file/components/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
index 033e874..d1f7274 100644
--- a/src/views/measure/file/components/approve/drafts.vue
+++ b/src/views/measure/file/components/approve/drafts.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="草稿箱" />
+  <template-pag name="草稿箱" status="1" />
 </template>
diff --git a/src/views/measure/file/components/approve/inApproval.vue b/src/views/measure/file/components/approve/inApproval.vue
index 78adba8..e96f449 100644
--- a/src/views/measure/file/components/approve/inApproval.vue
+++ b/src/views/measure/file/components/approve/inApproval.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="审批中" />
+  <template-pag name="审批中" status="3" />
 </template>
diff --git a/src/views/measure/file/components/approve/passed.vue b/src/views/measure/file/components/approve/passed.vue
index 50ea492..fbdef76 100644
--- a/src/views/measure/file/components/approve/passed.vue
+++ b/src/views/measure/file/components/approve/passed.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="已通过" value="4" />
+  <template-pag name="已通过" value="4" status="4" />
 </template>
diff --git a/src/views/measure/file/components/approve/pending.vue b/src/views/measure/file/components/approve/pending.vue
index 8f06880..8984484 100644
--- a/src/views/measure/file/components/approve/pending.vue
+++ b/src/views/measure/file/components/approve/pending.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="待审批" />
+  <template-pag name="待审批" status="2" />
 </template>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 54f1232..3163799 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -16,21 +16,24 @@
     type: String,
     default: '',
   },
-  approvalStatusMap: {
-    type: Object,
-    default: () => { return {} },
+  status: {
+    type: String,
   },
-  approvalStatusReserveMap: {
-    type: Object,
-    default: () => { return {} },
-  },
+  // approvalStatusMap: {
+  //   type: Object,
+  //   default: () => { return {} },
+  // },
+  // approvalStatusReserveMap: {
+  //   type: Object,
+  //   default: () => { return {} },
+  // },
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const approvalStatus = ref('0')
 // 审批状态字典
-const approvalStatusMap = ref({ ...props.approvalStatusMap }) // 审批状态字典{1：草稿箱}
-const approvalStatusReserveMap = ref({ ...props.approvalStatusReserveMap }) // 审批状态字典{草稿箱: 1}
+const approvalStatusMap = ref({}) as any // 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any // 审批状态字典{草稿箱: 1}
 const activeTitle = ref('') // active对应的审批状态名字
 
 const searchQuery = ref({
@@ -72,6 +75,21 @@
     searchQuery.value.createEndTime = ''
   }
 })
+
+// 获取字典
+const getDict = () => {
+  getDictByCode('approvalStatus').then((res) => {
+    // 审批状态字典 {1：草稿箱}
+    res.data.forEach((item: any) => {
+      approvalStatusMap.value[`${item.value}`] = item.name
+    })
+    // 审批状态字典 {草稿箱: 1}
+    res.data.forEach((item: any) => {
+      approvalStatusReserveMap.value[item.name] = `${item.value}`
+    })
+  })
+}
+getDict()
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -275,22 +293,44 @@
   }
 }
 
-// 监视点击名称
-watch(() => props.name, () => {
-  activeTitle.value = props.name
-  sessionStorage.setItem('approveFileMenu', props.name)
-  approvalStatus.value = approvalStatusReserveMap.value[props.name]
-  // approvalStatus.value = approvalStatusReserveMap.value[props.name] // 失效
-  searchQuery.value.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
-  $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
+const approvalStatusListTow = {
+  '全部': '0',
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+} as any
+// watch(() => props.name, async (newVal) => {
+//   await getDict()
+//   console.log('===', approvalStatusReserveMap.value)
 
-  getList()
-  // 缓存名称
-}, { deep: true, immediate: true })
+//   window.sessionStorage.setItem('approveFileMenu', newVal)
+//   sessionStorage.setItem('approveFileMenu', newVal!)
+//   approvalStatus.value = approvalStatusListTow[newVal]
+//   searchQuery.value.approvalStatus = approvalStatus.value
+//   $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
 
-onMounted(() => {
+//   getList()
+//   // 缓存名称
+// },
+// { deep: true },
+// )
+onMounted(async () => {
+  await getDict()
+  const getApproveFileMenu = window.sessionStorage.getItem('approveFileMenu')
+  if (getApproveFileMenu === undefined || getApproveFileMenu === 'undefined' || getApproveFileMenu === 'null' || getApproveFileMenu === null || getApproveFileMenu === '') {
+    approvalStatus.value = '0' // 全部
+  }
+  else {
+    approvalStatus.value = approvalStatusListTow[getApproveFileMenu!] as string
+    searchQuery.value.approvalStatus = approvalStatus.value
+  }
   getFileType()
-  // getList()
+  getList()
 })
 </script>
 
@@ -349,7 +389,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" fixed="right" :width="(activeTitle === '全部') ? 150 : (activeTitle === '草稿箱' || activeTitle === '已取消') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过' || activeTitle === '审批中') ? 100 : 150">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
@@ -387,16 +427,16 @@
                 </el-button>
                 <el-button
                   v-if="proxy.buttonPerm.refuse.if(row, '/file/approve/refuse')"
-                  size="small" type="primary" link
+                  size="small" type="danger" link
                   :disabled="proxy.buttonPerm.refuse.disabled(row)"
                   @click="approval('refuse', row.taskId)"
                 >
                   拒绝
                 </el-button>
                 <el-button
-                  v-if="proxy.buttonPerm.cancel.if(row, '/file/approve/cancel')"
+                  v-if="proxy.buttonPerm.cancel.if(row, '/file/approve/cancle')"
                   :disabled="proxy.buttonPerm.cancel.disabled(row)"
-                  size="small" type="primary"
+                  size="small" type="info"
                   link @click="cancel(row)"
                 >
                   取消
diff --git a/src/views/measure/file/components/approve/unPassed.vue b/src/views/measure/file/components/approve/unPassed.vue
index eb00217..1c9f317 100644
--- a/src/views/measure/file/components/approve/unPassed.vue
+++ b/src/views/measure/file/components/approve/unPassed.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="未通过" />
+  <template-pag name="未通过" status="5" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index d169e6e..d602a9b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -64,8 +64,8 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
-  { text: '名称', value: 'fileName', align: 'center', width: '130' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center', width: '160' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
   { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
@@ -325,6 +325,16 @@
           </el-select>
         </search-item> -->
         <search-item>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable style="width: 187px;">
+            <el-option
+              v-for="item in effectiveStatusSelect"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
           <el-date-picker
             v-model="publishTime"
             type="datetimerange"
@@ -333,12 +343,7 @@
             start-placeholder="发布开始时间"
             end-placeholder="发布结束时间"
             clearable
-            style="width: 360px;"
           />
-          <!-- <el-date-picker
-            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="发布时间"
-          /> -->
         </search-item>
         <search-item>
           <el-date-picker
@@ -349,22 +354,7 @@
             start-placeholder="实施开始时间"
             end-placeholder="实施结束时间"
             clearable
-            style="width: 360px;"
           />
-          <!-- <el-date-picker
-            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="实施时间"
-          /> -->
-        </search-item>
-        <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable style="width: 187px;">
-            <el-option
-              v-for="item in effectiveStatusSelect"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
         </search-item>
       </search-area>
       <table-container>
@@ -394,7 +384,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="170">
+            <el-table-column label="操作" align="center" width="110" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
@@ -402,7 +392,7 @@
                 <!-- <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button> -->
-                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`) && row.effectiveStatus !== '3'" size="small" type="info" link :disabled="row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
                 <el-button v-show="false" v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 155ae81..d73c996 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -3,17 +3,19 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
-import type { templateType } from '../tool_interface'
+import type { dictType, templateType } from '../tool_interface'
 import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
+import { getDictByCode } from '@/api/system/dict'
 import { templateAdd, templatePageDetail, templateUpdate } from '@/api/system/tool'
 import type { userType } from '@/views/system/user/user-interface'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive<templateType>({
   // userIdList: [], // 可使用人列表
-  templateType: '', // 类型
+  templateType: '', // 类型 1原始记录模板 2 证书报告模板
+  certificationType: '', // 证书报告模板类型
   templateName: '', // 名称
   templateCreator: '', // 负责人
   minioFileName: '', // 上传文件名
@@ -28,6 +30,7 @@
   templateName: [{ required: true, message: '模板名称必填', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '模板负责人必填', trigger: 'blur' }],
   minioFileName: [{ required: true, message: '上传附件必填', trigger: 'blur' }],
+  certificationType: [{ required: true, message: '证书报告类型必填', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 // const userList = ref<userType[]>([]) // 可使用人列表
@@ -37,6 +40,14 @@
 //   })
 // }
 // 获取可使用人列表
+const certificationTypeMap = ref<dictType[]>([]) // 证书报告类型
+// 获取字典值
+async function getDict() {
+  // 证书类型
+  const resCertificationClass = await getDictByCode('certificationType')
+  certificationTypeMap.value = resCertificationClass.data
+}
+getDict()
 // 弹窗初始化
 const initDialog = (row: templateType) => {
   title.value = row.title as string
@@ -44,13 +55,10 @@
   ruleForm.templateName = ''
   ruleForm.createTime = ''
   ruleForm.templateDesc = ''
-  ruleForm.minioFileName = ''
-  // ruleForm.userIdList = []
+  ruleForm.minioFileName = '' // 附件
+  ruleForm.certificationType = '' // 证书报告类型
   ruleForm.templateCreator = ''
   dialogVisible.value = true
-  // ruleForm.noticePublisher = userInfo.$state.name
-  // ruleForm.noticeCompany = userInfo.$state.deptName
-  // ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
   if (row.title === '新增') {
     // 新增
     ruleFormRef.value?.resetFields()
@@ -59,40 +67,28 @@
   else if (row.title === '编辑') {
     ruleForm.templateNo = row.templateNo
     ruleForm.templateName = row.templateName
-    // ruleForm.createTime = row.createTime
+    ruleForm.createTime = row.createTime
     ruleForm.templateDesc = row.templateDesc
     ruleForm.minioFileName = row.minioFileName
-    // ruleForm.userIdList = row.userIdList
     ruleForm.templateCreator = row.templateCreator
+    ruleForm.certificationType = row.certificationType
     ruleForm.id = row.id
-    ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
     templatePageDetail({ ...row }).then((res) => {
       ruleForm.id = res.data.id
-      // res.data.userList.forEach((element: userType) => {
-      //   ruleForm.userIdList?.push(element.id)
-      // })
     })
-    // 修改
   }
   else {
     // 详情
     ruleForm.templateNo = row.templateNo
     ruleForm.templateName = row.templateName
-    ruleForm.createTime = row.createTime
+    ruleForm.createTime = row.createTime // 创建时间
     ruleForm.templateDesc = row.templateDesc
     ruleForm.minioFileName = row.minioFileName
-    // ruleForm.userIdList = row.userIdList
     ruleForm.templateCreator = row.templateCreator
-    // 获取详情列表
-    // templatePageDetail({ ...row }).then((res) => {
-    //   res.data.userList.forEach((element: userType) => {
-    //     ruleForm.userIdList?.push(element.id)
-    //   })
-    // })
+    ruleForm.certificationType = row.certificationType
   }
-  ruleForm.templateType = row.templateType
-  // getuser()
+  ruleForm.templateType = row.templateType // 模板类型
 }
 defineExpose({ initDialog })
 // 关闭弹窗
@@ -169,8 +165,27 @@
             <el-input v-model.trim="ruleForm.templateName" placeholder="模板名称" :disabled="title === '详情'" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="模板类型:" prop="certificationType">
+            <el-select
+              v-model="ruleForm.certificationType"
+              clearable
+              :placeholder="title === '详情' ? ' ' : '请选择证书报告类型'"
+              size="default"
+              style="width: 100%;"
+              :disabled="title === '详情'"
+            >
+              <el-option
+                v-for="item in certificationTypeMap"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <!-- </el-row> -->
+        <!-- <el-row :gutter="20"> -->
         <el-col :span="12">
           <el-form-item label="创建时间">
             <el-input v-model.trim="ruleForm.createTime" disabled />
@@ -183,7 +198,7 @@
         </el-col>
       </el-row>
       <el-form-item label="模板描述" prop="templateDesc">
-        <el-input v-model.trim="ruleForm.templateDesc" placeholder="模板描述" :disabled="title === '详情'" />
+        <el-input v-model.trim="ruleForm.templateDesc" type="textarea" autosize placeholder="模板描述" :disabled="title === '详情'" />
       </el-form-item>
       <!-- <el-form-item label="可使用人" prop="userIdList">
         <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index c4ad507..3272a13 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -8,6 +8,7 @@
 import { printJSON } from '@/utils/printUtils'
 import { getPhotoUrl, templateDelete, templateExport, templatePage } from '@/api/system/tool'
 import { getDictByCode } from '@/api/system/dict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
 import { download } from '@/utils/download'
@@ -37,11 +38,11 @@
 })
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '编号', value: 'templateNo', align: 'center', width: '180' },
-  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
+const columns = ref<TableColumn[]>([
+  { text: '编号', value: 'templateNo', align: 'center', width: '160' },
+  { text: '模板名称', value: 'templateName', align: 'center' },
   { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '描述', value: 'templateDesc', align: 'center' },
 ]) // 表格
 const list = ref([]) // 表格数据
@@ -250,7 +251,7 @@
       </template>
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns as any"
+        :data="list" :total="total" :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
         :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 768c310..71e8b02 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -131,3 +131,12 @@
   })
 }
 
+// 未通过-驳回编辑
+export function updateFail(data: object) {
+  return request({
+    url: '/meter/file/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 554a196..2f491c0 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -19,13 +19,15 @@
         已取消: '6',
       } as approvalStatus, // 审批状态
       approvalStatusListTow: {
-        全部: '0',
-        草稿箱: '1',
-        待审批: '2',
-        审批中: '3',
-        已通过: '4',
-        未通过: '5',
-        已取消: '6',
+        '全部': '0',
+        '草稿箱': '1',
+        '待审批': '2',
+        '审批中': '3',
+        '已通过': '4',
+        '未通过': '5',
+        '已取消': '6',
+        '非草稿': '7',
+        '未通过-驳回': '8',
       } as approvalStatus, // 审批状态
     }),
     getters: {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 99ddb0f..1289bc8 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -489,6 +489,7 @@
 const confirmCheckoutTemplate = (val: any) => {
   formInline.value.templateId = val.id // 证书报告模板id
   formInline.value.templateName = val.templateName || '' // 证书报告模板名称
+  formInline.value.certificateReportType = val.certificationType // 证书报告类型
 }
 
 // --------------------------------------选择签章-----------------------------------
@@ -674,13 +675,13 @@
               <el-select
                 v-model="formInline.certificateReportType"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择证书报告类型'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择证书报告类型'"
                 size="default"
                 style="width: 100%;"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <el-option
-                  v-for="item in certificationClassMap"
+                  v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
                   :value="item.value"
@@ -845,7 +846,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书类别:" prop="businessOriginalRecord.businessOrder.certifications">
               <el-select
                 v-model="formInline.businessOriginalRecord.businessOrder.certifications"
@@ -862,7 +863,7 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 13e05df..ef90dd5 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -427,103 +427,11 @@
             </template>
           </el-table-column>
         </template>
-        <template #default="{ row }">
-          <el-button
-            size="small"
-            type="primary"
-            link
-            @click="handleEdit(row, '查看', 'detail')"
-          >
-            查看
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批'"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '同意')"
-          >
-            同意
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '驳回')"
-          >
-            驳回
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '拒绝')"
-          >
-            拒绝
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '编辑', 'edit')"
-          >
-            编辑
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '提交')"
-          >
-            提交
-          </el-button>
-          <!-- 是发起者且审批中可以取消 -->
-          <el-button
-            v-if="row.approvalStatusName === '审批中'"
-            size="small"
-            link
-            type="info"
-            :disabled="row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '取消')"
-          >
-            取消
-          </el-button>
-          <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-          <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-          <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
-          <el-button
-            v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-            @click="handleEdit(row, '删除')"
-          >
-            删除
-          </el-button>
-        </template>
-        <!-- ------------------------------------------------- -->
         <template #columns>
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
+            :width="(activeTitle === '全部') ? 200 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -594,20 +502,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b67d2eb..2318d82 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -13,7 +13,7 @@
   name: string
   comp: any
 }
-const menu = shallowRef<menuType[]>([
+const menu = ref<menuType[]>([
   { name: '全部', comp: all },
   { name: '草稿箱', comp: drafts },
   { name: '待审批', comp: pending },
@@ -22,8 +22,9 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(all)
+const current = ref('')
+const currentApprovalStatus = ref('0')
+const currentComp = ref(all)
 const approvalStatusMap = ref({}) as any
 const approvalStatusReserveMap = ref({}) as any
 // 获取菜单状态
@@ -33,25 +34,25 @@
     res.data.forEach((item: any) => {
       approvalStatusMap.value[`${item.value}`] = item.name
     })
-    console.log(approvalStatusMap.value)
     // 审批状态字典 {草稿箱: 1}
     res.data.forEach((item: any) => {
       approvalStatusReserveMap.value[item.name] = `${item.value}`
     })
-    console.log(approvalStatusReserveMap.value)
+    // console.log(approvalStatusReserveMap.value)
   })
 }
 
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  window.sessionStorage.setItem('approveFileMenu', newValue)
+  console.log('set', window.sessionStorage.getItem('approveFileMenu'))
 })
-onUnmounted(() => {
-  sessionStorage.setItem('approveFileMenu', current.value)
-})
-onMounted(() => {
-  getMenuStatus()
-  current.value = sessionStorage.getItem('approveFileMenu') || '全部'
-  sessionStorage.getItem('approveFileMenu') ? sessionStorage.removeItem('approveFileMenu') : ''
+
+onMounted(async () => {
+  await getMenuStatus()
+  console.log('----', window.sessionStorage.getItem('approveFileMenu'))
+
+  current.value = window.sessionStorage.getItem('approveFileMenu') || '全部'
 })
 </script>
 
@@ -66,7 +67,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
+    <component :is="currentComp" :status="currentApprovalStatus" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
   </div>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index f995313..f7f5970 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -104,16 +104,17 @@
 })
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
@@ -141,12 +142,13 @@
           ElMessage.success('保存成功')
           // formEl?.resetFields()
           // $router.go(-1)
-          close()
+          // close()
         })
       })
     }
   })
 }
+// 提交
 const submitForm = () => {
   if (!submitId.value) {
     ElMessage.warning('请先保存')
@@ -162,9 +164,8 @@
     },
   ).then((res) => {
     submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-    // formEl?.resetFields()
       ElMessage.success('已提交')
-      $router.go(-1)
+      // $router.go(-1)
       close()
     })
   })
@@ -173,7 +174,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  $router.go(-1)
+  // $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -233,6 +234,9 @@
     }
   }
 })
+onMounted(() => {
+  ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+})
 </script>
 
 <template>
@@ -299,7 +303,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" disabled
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
@@ -308,7 +312,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/addDialog.vue b/src/views/measure/file/components/approve/addDialog.vue
index 7b77c83..f5f34e6 100644
--- a/src/views/measure/file/components/approve/addDialog.vue
+++ b/src/views/measure/file/components/approve/addDialog.vue
@@ -1,7 +1,7 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../../file-interface'
 import type { TableRow } from './approve-interface'
@@ -11,10 +11,11 @@
 import { toTreeList } from '@/utils/structure'
 import { printHtml } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts } from '@/api/measure/file'
+import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts, updateFail } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval, fetchApproval } from '@/api/approval'
 
 const $route = useRoute()
 const $router = useRouter()
@@ -97,31 +98,33 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    approvalStatusName.value = row.approvalStatusName
+    approvalStatusName.value = row.approvalStatusName // 审批状态名称
+    if (approvalStatusName.value !== '草稿箱') {
+      getApprovalRecord($route.query.processId as string) // 查询审批记录
+    }
   }
 }
-onMounted(() => {
-  initDialog($route.query)
-})
+
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.publishTime = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.publishTime = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
-// 提交
-const submitForm = () => {
+// 保存
+const saveForm = () => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    '确认保存吗？',
     '提示',
     {
       confirmButtonText: '确认',
@@ -129,96 +132,96 @@
       type: 'warning',
     },
   ).then((res) => {
-    if (approvalStatusName.value !== '草稿箱') {
+    if (title.value === '新建') {
       confirmDrafts(ruleForm).then((res) => {
         if (res.code === 200) {
           console.log(res.data, '保存成功')
           submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
             ElMessage.success('提交成功')
-            $router.go(-1)
             close()
           })
         }
       })
     }
-    else {
-      // 保存（草稿箱）
-      updateDrafts(ruleForm).then((res) => {
-        ElMessage.success('保存成功')
-        $router.go(-1)
-        close()
-      })
+    else if (title.value === '编辑') {
+      if (approvalStatusName.value === '未通过-驳回') {
+        const params = {
+          ...ruleForm,
+          processId: $route.query.processId,
+        }
+        updateFail(params).then((res) => {
+          ElMessage.success('保存成功')
+          close()
+        })
+      }
+      else { // 草稿箱、已取消
+        // 保存（草稿箱）
+        updateDrafts(ruleForm).then((res) => {
+          ElMessage.success('保存成功')
+          close()
+        })
+      }
     }
   })
 }
-// 编辑
-const update = (row: TableRow) => {
-  initDialog({
-    ...row,
-    title: '编辑',
-  })
-}
-// 删除
-const remove = (row: TableRow) => {
-  ElMessageBox.confirm(
-    '确认删除吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      if (row.approvalStatusName === '待审批') {
-        approvalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            $router.go(-1)
-          }
-        })
-      }
-      else {
-        deleteApi({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            $router.go(-1)
-          }
-        })
-      }
-    })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
-  close()
-  $router.go(-1)
+
+// -----------------------------------------审批--------------------------------------
+const approvalDialog = ref()
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (title.value !== '新建') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
 }
 // 审批结束回调
 const approvalSuccess = () => {
   close()
-  $router.go(-1)
 }
-const approvalDialog = ref()
-// 审批操作
-const approval = (type: string, processId: string) => {
-  approvalDialog.value.initDialog(type, processId)
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: $route.query.processId! as string,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', $route.query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', $route.query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', $route.query.taskId)
+  }
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: `文件审批${title.value}`, // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// -----------------------------------------------------------------------------------
 
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -227,6 +230,10 @@
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -234,9 +241,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -270,53 +279,34 @@
     }
   }
 })
+
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container>
     <detail-page :title="`文件审批-${title}`">
       <template #btns>
-        <div v-if="approvalStatusName === '草稿箱' || approvalStatusName === '已取消'">
-          <el-button v-if="title !== '编辑'" type="primary" @click="update(formDataRow)">
-            编辑
-          </el-button>
-          <el-button v-else type="primary" @click="submitForm">
-            {{ approvalStatusName === '草稿箱' ? '保存' : '提交' }}
-          </el-button>
-          <el-button type="primary" @click="remove(formDataRow)">
-            删除
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="approvalStatusName === '待审批'">
-          <el-button type="primary" @click="approval('agree', formDataRow.taskId)">
-            同意
-          </el-button>
-          <el-button type="primary" @click="approval('reject', formDataRow.taskId)">
-            驳回
-          </el-button>
-          <el-button type="primary" @click="approval('refuse', formDataRow.taskId)">
-            拒绝
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="approvalStatusName === '已通过' || approvalStatusName === '未通过'">
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="['全部', '审批中'].includes(approvalStatusName)">
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批' && $route.query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批' && $route.query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button v-if="title === '新建' || title === '编辑'" type="primary" @click="saveForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
       </template>
 
       <el-form id="print" ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
@@ -368,16 +358,17 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -417,6 +408,10 @@
         </el-row>
       </el-form>
     </detail-page>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && title !== '新建'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
index 8f0a408..a8133de 100644
--- a/src/views/measure/file/components/approve/all.vue
+++ b/src/views/measure/file/components/approve/all.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="全部" />
+  <template-pag name="全部" status="0" />
 </template>
diff --git a/src/views/measure/file/components/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
index 37f69fe..8cdbbb5 100644
--- a/src/views/measure/file/components/approve/cancel.vue
+++ b/src/views/measure/file/components/approve/cancel.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="已取消" />
+  <template-pag name="已取消" status="6" />
 </template>
diff --git a/src/views/measure/file/components/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
index 033e874..d1f7274 100644
--- a/src/views/measure/file/components/approve/drafts.vue
+++ b/src/views/measure/file/components/approve/drafts.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="草稿箱" />
+  <template-pag name="草稿箱" status="1" />
 </template>
diff --git a/src/views/measure/file/components/approve/inApproval.vue b/src/views/measure/file/components/approve/inApproval.vue
index 78adba8..e96f449 100644
--- a/src/views/measure/file/components/approve/inApproval.vue
+++ b/src/views/measure/file/components/approve/inApproval.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="审批中" />
+  <template-pag name="审批中" status="3" />
 </template>
diff --git a/src/views/measure/file/components/approve/passed.vue b/src/views/measure/file/components/approve/passed.vue
index 50ea492..fbdef76 100644
--- a/src/views/measure/file/components/approve/passed.vue
+++ b/src/views/measure/file/components/approve/passed.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="已通过" value="4" />
+  <template-pag name="已通过" value="4" status="4" />
 </template>
diff --git a/src/views/measure/file/components/approve/pending.vue b/src/views/measure/file/components/approve/pending.vue
index 8f06880..8984484 100644
--- a/src/views/measure/file/components/approve/pending.vue
+++ b/src/views/measure/file/components/approve/pending.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="待审批" />
+  <template-pag name="待审批" status="2" />
 </template>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 54f1232..3163799 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -16,21 +16,24 @@
     type: String,
     default: '',
   },
-  approvalStatusMap: {
-    type: Object,
-    default: () => { return {} },
+  status: {
+    type: String,
   },
-  approvalStatusReserveMap: {
-    type: Object,
-    default: () => { return {} },
-  },
+  // approvalStatusMap: {
+  //   type: Object,
+  //   default: () => { return {} },
+  // },
+  // approvalStatusReserveMap: {
+  //   type: Object,
+  //   default: () => { return {} },
+  // },
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const approvalStatus = ref('0')
 // 审批状态字典
-const approvalStatusMap = ref({ ...props.approvalStatusMap }) // 审批状态字典{1：草稿箱}
-const approvalStatusReserveMap = ref({ ...props.approvalStatusReserveMap }) // 审批状态字典{草稿箱: 1}
+const approvalStatusMap = ref({}) as any // 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any // 审批状态字典{草稿箱: 1}
 const activeTitle = ref('') // active对应的审批状态名字
 
 const searchQuery = ref({
@@ -72,6 +75,21 @@
     searchQuery.value.createEndTime = ''
   }
 })
+
+// 获取字典
+const getDict = () => {
+  getDictByCode('approvalStatus').then((res) => {
+    // 审批状态字典 {1：草稿箱}
+    res.data.forEach((item: any) => {
+      approvalStatusMap.value[`${item.value}`] = item.name
+    })
+    // 审批状态字典 {草稿箱: 1}
+    res.data.forEach((item: any) => {
+      approvalStatusReserveMap.value[item.name] = `${item.value}`
+    })
+  })
+}
+getDict()
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -275,22 +293,44 @@
   }
 }
 
-// 监视点击名称
-watch(() => props.name, () => {
-  activeTitle.value = props.name
-  sessionStorage.setItem('approveFileMenu', props.name)
-  approvalStatus.value = approvalStatusReserveMap.value[props.name]
-  // approvalStatus.value = approvalStatusReserveMap.value[props.name] // 失效
-  searchQuery.value.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
-  $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
+const approvalStatusListTow = {
+  '全部': '0',
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+} as any
+// watch(() => props.name, async (newVal) => {
+//   await getDict()
+//   console.log('===', approvalStatusReserveMap.value)
 
-  getList()
-  // 缓存名称
-}, { deep: true, immediate: true })
+//   window.sessionStorage.setItem('approveFileMenu', newVal)
+//   sessionStorage.setItem('approveFileMenu', newVal!)
+//   approvalStatus.value = approvalStatusListTow[newVal]
+//   searchQuery.value.approvalStatus = approvalStatus.value
+//   $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
 
-onMounted(() => {
+//   getList()
+//   // 缓存名称
+// },
+// { deep: true },
+// )
+onMounted(async () => {
+  await getDict()
+  const getApproveFileMenu = window.sessionStorage.getItem('approveFileMenu')
+  if (getApproveFileMenu === undefined || getApproveFileMenu === 'undefined' || getApproveFileMenu === 'null' || getApproveFileMenu === null || getApproveFileMenu === '') {
+    approvalStatus.value = '0' // 全部
+  }
+  else {
+    approvalStatus.value = approvalStatusListTow[getApproveFileMenu!] as string
+    searchQuery.value.approvalStatus = approvalStatus.value
+  }
   getFileType()
-  // getList()
+  getList()
 })
 </script>
 
@@ -349,7 +389,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" fixed="right" :width="(activeTitle === '全部') ? 150 : (activeTitle === '草稿箱' || activeTitle === '已取消') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过' || activeTitle === '审批中') ? 100 : 150">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
@@ -387,16 +427,16 @@
                 </el-button>
                 <el-button
                   v-if="proxy.buttonPerm.refuse.if(row, '/file/approve/refuse')"
-                  size="small" type="primary" link
+                  size="small" type="danger" link
                   :disabled="proxy.buttonPerm.refuse.disabled(row)"
                   @click="approval('refuse', row.taskId)"
                 >
                   拒绝
                 </el-button>
                 <el-button
-                  v-if="proxy.buttonPerm.cancel.if(row, '/file/approve/cancel')"
+                  v-if="proxy.buttonPerm.cancel.if(row, '/file/approve/cancle')"
                   :disabled="proxy.buttonPerm.cancel.disabled(row)"
-                  size="small" type="primary"
+                  size="small" type="info"
                   link @click="cancel(row)"
                 >
                   取消
diff --git a/src/views/measure/file/components/approve/unPassed.vue b/src/views/measure/file/components/approve/unPassed.vue
index eb00217..1c9f317 100644
--- a/src/views/measure/file/components/approve/unPassed.vue
+++ b/src/views/measure/file/components/approve/unPassed.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="未通过" />
+  <template-pag name="未通过" status="5" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index d169e6e..d602a9b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -64,8 +64,8 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
-  { text: '名称', value: 'fileName', align: 'center', width: '130' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center', width: '160' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
   { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
@@ -325,6 +325,16 @@
           </el-select>
         </search-item> -->
         <search-item>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable style="width: 187px;">
+            <el-option
+              v-for="item in effectiveStatusSelect"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
           <el-date-picker
             v-model="publishTime"
             type="datetimerange"
@@ -333,12 +343,7 @@
             start-placeholder="发布开始时间"
             end-placeholder="发布结束时间"
             clearable
-            style="width: 360px;"
           />
-          <!-- <el-date-picker
-            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="发布时间"
-          /> -->
         </search-item>
         <search-item>
           <el-date-picker
@@ -349,22 +354,7 @@
             start-placeholder="实施开始时间"
             end-placeholder="实施结束时间"
             clearable
-            style="width: 360px;"
           />
-          <!-- <el-date-picker
-            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="实施时间"
-          /> -->
-        </search-item>
-        <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable style="width: 187px;">
-            <el-option
-              v-for="item in effectiveStatusSelect"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
         </search-item>
       </search-area>
       <table-container>
@@ -394,7 +384,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="170">
+            <el-table-column label="操作" align="center" width="110" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
@@ -402,7 +392,7 @@
                 <!-- <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button> -->
-                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`) && row.effectiveStatus !== '3'" size="small" type="info" link :disabled="row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
                 <el-button v-show="false" v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 155ae81..d73c996 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -3,17 +3,19 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
-import type { templateType } from '../tool_interface'
+import type { dictType, templateType } from '../tool_interface'
 import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
+import { getDictByCode } from '@/api/system/dict'
 import { templateAdd, templatePageDetail, templateUpdate } from '@/api/system/tool'
 import type { userType } from '@/views/system/user/user-interface'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive<templateType>({
   // userIdList: [], // 可使用人列表
-  templateType: '', // 类型
+  templateType: '', // 类型 1原始记录模板 2 证书报告模板
+  certificationType: '', // 证书报告模板类型
   templateName: '', // 名称
   templateCreator: '', // 负责人
   minioFileName: '', // 上传文件名
@@ -28,6 +30,7 @@
   templateName: [{ required: true, message: '模板名称必填', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '模板负责人必填', trigger: 'blur' }],
   minioFileName: [{ required: true, message: '上传附件必填', trigger: 'blur' }],
+  certificationType: [{ required: true, message: '证书报告类型必填', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 // const userList = ref<userType[]>([]) // 可使用人列表
@@ -37,6 +40,14 @@
 //   })
 // }
 // 获取可使用人列表
+const certificationTypeMap = ref<dictType[]>([]) // 证书报告类型
+// 获取字典值
+async function getDict() {
+  // 证书类型
+  const resCertificationClass = await getDictByCode('certificationType')
+  certificationTypeMap.value = resCertificationClass.data
+}
+getDict()
 // 弹窗初始化
 const initDialog = (row: templateType) => {
   title.value = row.title as string
@@ -44,13 +55,10 @@
   ruleForm.templateName = ''
   ruleForm.createTime = ''
   ruleForm.templateDesc = ''
-  ruleForm.minioFileName = ''
-  // ruleForm.userIdList = []
+  ruleForm.minioFileName = '' // 附件
+  ruleForm.certificationType = '' // 证书报告类型
   ruleForm.templateCreator = ''
   dialogVisible.value = true
-  // ruleForm.noticePublisher = userInfo.$state.name
-  // ruleForm.noticeCompany = userInfo.$state.deptName
-  // ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
   if (row.title === '新增') {
     // 新增
     ruleFormRef.value?.resetFields()
@@ -59,40 +67,28 @@
   else if (row.title === '编辑') {
     ruleForm.templateNo = row.templateNo
     ruleForm.templateName = row.templateName
-    // ruleForm.createTime = row.createTime
+    ruleForm.createTime = row.createTime
     ruleForm.templateDesc = row.templateDesc
     ruleForm.minioFileName = row.minioFileName
-    // ruleForm.userIdList = row.userIdList
     ruleForm.templateCreator = row.templateCreator
+    ruleForm.certificationType = row.certificationType
     ruleForm.id = row.id
-    ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
     templatePageDetail({ ...row }).then((res) => {
       ruleForm.id = res.data.id
-      // res.data.userList.forEach((element: userType) => {
-      //   ruleForm.userIdList?.push(element.id)
-      // })
     })
-    // 修改
   }
   else {
     // 详情
     ruleForm.templateNo = row.templateNo
     ruleForm.templateName = row.templateName
-    ruleForm.createTime = row.createTime
+    ruleForm.createTime = row.createTime // 创建时间
     ruleForm.templateDesc = row.templateDesc
     ruleForm.minioFileName = row.minioFileName
-    // ruleForm.userIdList = row.userIdList
     ruleForm.templateCreator = row.templateCreator
-    // 获取详情列表
-    // templatePageDetail({ ...row }).then((res) => {
-    //   res.data.userList.forEach((element: userType) => {
-    //     ruleForm.userIdList?.push(element.id)
-    //   })
-    // })
+    ruleForm.certificationType = row.certificationType
   }
-  ruleForm.templateType = row.templateType
-  // getuser()
+  ruleForm.templateType = row.templateType // 模板类型
 }
 defineExpose({ initDialog })
 // 关闭弹窗
@@ -169,8 +165,27 @@
             <el-input v-model.trim="ruleForm.templateName" placeholder="模板名称" :disabled="title === '详情'" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="模板类型:" prop="certificationType">
+            <el-select
+              v-model="ruleForm.certificationType"
+              clearable
+              :placeholder="title === '详情' ? ' ' : '请选择证书报告类型'"
+              size="default"
+              style="width: 100%;"
+              :disabled="title === '详情'"
+            >
+              <el-option
+                v-for="item in certificationTypeMap"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <!-- </el-row> -->
+        <!-- <el-row :gutter="20"> -->
         <el-col :span="12">
           <el-form-item label="创建时间">
             <el-input v-model.trim="ruleForm.createTime" disabled />
@@ -183,7 +198,7 @@
         </el-col>
       </el-row>
       <el-form-item label="模板描述" prop="templateDesc">
-        <el-input v-model.trim="ruleForm.templateDesc" placeholder="模板描述" :disabled="title === '详情'" />
+        <el-input v-model.trim="ruleForm.templateDesc" type="textarea" autosize placeholder="模板描述" :disabled="title === '详情'" />
       </el-form-item>
       <!-- <el-form-item label="可使用人" prop="userIdList">
         <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index c4ad507..3272a13 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -8,6 +8,7 @@
 import { printJSON } from '@/utils/printUtils'
 import { getPhotoUrl, templateDelete, templateExport, templatePage } from '@/api/system/tool'
 import { getDictByCode } from '@/api/system/dict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
 import { download } from '@/utils/download'
@@ -37,11 +38,11 @@
 })
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '编号', value: 'templateNo', align: 'center', width: '180' },
-  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
+const columns = ref<TableColumn[]>([
+  { text: '编号', value: 'templateNo', align: 'center', width: '160' },
+  { text: '模板名称', value: 'templateName', align: 'center' },
   { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '描述', value: 'templateDesc', align: 'center' },
 ]) // 表格
 const list = ref([]) // 表格数据
@@ -250,7 +251,7 @@
       </template>
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns as any"
+        :data="list" :total="total" :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
         :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
diff --git a/src/views/system/tool/document/addDDialog.vue b/src/views/system/tool/document/addDDialog.vue
index 00c7ef5..4ad8c63 100644
--- a/src/views/system/tool/document/addDDialog.vue
+++ b/src/views/system/tool/document/addDDialog.vue
@@ -12,7 +12,6 @@
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive<templateType>({
-  // userIdList: [], // 可使用人列表
   templateType: '', // 类型
   templateName: '', // 名称
   templateCreator: '', // 负责人
@@ -24,18 +23,11 @@
 }) // 表单
 const title = ref('')
 const rules = ref<FormRules>({
-  // userIdList: [{ required: true, message: '可使用人列表必填', trigger: 'blur' }],
   templateName: [{ required: true, message: '模板名称必填', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '模板负责人必填', trigger: 'blur' }],
   minioFileName: [{ required: true, message: '上传附件必填', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
-// const userList = ref<userType[]>([]) // 可使用人列表
-const getuser = () => {
-  // getUserList({ offset: 1, limit: 99999 }).then((res) => {
-  //   userList.value = res.data.rows
-  // })
-} // 获取可使用人列表
 // 弹窗初始化
 const initDialog = (row: templateType) => {
   title.value = row.title as string
@@ -44,12 +36,8 @@
   ruleForm.createTime = ''
   ruleForm.templateDesc = ''
   ruleForm.minioFileName = ''
-  // ruleForm.userIdList = []
   ruleForm.templateCreator = ''
   dialogVisible.value = true
-  // ruleForm.noticePublisher = userInfo.$state.name
-  // ruleForm.noticeCompany = userInfo.$state.deptName
-  // ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
   if (row.title === '新增') {
     // 新增
     ruleFormRef.value?.resetFields()
@@ -58,21 +46,11 @@
   else if (row.title === '编辑') {
     ruleForm.templateNo = row.templateNo
     ruleForm.templateName = row.templateName
-    // ruleForm.createTime = row.createTime
+    ruleForm.createTime = row.createTime
     ruleForm.templateDesc = row.templateDesc
     ruleForm.minioFileName = row.minioFileName
-    // ruleForm.userIdList = row.userIdList
     ruleForm.templateCreator = row.templateCreator
     ruleForm.id = row.id
-    ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    // 获取详情列表
-    // templatePageDetail({ ...row }).then((res) => {
-    //   ruleForm.id = res.data.id
-    //   res.data.userList.forEach((element: userType) => {
-    //     ruleForm.userIdList?.push(element.id)
-    //   })
-    // })
-    // 修改
   }
   else {
     // 详情
@@ -81,18 +59,9 @@
     ruleForm.createTime = row.createTime
     ruleForm.templateDesc = row.templateDesc
     ruleForm.minioFileName = row.minioFileName
-    // ruleForm.userIdList = row.userIdList
     ruleForm.templateCreator = row.templateCreator
-    // 获取详情列表
-    // templatePageDetail({ ...row }).then((res) => {
-    //   ruleForm.id = res.data.id
-    //   res.data.userList.forEach((element: userType) => {
-    //     ruleForm.userIdList?.push(element.id)
-    //   })
-    // })
   }
   ruleForm.templateType = row.templateType
-  // getuser()
 }
 defineExpose({ initDialog })
 // 关闭弹窗

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 768c310..71e8b02 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -131,3 +131,12 @@
   })
 }
 
+// 未通过-驳回编辑
+export function updateFail(data: object) {
+  return request({
+    url: '/meter/file/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 554a196..2f491c0 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -19,13 +19,15 @@
         已取消: '6',
       } as approvalStatus, // 审批状态
       approvalStatusListTow: {
-        全部: '0',
-        草稿箱: '1',
-        待审批: '2',
-        审批中: '3',
-        已通过: '4',
-        未通过: '5',
-        已取消: '6',
+        '全部': '0',
+        '草稿箱': '1',
+        '待审批': '2',
+        '审批中': '3',
+        '已通过': '4',
+        '未通过': '5',
+        '已取消': '6',
+        '非草稿': '7',
+        '未通过-驳回': '8',
       } as approvalStatus, // 审批状态
     }),
     getters: {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 99ddb0f..1289bc8 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -489,6 +489,7 @@
 const confirmCheckoutTemplate = (val: any) => {
   formInline.value.templateId = val.id // 证书报告模板id
   formInline.value.templateName = val.templateName || '' // 证书报告模板名称
+  formInline.value.certificateReportType = val.certificationType // 证书报告类型
 }
 
 // --------------------------------------选择签章-----------------------------------
@@ -674,13 +675,13 @@
               <el-select
                 v-model="formInline.certificateReportType"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择证书报告类型'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择证书报告类型'"
                 size="default"
                 style="width: 100%;"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <el-option
-                  v-for="item in certificationClassMap"
+                  v-for="item in certificationTypeMap"
                   :key="item.value"
                   :label="item.name"
                   :value="item.value"
@@ -845,7 +846,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="证书类别:" prop="businessOriginalRecord.businessOrder.certifications">
               <el-select
                 v-model="formInline.businessOriginalRecord.businessOrder.certifications"
@@ -862,7 +863,7 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 13e05df..ef90dd5 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -427,103 +427,11 @@
             </template>
           </el-table-column>
         </template>
-        <template #default="{ row }">
-          <el-button
-            size="small"
-            type="primary"
-            link
-            @click="handleEdit(row, '查看', 'detail')"
-          >
-            查看
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批'"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '同意')"
-          >
-            同意
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
-            size="small"
-            link
-            type="primary"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '驳回')"
-          >
-            驳回
-          </el-button>
-          <el-button
-            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '拒绝')"
-          >
-            拒绝
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '编辑', 'edit')"
-          >
-            编辑
-          </el-button>
-          <el-button
-            v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
-            size="small"
-            link
-            type="primary"
-            @click="handleEdit(row, '提交')"
-          >
-            提交
-          </el-button>
-          <!-- 是发起者且审批中可以取消 -->
-          <el-button
-            v-if="row.approvalStatusName === '审批中'"
-            size="small"
-            link
-            type="info"
-            :disabled="row.approvalStatusName !== '审批中'"
-            @click="handleEdit(row, '取消')"
-          >
-            取消
-          </el-button>
-          <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-          <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-          <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
-          <el-button
-            v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
-            size="small"
-            link
-            type="danger"
-            :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-            @click="handleEdit(row, '删除')"
-          >
-            删除
-          </el-button>
-        </template>
-        <!-- ------------------------------------------------- -->
         <template #columns>
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
+            :width="(activeTitle === '全部') ? 200 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 100 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -594,20 +502,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                 @click="handleEdit(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b67d2eb..2318d82 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -13,7 +13,7 @@
   name: string
   comp: any
 }
-const menu = shallowRef<menuType[]>([
+const menu = ref<menuType[]>([
   { name: '全部', comp: all },
   { name: '草稿箱', comp: drafts },
   { name: '待审批', comp: pending },
@@ -22,8 +22,9 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(all)
+const current = ref('')
+const currentApprovalStatus = ref('0')
+const currentComp = ref(all)
 const approvalStatusMap = ref({}) as any
 const approvalStatusReserveMap = ref({}) as any
 // 获取菜单状态
@@ -33,25 +34,25 @@
     res.data.forEach((item: any) => {
       approvalStatusMap.value[`${item.value}`] = item.name
     })
-    console.log(approvalStatusMap.value)
     // 审批状态字典 {草稿箱: 1}
     res.data.forEach((item: any) => {
       approvalStatusReserveMap.value[item.name] = `${item.value}`
     })
-    console.log(approvalStatusReserveMap.value)
+    // console.log(approvalStatusReserveMap.value)
   })
 }
 
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  window.sessionStorage.setItem('approveFileMenu', newValue)
+  console.log('set', window.sessionStorage.getItem('approveFileMenu'))
 })
-onUnmounted(() => {
-  sessionStorage.setItem('approveFileMenu', current.value)
-})
-onMounted(() => {
-  getMenuStatus()
-  current.value = sessionStorage.getItem('approveFileMenu') || '全部'
-  sessionStorage.getItem('approveFileMenu') ? sessionStorage.removeItem('approveFileMenu') : ''
+
+onMounted(async () => {
+  await getMenuStatus()
+  console.log('----', window.sessionStorage.getItem('approveFileMenu'))
+
+  current.value = window.sessionStorage.getItem('approveFileMenu') || '全部'
 })
 </script>
 
@@ -66,7 +67,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
+    <component :is="currentComp" :status="currentApprovalStatus" :approval-status-map="approvalStatusMap" :approval-status-reserve-map="approvalStatusReserveMap" />
   </div>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index f995313..f7f5970 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -104,16 +104,17 @@
 })
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
@@ -141,12 +142,13 @@
           ElMessage.success('保存成功')
           // formEl?.resetFields()
           // $router.go(-1)
-          close()
+          // close()
         })
       })
     }
   })
 }
+// 提交
 const submitForm = () => {
   if (!submitId.value) {
     ElMessage.warning('请先保存')
@@ -162,9 +164,8 @@
     },
   ).then((res) => {
     submitFile({ id: submitId.value, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
-    // formEl?.resetFields()
       ElMessage.success('已提交')
-      $router.go(-1)
+      // $router.go(-1)
       close()
     })
   })
@@ -173,7 +174,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  $router.go(-1)
+  // $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -233,6 +234,9 @@
     }
   }
 })
+onMounted(() => {
+  ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+})
 </script>
 
 <template>
@@ -299,7 +303,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" disabled
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
@@ -308,7 +312,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/addDialog.vue b/src/views/measure/file/components/approve/addDialog.vue
index 7b77c83..f5f34e6 100644
--- a/src/views/measure/file/components/approve/addDialog.vue
+++ b/src/views/measure/file/components/approve/addDialog.vue
@@ -1,7 +1,7 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../../file-interface'
 import type { TableRow } from './approve-interface'
@@ -11,10 +11,11 @@
 import { toTreeList } from '@/utils/structure'
 import { printHtml } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts } from '@/api/measure/file'
+import { UploadFile, addApi, approvalDelete, confirmDrafts, deleteApi, submitFile, updateDrafts, updateFail } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval, fetchApproval } from '@/api/approval'
 
 const $route = useRoute()
 const $router = useRouter()
@@ -97,31 +98,33 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    approvalStatusName.value = row.approvalStatusName
+    approvalStatusName.value = row.approvalStatusName // 审批状态名称
+    if (approvalStatusName.value !== '草稿箱') {
+      getApprovalRecord($route.query.processId as string) // 查询审批记录
+    }
   }
 }
-onMounted(() => {
-  initDialog($route.query)
-})
+
 // 关闭弹窗
 const close = () => {
-  ruleForm.fileType = ''
-  ruleForm.fileName = ''
-  ruleForm.fileCode = ''
-  ruleForm.minioFileName = ''
-  ruleForm.publishTime = ''
-  ruleForm.remark = ''
-  ruleForm.publishTime = ''
-  ruleForm.effectiveTime = ''
-  ruleForm.effectiveStatus = ''
-  ruleForm.publishTime = ''
-  ruleForm.createUserId = ''
-  effectiveStatusName.value = ''
+  // ruleForm.fileType = ''
+  // ruleForm.fileName = ''
+  // ruleForm.fileCode = ''
+  // ruleForm.minioFileName = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.remark = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.effectiveTime = ''
+  // ruleForm.effectiveStatus = ''
+  // ruleForm.publishTime = ''
+  // ruleForm.createUserId = ''
+  // effectiveStatusName.value = ''
+  $router.back()
 }
-// 提交
-const submitForm = () => {
+// 保存
+const saveForm = () => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    '确认保存吗？',
     '提示',
     {
       confirmButtonText: '确认',
@@ -129,96 +132,96 @@
       type: 'warning',
     },
   ).then((res) => {
-    if (approvalStatusName.value !== '草稿箱') {
+    if (title.value === '新建') {
       confirmDrafts(ruleForm).then((res) => {
         if (res.code === 200) {
           console.log(res.data, '保存成功')
           submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
             ElMessage.success('提交成功')
-            $router.go(-1)
             close()
           })
         }
       })
     }
-    else {
-      // 保存（草稿箱）
-      updateDrafts(ruleForm).then((res) => {
-        ElMessage.success('保存成功')
-        $router.go(-1)
-        close()
-      })
+    else if (title.value === '编辑') {
+      if (approvalStatusName.value === '未通过-驳回') {
+        const params = {
+          ...ruleForm,
+          processId: $route.query.processId,
+        }
+        updateFail(params).then((res) => {
+          ElMessage.success('保存成功')
+          close()
+        })
+      }
+      else { // 草稿箱、已取消
+        // 保存（草稿箱）
+        updateDrafts(ruleForm).then((res) => {
+          ElMessage.success('保存成功')
+          close()
+        })
+      }
     }
   })
 }
-// 编辑
-const update = (row: TableRow) => {
-  initDialog({
-    ...row,
-    title: '编辑',
-  })
-}
-// 删除
-const remove = (row: TableRow) => {
-  ElMessageBox.confirm(
-    '确认删除吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      if (row.approvalStatusName === '待审批') {
-        approvalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            $router.go(-1)
-          }
-        })
-      }
-      else {
-        deleteApi({ id: row.id }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            $router.go(-1)
-          }
-        })
-      }
-    })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
-  close()
-  $router.go(-1)
+
+// -----------------------------------------审批--------------------------------------
+const approvalDialog = ref()
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (title.value !== '新建') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
 }
 // 审批结束回调
 const approvalSuccess = () => {
   close()
-  $router.go(-1)
 }
-const approvalDialog = ref()
-// 审批操作
-const approval = (type: string, processId: string) => {
-  approvalDialog.value.initDialog(type, processId)
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: $route.query.processId! as string,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', $route.query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', $route.query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', $route.query.taskId)
+  }
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: `文件审批${title.value}`, // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// -----------------------------------------------------------------------------------
 
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -227,6 +230,10 @@
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
@@ -234,9 +241,11 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -270,53 +279,34 @@
     }
   }
 })
+
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container>
     <detail-page :title="`文件审批-${title}`">
       <template #btns>
-        <div v-if="approvalStatusName === '草稿箱' || approvalStatusName === '已取消'">
-          <el-button v-if="title !== '编辑'" type="primary" @click="update(formDataRow)">
-            编辑
-          </el-button>
-          <el-button v-else type="primary" @click="submitForm">
-            {{ approvalStatusName === '草稿箱' ? '保存' : '提交' }}
-          </el-button>
-          <el-button type="primary" @click="remove(formDataRow)">
-            删除
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="approvalStatusName === '待审批'">
-          <el-button type="primary" @click="approval('agree', formDataRow.taskId)">
-            同意
-          </el-button>
-          <el-button type="primary" @click="approval('reject', formDataRow.taskId)">
-            驳回
-          </el-button>
-          <el-button type="primary" @click="approval('refuse', formDataRow.taskId)">
-            拒绝
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="approvalStatusName === '已通过' || approvalStatusName === '未通过'">
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
-        <div v-if="['全部', '审批中'].includes(approvalStatusName)">
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </div>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批' && $route.query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '待审批' && $route.query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button v-if="title === '新建' || title === '编辑'" type="primary" @click="saveForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
       </template>
 
       <el-form id="print" ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
@@ -368,16 +358,17 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
                 placeholder="请选择创建时间"
                 class="normal-date"
                 style="width: 100%;"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" disabled style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -417,6 +408,10 @@
         </el-row>
       </el-form>
     </detail-page>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && title !== '新建'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
index 8f0a408..a8133de 100644
--- a/src/views/measure/file/components/approve/all.vue
+++ b/src/views/measure/file/components/approve/all.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="全部" />
+  <template-pag name="全部" status="0" />
 </template>
diff --git a/src/views/measure/file/components/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
index 37f69fe..8cdbbb5 100644
--- a/src/views/measure/file/components/approve/cancel.vue
+++ b/src/views/measure/file/components/approve/cancel.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="已取消" />
+  <template-pag name="已取消" status="6" />
 </template>
diff --git a/src/views/measure/file/components/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
index 033e874..d1f7274 100644
--- a/src/views/measure/file/components/approve/drafts.vue
+++ b/src/views/measure/file/components/approve/drafts.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="草稿箱" />
+  <template-pag name="草稿箱" status="1" />
 </template>
diff --git a/src/views/measure/file/components/approve/inApproval.vue b/src/views/measure/file/components/approve/inApproval.vue
index 78adba8..e96f449 100644
--- a/src/views/measure/file/components/approve/inApproval.vue
+++ b/src/views/measure/file/components/approve/inApproval.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="审批中" />
+  <template-pag name="审批中" status="3" />
 </template>
diff --git a/src/views/measure/file/components/approve/passed.vue b/src/views/measure/file/components/approve/passed.vue
index 50ea492..fbdef76 100644
--- a/src/views/measure/file/components/approve/passed.vue
+++ b/src/views/measure/file/components/approve/passed.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="已通过" value="4" />
+  <template-pag name="已通过" value="4" status="4" />
 </template>
diff --git a/src/views/measure/file/components/approve/pending.vue b/src/views/measure/file/components/approve/pending.vue
index 8f06880..8984484 100644
--- a/src/views/measure/file/components/approve/pending.vue
+++ b/src/views/measure/file/components/approve/pending.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="待审批" />
+  <template-pag name="待审批" status="2" />
 </template>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 54f1232..3163799 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -16,21 +16,24 @@
     type: String,
     default: '',
   },
-  approvalStatusMap: {
-    type: Object,
-    default: () => { return {} },
+  status: {
+    type: String,
   },
-  approvalStatusReserveMap: {
-    type: Object,
-    default: () => { return {} },
-  },
+  // approvalStatusMap: {
+  //   type: Object,
+  //   default: () => { return {} },
+  // },
+  // approvalStatusReserveMap: {
+  //   type: Object,
+  //   default: () => { return {} },
+  // },
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const approvalStatus = ref('0')
 // 审批状态字典
-const approvalStatusMap = ref({ ...props.approvalStatusMap }) // 审批状态字典{1：草稿箱}
-const approvalStatusReserveMap = ref({ ...props.approvalStatusReserveMap }) // 审批状态字典{草稿箱: 1}
+const approvalStatusMap = ref({}) as any // 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any // 审批状态字典{草稿箱: 1}
 const activeTitle = ref('') // active对应的审批状态名字
 
 const searchQuery = ref({
@@ -72,6 +75,21 @@
     searchQuery.value.createEndTime = ''
   }
 })
+
+// 获取字典
+const getDict = () => {
+  getDictByCode('approvalStatus').then((res) => {
+    // 审批状态字典 {1：草稿箱}
+    res.data.forEach((item: any) => {
+      approvalStatusMap.value[`${item.value}`] = item.name
+    })
+    // 审批状态字典 {草稿箱: 1}
+    res.data.forEach((item: any) => {
+      approvalStatusReserveMap.value[item.name] = `${item.value}`
+    })
+  })
+}
+getDict()
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -275,22 +293,44 @@
   }
 }
 
-// 监视点击名称
-watch(() => props.name, () => {
-  activeTitle.value = props.name
-  sessionStorage.setItem('approveFileMenu', props.name)
-  approvalStatus.value = approvalStatusReserveMap.value[props.name]
-  // approvalStatus.value = approvalStatusReserveMap.value[props.name] // 失效
-  searchQuery.value.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
-  $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
+const approvalStatusListTow = {
+  '全部': '0',
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+} as any
+// watch(() => props.name, async (newVal) => {
+//   await getDict()
+//   console.log('===', approvalStatusReserveMap.value)
 
-  getList()
-  // 缓存名称
-}, { deep: true, immediate: true })
+//   window.sessionStorage.setItem('approveFileMenu', newVal)
+//   sessionStorage.setItem('approveFileMenu', newVal!)
+//   approvalStatus.value = approvalStatusListTow[newVal]
+//   searchQuery.value.approvalStatus = approvalStatus.value
+//   $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
 
-onMounted(() => {
+//   getList()
+//   // 缓存名称
+// },
+// { deep: true },
+// )
+onMounted(async () => {
+  await getDict()
+  const getApproveFileMenu = window.sessionStorage.getItem('approveFileMenu')
+  if (getApproveFileMenu === undefined || getApproveFileMenu === 'undefined' || getApproveFileMenu === 'null' || getApproveFileMenu === null || getApproveFileMenu === '') {
+    approvalStatus.value = '0' // 全部
+  }
+  else {
+    approvalStatus.value = approvalStatusListTow[getApproveFileMenu!] as string
+    searchQuery.value.approvalStatus = approvalStatus.value
+  }
   getFileType()
-  // getList()
+  getList()
 })
 </script>
 
@@ -349,7 +389,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" fixed="right" :width="(activeTitle === '全部') ? 150 : (activeTitle === '草稿箱' || activeTitle === '已取消') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过' || activeTitle === '审批中') ? 100 : 150">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
@@ -387,16 +427,16 @@
                 </el-button>
                 <el-button
                   v-if="proxy.buttonPerm.refuse.if(row, '/file/approve/refuse')"
-                  size="small" type="primary" link
+                  size="small" type="danger" link
                   :disabled="proxy.buttonPerm.refuse.disabled(row)"
                   @click="approval('refuse', row.taskId)"
                 >
                   拒绝
                 </el-button>
                 <el-button
-                  v-if="proxy.buttonPerm.cancel.if(row, '/file/approve/cancel')"
+                  v-if="proxy.buttonPerm.cancel.if(row, '/file/approve/cancle')"
                   :disabled="proxy.buttonPerm.cancel.disabled(row)"
-                  size="small" type="primary"
+                  size="small" type="info"
                   link @click="cancel(row)"
                 >
                   取消
diff --git a/src/views/measure/file/components/approve/unPassed.vue b/src/views/measure/file/components/approve/unPassed.vue
index eb00217..1c9f317 100644
--- a/src/views/measure/file/components/approve/unPassed.vue
+++ b/src/views/measure/file/components/approve/unPassed.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="未通过" />
+  <template-pag name="未通过" status="5" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index d169e6e..d602a9b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -64,8 +64,8 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
-  { text: '名称', value: 'fileName', align: 'center', width: '130' },
-  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center', width: '160' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
   { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
@@ -325,6 +325,16 @@
           </el-select>
         </search-item> -->
         <search-item>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable style="width: 187px;">
+            <el-option
+              v-for="item in effectiveStatusSelect"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
           <el-date-picker
             v-model="publishTime"
             type="datetimerange"
@@ -333,12 +343,7 @@
             start-placeholder="发布开始时间"
             end-placeholder="发布结束时间"
             clearable
-            style="width: 360px;"
           />
-          <!-- <el-date-picker
-            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="发布时间"
-          /> -->
         </search-item>
         <search-item>
           <el-date-picker
@@ -349,22 +354,7 @@
             start-placeholder="实施开始时间"
             end-placeholder="实施结束时间"
             clearable
-            style="width: 360px;"
           />
-          <!-- <el-date-picker
-            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="实施时间"
-          /> -->
-        </search-item>
-        <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable style="width: 187px;">
-            <el-option
-              v-for="item in effectiveStatusSelect"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
         </search-item>
       </search-area>
       <table-container>
@@ -394,7 +384,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="170">
+            <el-table-column label="操作" align="center" width="110" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
@@ -402,7 +392,7 @@
                 <!-- <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button> -->
-                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`) && row.effectiveStatus !== '3'" size="small" type="info" link :disabled="row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
                 <el-button v-show="false" v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 155ae81..d73c996 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -3,17 +3,19 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
-import type { templateType } from '../tool_interface'
+import type { dictType, templateType } from '../tool_interface'
 import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
+import { getDictByCode } from '@/api/system/dict'
 import { templateAdd, templatePageDetail, templateUpdate } from '@/api/system/tool'
 import type { userType } from '@/views/system/user/user-interface'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive<templateType>({
   // userIdList: [], // 可使用人列表
-  templateType: '', // 类型
+  templateType: '', // 类型 1原始记录模板 2 证书报告模板
+  certificationType: '', // 证书报告模板类型
   templateName: '', // 名称
   templateCreator: '', // 负责人
   minioFileName: '', // 上传文件名
@@ -28,6 +30,7 @@
   templateName: [{ required: true, message: '模板名称必填', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '模板负责人必填', trigger: 'blur' }],
   minioFileName: [{ required: true, message: '上传附件必填', trigger: 'blur' }],
+  certificationType: [{ required: true, message: '证书报告类型必填', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 // const userList = ref<userType[]>([]) // 可使用人列表
@@ -37,6 +40,14 @@
 //   })
 // }
 // 获取可使用人列表
+const certificationTypeMap = ref<dictType[]>([]) // 证书报告类型
+// 获取字典值
+async function getDict() {
+  // 证书类型
+  const resCertificationClass = await getDictByCode('certificationType')
+  certificationTypeMap.value = resCertificationClass.data
+}
+getDict()
 // 弹窗初始化
 const initDialog = (row: templateType) => {
   title.value = row.title as string
@@ -44,13 +55,10 @@
   ruleForm.templateName = ''
   ruleForm.createTime = ''
   ruleForm.templateDesc = ''
-  ruleForm.minioFileName = ''
-  // ruleForm.userIdList = []
+  ruleForm.minioFileName = '' // 附件
+  ruleForm.certificationType = '' // 证书报告类型
   ruleForm.templateCreator = ''
   dialogVisible.value = true
-  // ruleForm.noticePublisher = userInfo.$state.name
-  // ruleForm.noticeCompany = userInfo.$state.deptName
-  // ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
   if (row.title === '新增') {
     // 新增
     ruleFormRef.value?.resetFields()
@@ -59,40 +67,28 @@
   else if (row.title === '编辑') {
     ruleForm.templateNo = row.templateNo
     ruleForm.templateName = row.templateName
-    // ruleForm.createTime = row.createTime
+    ruleForm.createTime = row.createTime
     ruleForm.templateDesc = row.templateDesc
     ruleForm.minioFileName = row.minioFileName
-    // ruleForm.userIdList = row.userIdList
     ruleForm.templateCreator = row.templateCreator
+    ruleForm.certificationType = row.certificationType
     ruleForm.id = row.id
-    ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
     templatePageDetail({ ...row }).then((res) => {
       ruleForm.id = res.data.id
-      // res.data.userList.forEach((element: userType) => {
-      //   ruleForm.userIdList?.push(element.id)
-      // })
     })
-    // 修改
   }
   else {
     // 详情
     ruleForm.templateNo = row.templateNo
     ruleForm.templateName = row.templateName
-    ruleForm.createTime = row.createTime
+    ruleForm.createTime = row.createTime // 创建时间
     ruleForm.templateDesc = row.templateDesc
     ruleForm.minioFileName = row.minioFileName
-    // ruleForm.userIdList = row.userIdList
     ruleForm.templateCreator = row.templateCreator
-    // 获取详情列表
-    // templatePageDetail({ ...row }).then((res) => {
-    //   res.data.userList.forEach((element: userType) => {
-    //     ruleForm.userIdList?.push(element.id)
-    //   })
-    // })
+    ruleForm.certificationType = row.certificationType
   }
-  ruleForm.templateType = row.templateType
-  // getuser()
+  ruleForm.templateType = row.templateType // 模板类型
 }
 defineExpose({ initDialog })
 // 关闭弹窗
@@ -169,8 +165,27 @@
             <el-input v-model.trim="ruleForm.templateName" placeholder="模板名称" :disabled="title === '详情'" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="模板类型:" prop="certificationType">
+            <el-select
+              v-model="ruleForm.certificationType"
+              clearable
+              :placeholder="title === '详情' ? ' ' : '请选择证书报告类型'"
+              size="default"
+              style="width: 100%;"
+              :disabled="title === '详情'"
+            >
+              <el-option
+                v-for="item in certificationTypeMap"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <!-- </el-row> -->
+        <!-- <el-row :gutter="20"> -->
         <el-col :span="12">
           <el-form-item label="创建时间">
             <el-input v-model.trim="ruleForm.createTime" disabled />
@@ -183,7 +198,7 @@
         </el-col>
       </el-row>
       <el-form-item label="模板描述" prop="templateDesc">
-        <el-input v-model.trim="ruleForm.templateDesc" placeholder="模板描述" :disabled="title === '详情'" />
+        <el-input v-model.trim="ruleForm.templateDesc" type="textarea" autosize placeholder="模板描述" :disabled="title === '详情'" />
       </el-form-item>
       <!-- <el-form-item label="可使用人" prop="userIdList">
         <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index c4ad507..3272a13 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -8,6 +8,7 @@
 import { printJSON } from '@/utils/printUtils'
 import { getPhotoUrl, templateDelete, templateExport, templatePage } from '@/api/system/tool'
 import { getDictByCode } from '@/api/system/dict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
 import { download } from '@/utils/download'
@@ -37,11 +38,11 @@
 })
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '编号', value: 'templateNo', align: 'center', width: '180' },
-  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
+const columns = ref<TableColumn[]>([
+  { text: '编号', value: 'templateNo', align: 'center', width: '160' },
+  { text: '模板名称', value: 'templateName', align: 'center' },
   { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '描述', value: 'templateDesc', align: 'center' },
 ]) // 表格
 const list = ref([]) // 表格数据
@@ -250,7 +251,7 @@
       </template>
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns as any"
+        :data="list" :total="total" :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
         :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
diff --git a/src/views/system/tool/document/addDDialog.vue b/src/views/system/tool/document/addDDialog.vue
index 00c7ef5..4ad8c63 100644
--- a/src/views/system/tool/document/addDDialog.vue
+++ b/src/views/system/tool/document/addDDialog.vue
@@ -12,7 +12,6 @@
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive<templateType>({
-  // userIdList: [], // 可使用人列表
   templateType: '', // 类型
   templateName: '', // 名称
   templateCreator: '', // 负责人
@@ -24,18 +23,11 @@
 }) // 表单
 const title = ref('')
 const rules = ref<FormRules>({
-  // userIdList: [{ required: true, message: '可使用人列表必填', trigger: 'blur' }],
   templateName: [{ required: true, message: '模板名称必填', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '模板负责人必填', trigger: 'blur' }],
   minioFileName: [{ required: true, message: '上传附件必填', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
-// const userList = ref<userType[]>([]) // 可使用人列表
-const getuser = () => {
-  // getUserList({ offset: 1, limit: 99999 }).then((res) => {
-  //   userList.value = res.data.rows
-  // })
-} // 获取可使用人列表
 // 弹窗初始化
 const initDialog = (row: templateType) => {
   title.value = row.title as string
@@ -44,12 +36,8 @@
   ruleForm.createTime = ''
   ruleForm.templateDesc = ''
   ruleForm.minioFileName = ''
-  // ruleForm.userIdList = []
   ruleForm.templateCreator = ''
   dialogVisible.value = true
-  // ruleForm.noticePublisher = userInfo.$state.name
-  // ruleForm.noticeCompany = userInfo.$state.deptName
-  // ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
   if (row.title === '新增') {
     // 新增
     ruleFormRef.value?.resetFields()
@@ -58,21 +46,11 @@
   else if (row.title === '编辑') {
     ruleForm.templateNo = row.templateNo
     ruleForm.templateName = row.templateName
-    // ruleForm.createTime = row.createTime
+    ruleForm.createTime = row.createTime
     ruleForm.templateDesc = row.templateDesc
     ruleForm.minioFileName = row.minioFileName
-    // ruleForm.userIdList = row.userIdList
     ruleForm.templateCreator = row.templateCreator
     ruleForm.id = row.id
-    ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    // 获取详情列表
-    // templatePageDetail({ ...row }).then((res) => {
-    //   ruleForm.id = res.data.id
-    //   res.data.userList.forEach((element: userType) => {
-    //     ruleForm.userIdList?.push(element.id)
-    //   })
-    // })
-    // 修改
   }
   else {
     // 详情
@@ -81,18 +59,9 @@
     ruleForm.createTime = row.createTime
     ruleForm.templateDesc = row.templateDesc
     ruleForm.minioFileName = row.minioFileName
-    // ruleForm.userIdList = row.userIdList
     ruleForm.templateCreator = row.templateCreator
-    // 获取详情列表
-    // templatePageDetail({ ...row }).then((res) => {
-    //   ruleForm.id = res.data.id
-    //   res.data.userList.forEach((element: userType) => {
-    //     ruleForm.userIdList?.push(element.id)
-    //   })
-    // })
   }
   ruleForm.templateType = row.templateType
-  // getuser()
 }
 defineExpose({ initDialog })
 // 关闭弹窗
diff --git a/src/views/system/tool/tool_interface.ts b/src/views/system/tool/tool_interface.ts
index e6c2412..910105b 100644
--- a/src/views/system/tool/tool_interface.ts
+++ b/src/views/system/tool/tool_interface.ts
@@ -47,7 +47,17 @@
   templateNo?: string
   templateType?: string
   updateTime?: string
-  userIdList: string[]
+  userIdList?: string[]
   createStartTime?: string
+  createTime?: string // 创建时间
+  certificationType?: string // 证书报告类型
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
 }