diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1ac692b..5d919c2 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -436,8 +436,8 @@
           v-model="timeRange"
           type="datetimerange"
           range-separator="到"
-          format="YYYY-MM-DD hh:mm"
-          value-format="YYYY-MM-DD hh:mm"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="申请开始时间"
           end-placeholder="申请结束时间"
         />

diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1ac692b..5d919c2 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -436,8 +436,8 @@
           v-model="timeRange"
           type="datetimerange"
           range-separator="到"
-          format="YYYY-MM-DD hh:mm"
-          value-format="YYYY-MM-DD hh:mm"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="申请开始时间"
           end-placeholder="申请结束时间"
         />
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index e37bc6a..83938f5 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -490,8 +490,8 @@
           v-model="timeRange"
           type="datetimerange"
           range-separator="到"
-          format="YYYY-MM-DD hh:mm"
-          value-format="YYYY-MM-DD hh:mm"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="申请开始时间"
           end-placeholder="申请结束时间"
         />

diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1ac692b..5d919c2 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -436,8 +436,8 @@
           v-model="timeRange"
           type="datetimerange"
           range-separator="到"
-          format="YYYY-MM-DD hh:mm"
-          value-format="YYYY-MM-DD hh:mm"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="申请开始时间"
           end-placeholder="申请结束时间"
         />
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index e37bc6a..83938f5 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -490,8 +490,8 @@
           v-model="timeRange"
           type="datetimerange"
           range-separator="到"
-          format="YYYY-MM-DD hh:mm"
-          value-format="YYYY-MM-DD hh:mm"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="申请开始时间"
           end-placeholder="申请结束时间"
         />
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 747971d..20b635c 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 
@@ -329,6 +328,16 @@
     ElMessage.warning('无可打印内容')
   }
 }
+
+const permUrl = {
+  edit: '/device/maintenance/check/list/add', // 提交
+  submit: '/device/maintenance/checkList/submit', // 提交
+  agree: '/device/maintenance/checkList/agree', // 同意
+  reject: '/device/maintenance/checkList/reject', // 驳回
+  refuse: '/device/maintenance/checkList/refuse', // 拒绝
+  cancel: '/device/maintenance/checkList/cancel', // 取消
+  delete: '/device/maintenance/checkList/delete', // 删除
+}
 </script>
 
 <template>
@@ -399,37 +408,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if="proxy.buttonPerm.agree.if(row, permUrl.agree)"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="proxy.buttonPerm.agree.disabled(row)"
                 @click="clickBtn(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if="proxy.buttonPerm.reject.if(row, permUrl.reject)"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="proxy.buttonPerm.reject.disabled(row)"
                 @click="clickBtn(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if="proxy.buttonPerm.refuse.if(row, permUrl.refuse)"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="proxy.buttonPerm.refuse.disabled(row)"
                 @click="clickBtn(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="proxy.buttonPerm.edit.if(row, permUrl.edit)"
                 size="small"
                 link
                 type="primary"
@@ -438,7 +447,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="proxy.buttonPerm.submit.if(row)"
                 size="small"
                 link
                 type="primary"
@@ -448,22 +457,22 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="proxy.buttonPerm.cancel.if(row, permUrl.cancel)"
                 size="small"
                 link
                 type="info"
-                :disabled="row.approvalStatusName !== '审批中'"
+                :disabled="proxy.buttonPerm.cancel.disabled(row)"
                 @click="clickBtn(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="proxy.buttonPerm.delete.if(row, permUrl.delete)"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                :disabled="proxy.buttonPerm.delete.disabled(row)"
                 @click="clickBtn(row, '删除')"
               >
                 删除

diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1ac692b..5d919c2 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -436,8 +436,8 @@
           v-model="timeRange"
           type="datetimerange"
           range-separator="到"
-          format="YYYY-MM-DD hh:mm"
-          value-format="YYYY-MM-DD hh:mm"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="申请开始时间"
           end-placeholder="申请结束时间"
         />
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index e37bc6a..83938f5 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -490,8 +490,8 @@
           v-model="timeRange"
           type="datetimerange"
           range-separator="到"
