diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 5ec2e15..f6af07f 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -61,10 +61,10 @@
           nodeNumber: index,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
-          finishTime: i.finishTime, // 完成时间
-          duration: i.duration, // 用时
-          comment: i.comment.comment, // 审批意见
-          type: approvalLogTypeMap.value[i.comment.type], // 意见类别
+          finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
+          duration: i.approvalStatus === '发起人' ? '-' : i.duration, // 用时
+          comment: i.comment.comment ? i.comment.comment : '-', // 审批意见
+          type: i.comment.type ? approvalLogTypeMap.value[i.comment.type] : '-', // 意见类别
         })
       })
     })

diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 5ec2e15..f6af07f 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -61,10 +61,10 @@
           nodeNumber: index,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
-          finishTime: i.finishTime, // 完成时间
-          duration: i.duration, // 用时
-          comment: i.comment.comment, // 审批意见
-          type: approvalLogTypeMap.value[i.comment.type], // 意见类别
+          finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
+          duration: i.approvalStatus === '发起人' ? '-' : i.duration, // 用时
+          comment: i.comment.comment ? i.comment.comment : '-', // 审批意见
+          type: i.comment.type ? approvalLogTypeMap.value[i.comment.type] : '-', // 意见类别
         })
       })
     })
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index fcc1994..a765bf1 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -35,7 +35,7 @@
     requre: true,
   },
 })
-const emits = defineEmits(['submitSuccess', 'addSuccess', 'failUpdateSuccess', 'giveApprovalType'])
+const emits = defineEmits(['submitSuccess', 'addSuccess', 'failUpdateSuccess'])
 const user = useUserStore() // 用户信息
 const countryList = ref(countries) // 国家列表
 const infoId = ref('') // id
@@ -582,7 +582,6 @@
     technicalTargetList.value = res.data.technicalTargetList // 技术指标
     form.value = res.data.equipmentInfoApproval
     form.value.approvalType = `${res.data.equipmentInfoApproval.approvalType}` // 审批类型
-    emits('giveApprovalType', form.value.approvalType)
     form.value.purchaseDate = dayjs(res.data.equipmentInfoApproval.purchaseDate).format('YYYY-MM-DD') // 购进日期
     form.value.produceDate = dayjs(res.data.equipmentInfoApproval.produceDate).format('YYYY-MM-DD')
     form.value.usedYears = dayjs().diff(res.data.equipmentInfoApproval.purchaseDate, 'year') // 使用年限
@@ -628,7 +627,9 @@
 const handleSubmit = (processId: string, approvalType: string, changeFlag?: string) => {
   submit({ id: infoId.value!, formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, processId, approvalType, changeFlag }).then((res) => {
     ElMessage.success('已提交')
-    infoId.value = res.data.id // id
+    if (props.approvalStatusName === '全部' && changeFlag === '1') {
+      infoId.value = res.data.id // id
+    }
     emits('submitSuccess', form.value.equipmentNo, infoId.value)
     fetchInfo(false) // 获取详细信息
   })

diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 5ec2e15..f6af07f 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -61,10 +61,10 @@
           nodeNumber: index,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
-          finishTime: i.finishTime, // 完成时间
-          duration: i.duration, // 用时
-          comment: i.comment.comment, // 审批意见
-          type: approvalLogTypeMap.value[i.comment.type], // 意见类别
+          finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
+          duration: i.approvalStatus === '发起人' ? '-' : i.duration, // 用时
+          comment: i.comment.comment ? i.comment.comment : '-', // 审批意见
+          type: i.comment.type ? approvalLogTypeMap.value[i.comment.type] : '-', // 意见类别
         })
       })
     })
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index fcc1994..a765bf1 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -35,7 +35,7 @@
     requre: true,
   },
 })
-const emits = defineEmits(['submitSuccess', 'addSuccess', 'failUpdateSuccess', 'giveApprovalType'])
+const emits = defineEmits(['submitSuccess', 'addSuccess', 'failUpdateSuccess'])
 const user = useUserStore() // 用户信息
 const countryList = ref(countries) // 国家列表
 const infoId = ref('') // id
@@ -582,7 +582,6 @@
     technicalTargetList.value = res.data.technicalTargetList // 技术指标
     form.value = res.data.equipmentInfoApproval
     form.value.approvalType = `${res.data.equipmentInfoApproval.approvalType}` // 审批类型