-          format="YYYY-MM-DD hh:mm"
-          value-format="YYYY-MM-DD hh:mm"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="申请开始时间"
           end-placeholder="申请结束时间"
         />
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 747971d..20b635c 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 
@@ -329,6 +328,16 @@
     ElMessage.warning('无可打印内容')
   }
 }
+
+const permUrl = {
+  edit: '/device/maintenance/check/list/add', // 提交
+  submit: '/device/maintenance/checkList/submit', // 提交
+  agree: '/device/maintenance/checkList/agree', // 同意
+  reject: '/device/maintenance/checkList/reject', // 驳回
+  refuse: '/device/maintenance/checkList/refuse', // 拒绝
+  cancel: '/device/maintenance/checkList/cancel', // 取消
+  delete: '/device/maintenance/checkList/delete', // 删除
+}
 </script>
 
 <template>
@@ -399,37 +408,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if="proxy.buttonPerm.agree.if(row, permUrl.agree)"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="proxy.buttonPerm.agree.disabled(row)"
                 @click="clickBtn(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if="proxy.buttonPerm.reject.if(row, permUrl.reject)"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="proxy.buttonPerm.reject.disabled(row)"
                 @click="clickBtn(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if="proxy.buttonPerm.refuse.if(row, permUrl.refuse)"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="proxy.buttonPerm.refuse.disabled(row)"
                 @click="clickBtn(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="proxy.buttonPerm.edit.if(row, permUrl.edit)"
                 size="small"
                 link
                 type="primary"
@@ -438,7 +447,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="proxy.buttonPerm.submit.if(row)"
                 size="small"
                 link
                 type="primary"
@@ -448,22 +457,22 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="proxy.buttonPerm.cancel.if(row, permUrl.cancel)"
                 size="small"
                 link
                 type="info"
-                :disabled="row.approvalStatusName !== '审批中'"
+                :disabled="proxy.buttonPerm.cancel.disabled(row)"
                 @click="clickBtn(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="proxy.buttonPerm.delete.if(row, permUrl.delete)"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                :disabled="proxy.buttonPerm.delete.disabled(row)"
                 @click="clickBtn(row, '删除')"
               >
                 删除
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index d92910f..fca820c 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -171,7 +171,7 @@
           :model="formInline"
           :label-width="120"
           label-position="right"
-          :rules="rules"
+          :rules="textMap[pageType] !== '详情' ? rules : {}"
         >
           <el-row :gutter="24">
             <el-col :span="6">
@@ -235,6 +235,7 @@
                   v-model="formInline.createUserName"
                   :placeholder="pageType === 'detail' ? '' : '请输入管理点负责人'"
                   :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
                 />
               </el-form-item>
             </el-col>

diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1ac692b..5d919c2 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -436,8 +436,8 @@
           v-model="timeRange"
           type="datetimerange"
           range-separator="到"
-          format="YYYY-MM-DD hh:mm"
-          value-format="YYYY-MM-DD hh:mm"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="申请开始时间"
           end-placeholder="申请结束时间"
         />
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index e37bc6a..83938f5 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -490,8 +490,8 @@
           v-model="timeRange"
           type="datetimerange"
           range-separator="到"
-          format="YYYY-MM-DD hh:mm"
-          value-format="YYYY-MM-DD hh:mm"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="申请开始时间"
           end-placeholder="申请结束时间"
         />
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 747971d..20b635c 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 
@@ -329,6 +328,16 @@
     ElMessage.warning('无可打印内容')
   }
 }
+
+const permUrl = {
+  edit: '/device/maintenance/check/list/add', // 提交
+  submit: '/device/maintenance/checkList/submit', // 提交
+  agree: '/device/maintenance/checkList/agree', // 同意
+  reject: '/device/maintenance/checkList/reject', // 驳回
+  refuse: '/device/maintenance/checkList/refuse', // 拒绝
+  cancel: '/device/maintenance/checkList/cancel', // 取消
+  delete: '/device/maintenance/checkList/delete', // 删除
+}
 </script>
 
 <template>
@@ -399,37 +408,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if="proxy.buttonPerm.agree.if(row, permUrl.agree)"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="proxy.buttonPerm.agree.disabled(row)"
                 @click="clickBtn(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if="proxy.buttonPerm.reject.if(row, permUrl.reject)"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="proxy.buttonPerm.reject.disabled(row)"
                 @click="clickBtn(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if="proxy.buttonPerm.refuse.if(row, permUrl.refuse)"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="proxy.buttonPerm.refuse.disabled(row)"
                 @click="clickBtn(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="proxy.buttonPerm.edit.if(row, permUrl.edit)"
                 size="small"
                 link
                 type="primary"
@@ -438,7 +447,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="proxy.buttonPerm.submit.if(row)"
                 size="small"
                 link
                 type="primary"
@@ -448,22 +457,22 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="proxy.buttonPerm.cancel.if(row, permUrl.cancel)"
                 size="small"
                 link
                 type="info"
-                :disabled="row.approvalStatusName !== '审批中'"
+                :disabled="proxy.buttonPerm.cancel.disabled(row)"
                 @click="clickBtn(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="proxy.buttonPerm.delete.if(row, permUrl.delete)"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                :disabled="proxy.buttonPerm.delete.disabled(row)"
                 @click="clickBtn(row, '删除')"
               >
                 删除
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index d92910f..fca820c 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -171,7 +171,7 @@
           :model="formInline"
           :label-width="120"
           label-position="right"
-          :rules="rules"
+          :rules="textMap[pageType] !== '详情' ? rules : {}"
         >
           <el-row :gutter="24">
             <el-col :span="6">
@@ -235,6 +235,7 @@
                   v-model="formInline.createUserName"
                   :placeholder="pageType === 'detail' ? '' : '请输入管理点负责人'"
                   :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
                 />
               </el-form-item>
             </el-col>
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index eec1035..1d17f4c 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -35,6 +35,7 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '取消', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
@@ -62,7 +63,7 @@
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('')
+const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
@@ -87,7 +88,7 @@
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusList[newValue] || '0'
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>

diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1ac692b..5d919c2 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -436,8 +436,8 @@
           v-model="timeRange"
           type="datetimerange"
           range-separator="到"
-          format="YYYY-MM-DD hh:mm"
-          value-format="YYYY-MM-DD hh:mm"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="申请开始时间"
           end-placeholder="申请结束时间"
         />
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index e37bc6a..83938f5 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -490,8 +490,8 @@
           v-model="timeRange"
           type="datetimerange"
           range-separator="到"
-          format="YYYY-MM-DD hh:mm"
-          value-format="YYYY-MM-DD hh:mm"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="申请开始时间"
           end-placeholder="申请结束时间"
         />
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 747971d..20b635c 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 
@@ -329,6 +328,16 @@
     ElMessage.warning('无可打印内容')
   }
 }
+
+const permUrl = {
+  edit: '/device/maintenance/check/list/add', // 提交
+  submit: '/device/maintenance/checkList/submit', // 提交
+  agree: '/device/maintenance/checkList/agree', // 同意
+  reject: '/device/maintenance/checkList/reject', // 驳回
+  refuse: '/device/maintenance/checkList/refuse', // 拒绝
+  cancel: '/device/maintenance/checkList/cancel', // 取消
+  delete: '/device/maintenance/checkList/delete', // 删除
+}
 </script>
 
 <template>
@@ -399,37 +408,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if="proxy.buttonPerm.agree.if(row, permUrl.agree)"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="proxy.buttonPerm.agree.disabled(row)"
                 @click="clickBtn(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if="proxy.buttonPerm.reject.if(row, permUrl.reject)"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="proxy.buttonPerm.reject.disabled(row)"
                 @click="clickBtn(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if="proxy.buttonPerm.refuse.if(row, permUrl.refuse)"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="proxy.buttonPerm.refuse.disabled(row)"
                 @click="clickBtn(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="proxy.buttonPerm.edit.if(row, permUrl.edit)"
                 size="small"
                 link
                 type="primary"
@@ -438,7 +447,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="proxy.buttonPerm.submit.if(row)"
                 size="small"
                 link
                 type="primary"