-    emits('giveApprovalType', form.value.approvalType)
     form.value.purchaseDate = dayjs(res.data.equipmentInfoApproval.purchaseDate).format('YYYY-MM-DD') // 购进日期
     form.value.produceDate = dayjs(res.data.equipmentInfoApproval.produceDate).format('YYYY-MM-DD')
     form.value.usedYears = dayjs().diff(res.data.equipmentInfoApproval.purchaseDate, 'year') // 使用年限
@@ -628,7 +627,9 @@
 const handleSubmit = (processId: string, approvalType: string, changeFlag?: string) => {
   submit({ id: infoId.value!, formId: SCHEDULE.EQUIPMENT_BOOK_APPROVAL, processId, approvalType, changeFlag }).then((res) => {
     ElMessage.success('已提交')
-    infoId.value = res.data.id // id
+    if (props.approvalStatusName === '全部' && changeFlag === '1') {
+      infoId.value = res.data.id // id
+    }
     emits('submitSuccess', form.value.equipmentNo, infoId.value)
     fetchInfo(false) // 获取详细信息
   })
diff --git a/src/views/equipement/info/book/detail.vue b/src/views/equipement/info/book/detail.vue
index d4fde7c..ea3298e 100644
--- a/src/views/equipement/info/book/detail.vue
+++ b/src/views/equipement/info/book/detail.vue
@@ -1,8 +1,6 @@
 <!-- 设备台账管理详情页 -->
 <script name="EquipmentInfoBookDetail" lang="ts" setup>
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, FormInstance, FormRules, TabPaneName, TabsPaneContext, UploadProps, UploadUserFile, emitChangeFn } from 'element-plus'
-import type { IForm } from './book-interface'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import bookBasic from './components/basic.vue'
 import bookUseRecord from './components/useRecord.vue'
 import bookMaintenanceRecord from './components/maintenanceRecord.vue'
@@ -10,9 +8,9 @@
 import bookChangeRecord from './components/changeRecord.vue'
 import bookEquipmentHistory from './components/equipmentHistory.vue'
 import bookEquipmentFlowLog from './components/equipmentFlowLog.vue'
-import { fetchApproval } from '@/api/approval'
-import { cancelApproval, refuseApproval } from '@/api/equipment/info/book'
+import { approvalDelete, cancelApproval, refuseApproval } from '@/api/equipment/info/book'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+
 // 设备编号
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -27,6 +25,7 @@
 const approvalStatusName = ref('') // 审批状态名称
 const showRefuseEditButton = ref(true) // 是否展示未通过编辑按钮
 const equipmentNo = ref('')
+const showSubmitButton = ref(false) // 控制提交按钮是否显示
 // -------------------------------------标签--------------------------------------------------
 const radioMenus = ref([ // 标签内容
   { name: '基本信息', value: 'book-basic' },
@@ -48,68 +47,13 @@
     infoId.value = $route.params.id as string
   }
 }
-// ---------------------------------右上角按钮(操作表单)------------------------------------------
-// 点击关闭
-const close = () => {
-  $router.back()
-}
-// 点击rfid标签绑定
-const bind = () => {
-  ElMessage.info('敬请期待')
-}
-// 点击提交
-const handleSubmit = () => {
-  bookBasicRef.value.submitForm()
-}
-// 提交成功
-const submitSuccess = (equipmentNoParam: string, id: string) => {
-  pageType.value = 'detail' // 详情模式-不可编辑
-  infoId.value = id // id
-  equipmentNo.value = equipmentNoParam // 设备编号
-  showRefuseEditButton.value = false
-  console.log(infoId.value, equipmentNo.value, 'ppppp')
-}
-// 点击保存
-const saveForm = () => {
-  bookBasicRef.value.saveForm()
-}
-// 新建保存成功
-const addSuccess = (equipmentNoParam: string, id: string) => {
-  equipmentNo.value = equipmentNoParam// 设备编号
-  infoId.value = id // id
-  console.log(infoId.value, ' +++', equipmentNo.value)
-}
-
-// 点击编辑
-const handleEdit = () => {
-  pageType.value = 'edit' // 编辑模式
-}
-
-// 接收子组件传递的审批类型
-const giveApprovalType = () => {
-
-}
 
 // ---------------------------------------------审批--------------------------------------
 const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const processId = ref('') // 流程实例id
 const approvalDialog = ref() // 审批组件ref