@@ -448,22 +457,22 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="proxy.buttonPerm.cancel.if(row, permUrl.cancel)"
                 size="small"
                 link
                 type="info"
-                :disabled="row.approvalStatusName !== '审批中'"
+                :disabled="proxy.buttonPerm.cancel.disabled(row)"
                 @click="clickBtn(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="proxy.buttonPerm.delete.if(row, permUrl.delete)"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                :disabled="proxy.buttonPerm.delete.disabled(row)"
                 @click="clickBtn(row, '删除')"
               >
                 删除
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index d92910f..fca820c 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -171,7 +171,7 @@
           :model="formInline"
           :label-width="120"
           label-position="right"
-          :rules="rules"
+          :rules="textMap[pageType] !== '详情' ? rules : {}"
         >
           <el-row :gutter="24">
             <el-col :span="6">
@@ -235,6 +235,7 @@
                   v-model="formInline.createUserName"
                   :placeholder="pageType === 'detail' ? '' : '请输入管理点负责人'"
                   :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
                 />
               </el-form-item>
             </el-col>
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index eec1035..1d17f4c 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -35,6 +35,7 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '取消', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
@@ -62,7 +63,7 @@
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('')
+const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
@@ -87,7 +88,7 @@
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusList[newValue] || '0'
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 092e3f2..9e49e4e 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -416,7 +416,8 @@
 const permUrl = {
   edit: '/standard/changeApply/edit', // 编辑
   agree: '/standard/changeApply/agree', // 同意
-  reject: '/standard/changeApply/reject', // 驳回 拒绝
+  reject: '/standard/changeApply/reject', // 驳回
+  refuse: '/standard/changeApply/refuse', // 拒绝
   cancel: '/standard/changeApply/cancel', // 取消
   delete: '/standard/changeApply/delete', // 删除
 }
@@ -514,7 +515,7 @@
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.refuse.if(row, permUrl.reject)"
+                v-if="proxy.buttonPerm.refuse.if(row, permUrl.refuse)"
                 size="small"
                 link
                 type="danger"

diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1ac692b..5d919c2 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -436,8 +436,8 @@
           v-model="timeRange"
           type="datetimerange"
           range-separator="到"
-          format="YYYY-MM-DD hh:mm"
-          value-format="YYYY-MM-DD hh:mm"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="申请开始时间"
           end-placeholder="申请结束时间"
         />
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index e37bc6a..83938f5 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -490,8 +490,8 @@
           v-model="timeRange"
           type="datetimerange"
           range-separator="到"
-          format="YYYY-MM-DD hh:mm"
-          value-format="YYYY-MM-DD hh:mm"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="申请开始时间"
           end-placeholder="申请结束时间"
         />
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 747971d..20b635c 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 
@@ -329,6 +328,16 @@
     ElMessage.warning('无可打印内容')
   }
 }
+
+const permUrl = {
+  edit: '/device/maintenance/check/list/add', // 提交
+  submit: '/device/maintenance/checkList/submit', // 提交
+  agree: '/device/maintenance/checkList/agree', // 同意
+  reject: '/device/maintenance/checkList/reject', // 驳回
+  refuse: '/device/maintenance/checkList/refuse', // 拒绝
+  cancel: '/device/maintenance/checkList/cancel', // 取消
+  delete: '/device/maintenance/checkList/delete', // 删除
+}
 </script>
 
 <template>
@@ -399,37 +408,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if="proxy.buttonPerm.agree.if(row, permUrl.agree)"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="proxy.buttonPerm.agree.disabled(row)"
                 @click="clickBtn(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if="proxy.buttonPerm.reject.if(row, permUrl.reject)"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="proxy.buttonPerm.reject.disabled(row)"
                 @click="clickBtn(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if="proxy.buttonPerm.refuse.if(row, permUrl.refuse)"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="proxy.buttonPerm.refuse.disabled(row)"
                 @click="clickBtn(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="proxy.buttonPerm.edit.if(row, permUrl.edit)"
                 size="small"
                 link
                 type="primary"
@@ -438,7 +447,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="proxy.buttonPerm.submit.if(row)"
                 size="small"
                 link
                 type="primary"
@@ -448,22 +457,22 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="proxy.buttonPerm.cancel.if(row, permUrl.cancel)"
                 size="small"
                 link
                 type="info"
-                :disabled="row.approvalStatusName !== '审批中'"
+                :disabled="proxy.buttonPerm.cancel.disabled(row)"
                 @click="clickBtn(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="proxy.buttonPerm.delete.if(row, permUrl.delete)"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                :disabled="proxy.buttonPerm.delete.disabled(row)"
                 @click="clickBtn(row, '删除')"
               >
                 删除
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index d92910f..fca820c 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -171,7 +171,7 @@
           :model="formInline"
           :label-width="120"
           label-position="right"
-          :rules="rules"
+          :rules="textMap[pageType] !== '详情' ? rules : {}"
         >
           <el-row :gutter="24">
             <el-col :span="6">
@@ -235,6 +235,7 @@
                   v-model="formInline.createUserName"
                   :placeholder="pageType === 'detail' ? '' : '请输入管理点负责人'"
                   :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
                 />
               </el-form-item>
             </el-col>
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index eec1035..1d17f4c 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -35,6 +35,7 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '取消', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
@@ -62,7 +63,7 @@
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('')
+const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
@@ -87,7 +88,7 @@
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusList[newValue] || '0'
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 092e3f2..9e49e4e 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -416,7 +416,8 @@
 const permUrl = {
   edit: '/standard/changeApply/edit', // 编辑
   agree: '/standard/changeApply/agree', // 同意
-  reject: '/standard/changeApply/reject', // 驳回 拒绝
+  reject: '/standard/changeApply/reject', // 驳回
+  refuse: '/standard/changeApply/refuse', // 拒绝
   cancel: '/standard/changeApply/cancel', // 取消
   delete: '/standard/changeApply/delete', // 删除
 }
@@ -514,7 +515,7 @@
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.refuse.if(row, permUrl.reject)"
+                v-if="proxy.buttonPerm.refuse.if(row, permUrl.refuse)"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index b21f663..7f48051 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -571,7 +571,7 @@
           getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
-              addId.value = res.data.id
+              addId.value = res.data
             }
           })
         })
@@ -592,7 +592,7 @@
           updateStandardEquipmentApply(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
-              addId.value = res.data.id
+              addId.value = res.data
             }
           })
         })

diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1ac692b..5d919c2 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -436,8 +436,8 @@
           v-model="timeRange"
           type="datetimerange"
           range-separator="到"
-          format="YYYY-MM-DD hh:mm"
-          value-format="YYYY-MM-DD hh:mm"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="申请开始时间"
           end-placeholder="申请结束时间"
         />
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index e37bc6a..83938f5 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -490,8 +490,8 @@
           v-model="timeRange"
           type="datetimerange"
           range-separator="到"
-          format="YYYY-MM-DD hh:mm"
-          value-format="YYYY-MM-DD hh:mm"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="申请开始时间"
           end-placeholder="申请结束时间"
         />
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 747971d..20b635c 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 
@@ -329,6 +328,16 @@
     ElMessage.warning('无可打印内容')
   }
 }
+
+const permUrl = {
+  edit: '/device/maintenance/check/list/add', // 提交
+  submit: '/device/maintenance/checkList/submit', // 提交
+  agree: '/device/maintenance/checkList/agree', // 同意
+  reject: '/device/maintenance/checkList/reject', // 驳回
+  refuse: '/device/maintenance/checkList/refuse', // 拒绝
+  cancel: '/device/maintenance/checkList/cancel', // 取消
+  delete: '/device/maintenance/checkList/delete', // 删除
+}
 </script>
 
 <template>
@@ -399,37 +408,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if="proxy.buttonPerm.agree.if(row, permUrl.agree)"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="proxy.buttonPerm.agree.disabled(row)"
                 @click="clickBtn(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if="proxy.buttonPerm.reject.if(row, permUrl.reject)"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="proxy.buttonPerm.reject.disabled(row)"
                 @click="clickBtn(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if="proxy.buttonPerm.refuse.if(row, permUrl.refuse)"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="proxy.buttonPerm.refuse.disabled(row)"
                 @click="clickBtn(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="proxy.buttonPerm.edit.if(row, permUrl.edit)"
                 size="small"
                 link
                 type="primary"