-const approvalRecordData = ref([]) // 审批流程数据
 const showApprovalButton = ref(true) // 是否展示审批按钮
 
-// 查询审批记录
-function getApprovalRecord(processId: string) {
-  if (pageType.value !== 'add') {
-    if (processId) {
-      fetchApproval(processId).then((res) => {
-        approvalRecordData.value = res.data
-      })
-    }
-    else {
-      ElMessage.warning('流程实例id为空')
-    }
-  }
-}
 // 审批结束回调
 const approvalSuccess = () => {
   showApprovalButton.value = false
@@ -164,7 +108,64 @@
     showApprovalButton.value = false
   })
 }
+// ---------------------------------右上角按钮(操作表单)------------------------------------------
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+// 点击rfid标签绑定
+const bind = () => {
+  ElMessage.info('敬请期待')
+}
+// 点击提交
+const handleSubmit = () => {
+  bookBasicRef.value.submitForm()
+}
+// 提交成功
+const submitSuccess = (equipmentNoParam: string, id: string) => {
+  pageType.value = 'detail' // 详情模式-不可编辑
+  infoId.value = id // id
+  equipmentNo.value = equipmentNoParam // 设备编号
+  showRefuseEditButton.value = false // 异常提交按钮
+}
+// 点击保存
+const saveForm = () => {
+  bookBasicRef.value.saveForm()
+}
+// 新建保存成功
+const addSuccess = (equipmentNoParam: string, id: string) => {
+  equipmentNo.value = equipmentNoParam// 设备编号
+  infoId.value = id // id
+  showSubmitButton.value = true // 保存成功显示提交按钮
+}
+
+// 点击编辑
+const handleEdit = () => {
+  pageType.value = 'edit' // 编辑模式
+}
+
+// 点击删除
+const del = () => {
+  approvalDelete({ id: infoId.value, taskId: taskId.value }).then(() => {
+    ElMessage.success('已删除')
+    close()
+  })
+}
+
 // -----------------------------------------钩子--------------------------------------------------
+watch(() => approvalStatusName.value, (val) => {
+  if (val === '全部' || val === '草稿箱' || pageType.value === 'add') { // 全部草稿箱把审批详情删了
+    if (radioMenus.value[radioMenus.value.length - 1].value === 'book-approval-record') {
+      radioMenus.value.pop()
+    }
+    console.log(radioMenus.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioMenus.value[radioMenus.value.length - 1].value !== 'book-approval-record') {
+      radioMenus.value.push({ name: '审批详情', value: 'book-approval-record' })
+    }
+  }
+})
 onMounted(() => {
   approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
   equipmentNo.value = $route.query.equipmentNo as string // 设备编号
@@ -190,7 +191,7 @@
         <el-button v-if="pageType === 'detail' && approvalStatusName === '审批中' && showApprovalButton" type="info" @click="handleApprove('取消')">
           取消
         </el-button>
-        <el-button v-if="pageType === 'add' || pageType === 'edit' && approvalStatusName !== '未通过' && approvalStatusName !== '已取消'" type="primary" @click="handleSubmit">
+        <el-button v-if="showSubmitButton && (pageType === 'add' || (pageType === 'edit' && approvalStatusName !== '未通过' && approvalStatusName !== '已取消'))" type="primary" @click="handleSubmit">
           提交
         </el-button>
         <el-button v-if="approvalStatusName !== '已审批' && pageType === 'detail' && approvalStatusName === '未通过' && showRefuseEditButton" type="primary" @click="handleEdit">
@@ -202,12 +203,20 @@
         <el-button v-if="pageType !== 'detail'" type="primary" @click="bind">
           rfid标签绑定
         </el-button>
+        <el-button v-if="approvalStatusName === '已取消'" type="danger" @click="del">
+          删除
+        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
       <el-radio-group v-model="current">
-        <el-radio-button v-for="item in radioMenus" :key="item.value" :disabled="!infoId" :label="item.value">
+        <el-radio-button
+          v-for="item in radioMenus"
+          :key="item.value"
+          :label="item.value"
+          :disabled="!infoId"
+        >
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>
@@ -223,7 +232,6 @@
       :approval-status-name="approvalStatusName"
       @submit-success="submitSuccess"
       @add-success="addSuccess"
-      @give-approval-type="giveApprovalType"
     />
     <!-- 使用记录 -->
     <book-use-record v-if="current === 'book-use-record'" :page-type="pageType" />