@@ -438,7 +447,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="proxy.buttonPerm.submit.if(row)"
                 size="small"
                 link
                 type="primary"
@@ -448,22 +457,22 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="proxy.buttonPerm.cancel.if(row, permUrl.cancel)"
                 size="small"
                 link
                 type="info"
-                :disabled="row.approvalStatusName !== '审批中'"
+                :disabled="proxy.buttonPerm.cancel.disabled(row)"
                 @click="clickBtn(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="proxy.buttonPerm.delete.if(row, permUrl.delete)"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                :disabled="proxy.buttonPerm.delete.disabled(row)"
                 @click="clickBtn(row, '删除')"
               >
                 删除
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index d92910f..fca820c 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -171,7 +171,7 @@
           :model="formInline"
           :label-width="120"
           label-position="right"
-          :rules="rules"
+          :rules="textMap[pageType] !== '详情' ? rules : {}"
         >
           <el-row :gutter="24">
             <el-col :span="6">
@@ -235,6 +235,7 @@
                   v-model="formInline.createUserName"
                   :placeholder="pageType === 'detail' ? '' : '请输入管理点负责人'"
                   :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
                 />
               </el-form-item>
             </el-col>
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index eec1035..1d17f4c 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -35,6 +35,7 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '取消', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
@@ -62,7 +63,7 @@
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('')
+const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
@@ -87,7 +88,7 @@
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusList[newValue] || '0'
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 092e3f2..9e49e4e 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -416,7 +416,8 @@
 const permUrl = {
   edit: '/standard/changeApply/edit', // 编辑
   agree: '/standard/changeApply/agree', // 同意
-  reject: '/standard/changeApply/reject', // 驳回 拒绝
+  reject: '/standard/changeApply/reject', // 驳回
+  refuse: '/standard/changeApply/refuse', // 拒绝
   cancel: '/standard/changeApply/cancel', // 取消
   delete: '/standard/changeApply/delete', // 删除
 }
@@ -514,7 +515,7 @@
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.refuse.if(row, permUrl.reject)"
+                v-if="proxy.buttonPerm.refuse.if(row, permUrl.refuse)"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index b21f663..7f48051 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -571,7 +571,7 @@
           getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
-              addId.value = res.data.id
+              addId.value = res.data
             }
           })
         })
@@ -592,7 +592,7 @@
           updateStandardEquipmentApply(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
-              addId.value = res.data.id
+              addId.value = res.data
             }
           })
         })
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index d94f5ae..4c7f5d5 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -431,7 +431,7 @@
   () => props.type,
   (newValue) => {
     if (newValue === '0') {
-      searchQuery.approvalStatus = ''
+      searchQuery.approvalStatus = '0'
     }
     else {
       searchQuery.approvalStatus = newValue

diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1ac692b..5d919c2 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -436,8 +436,8 @@
           v-model="timeRange"
           type="datetimerange"
           range-separator="到"
-          format="YYYY-MM-DD hh:mm"
-          value-format="YYYY-MM-DD hh:mm"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="申请开始时间"
           end-placeholder="申请结束时间"
         />
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index e37bc6a..83938f5 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -490,8 +490,8 @@
           v-model="timeRange"
           type="datetimerange"
           range-separator="到"
-          format="YYYY-MM-DD hh:mm"
-          value-format="YYYY-MM-DD hh:mm"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="申请开始时间"
           end-placeholder="申请结束时间"
         />
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 747971d..20b635c 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 
@@ -329,6 +328,16 @@
     ElMessage.warning('无可打印内容')
   }
 }
+
+const permUrl = {
+  edit: '/device/maintenance/check/list/add', // 提交
+  submit: '/device/maintenance/checkList/submit', // 提交
+  agree: '/device/maintenance/checkList/agree', // 同意
+  reject: '/device/maintenance/checkList/reject', // 驳回
+  refuse: '/device/maintenance/checkList/refuse', // 拒绝
+  cancel: '/device/maintenance/checkList/cancel', // 取消
+  delete: '/device/maintenance/checkList/delete', // 删除
+}
 </script>
 
 <template>
@@ -399,37 +408,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if="proxy.buttonPerm.agree.if(row, permUrl.agree)"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="proxy.buttonPerm.agree.disabled(row)"
                 @click="clickBtn(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if="proxy.buttonPerm.reject.if(row, permUrl.reject)"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="proxy.buttonPerm.reject.disabled(row)"
                 @click="clickBtn(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if="proxy.buttonPerm.refuse.if(row, permUrl.refuse)"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="proxy.buttonPerm.refuse.disabled(row)"
                 @click="clickBtn(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="proxy.buttonPerm.edit.if(row, permUrl.edit)"
                 size="small"
                 link
                 type="primary"
@@ -438,7 +447,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="proxy.buttonPerm.submit.if(row)"
                 size="small"
                 link
                 type="primary"
@@ -448,22 +457,22 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="proxy.buttonPerm.cancel.if(row, permUrl.cancel)"
                 size="small"
                 link
                 type="info"
-                :disabled="row.approvalStatusName !== '审批中'"
+                :disabled="proxy.buttonPerm.cancel.disabled(row)"
                 @click="clickBtn(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="proxy.buttonPerm.delete.if(row, permUrl.delete)"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                :disabled="proxy.buttonPerm.delete.disabled(row)"
                 @click="clickBtn(row, '删除')"
               >
                 删除
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index d92910f..fca820c 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -171,7 +171,7 @@
           :model="formInline"
           :label-width="120"
           label-position="right"
-          :rules="rules"
+          :rules="textMap[pageType] !== '详情' ? rules : {}"
         >
           <el-row :gutter="24">
             <el-col :span="6">
@@ -235,6 +235,7 @@
                   v-model="formInline.createUserName"
                   :placeholder="pageType === 'detail' ? '' : '请输入管理点负责人'"
                   :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
                 />
               </el-form-item>
             </el-col>
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index eec1035..1d17f4c 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -35,6 +35,7 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '取消', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
@@ -62,7 +63,7 @@
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('')
+const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
@@ -87,7 +88,7 @@
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusList[newValue] || '0'
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 092e3f2..9e49e4e 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -416,7 +416,8 @@
 const permUrl = {
   edit: '/standard/changeApply/edit', // 编辑
   agree: '/standard/changeApply/agree', // 同意
-  reject: '/standard/changeApply/reject', // 驳回 拒绝
+  reject: '/standard/changeApply/reject', // 驳回
+  refuse: '/standard/changeApply/refuse', // 拒绝
   cancel: '/standard/changeApply/cancel', // 取消
   delete: '/standard/changeApply/delete', // 删除
 }
@@ -514,7 +515,7 @@
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.refuse.if(row, permUrl.reject)"
+                v-if="proxy.buttonPerm.refuse.if(row, permUrl.refuse)"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index b21f663..7f48051 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -571,7 +571,7 @@
           getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
-              addId.value = res.data.id
+              addId.value = res.data
             }
           })
         })
@@ -592,7 +592,7 @@
           updateStandardEquipmentApply(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
-              addId.value = res.data.id
+              addId.value = res.data
             }
           })
         })
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index d94f5ae..4c7f5d5 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -431,7 +431,7 @@
   () => props.type,
   (newValue) => {
     if (newValue === '0') {
-      searchQuery.approvalStatus = ''
+      searchQuery.approvalStatus = '0'
     }
     else {
       searchQuery.approvalStatus = newValue
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index aa70557..35ab7ea 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -152,7 +152,12 @@
 }
 // 提交
 const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  // 日期判断 证书有效期大于发证日期
+  if ((baseInfo.value.certificateDate && new Date(baseInfo.value.certificateDate).getTime()) >= (baseInfo.value.validDate && new Date(baseInfo.value.validDate).getTime())) {
+    ElMessage.warning('证书有效期应该大于发证日期!')
+  }
   if (!formEl1 || !formEl2) { return }
+
   Promise.all([formEl1.validate(), formEl2.validate()]).then((res) => {
     ElMessageBox.confirm(
       '确认提交吗？',