diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts index f0135c9..e144ca7 100644 --- a/src/views/equipement/resume/error/error-interface.ts +++ b/src/views/equipement/resume/error/error-interface.ts @@ -32,6 +32,7 @@ approvalStatusName?: string // 审批状态类型 applyType?: string // 审批类型 + handleStatus?: string // 处置状态 } // 详情表单 diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts index f0135c9..e144ca7 100644 --- a/src/views/equipement/resume/error/error-interface.ts +++ b/src/views/equipement/resume/error/error-interface.ts @@ -32,6 +32,7 @@ approvalStatusName?: string // 审批状态类型 applyType?: string // 审批类型 + handleStatus?: string // 处置状态 } // 详情表单 diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue index 3f25467..98cd284 100644 --- a/src/views/equipement/resume/error/list.vue +++ b/src/views/equipement/resume/error/list.vue @@ -307,7 +307,7 @@ }) } // 审批删除--已取消、全部 - else if (type === '删除' && (row.approvalStatusName === '已取消' || active.value === '0')) { + else if (type === '删除' && (row.approvalStatusName === '已取消' || active.value === '0' || (active.value === '5' && row.handleStatus !== '异常处置申请通过'))) { approvalDelete({ id: row.id, taskId: row.taskId! }).then(() => { ElMessage.success(`已${type}`) fetchData() @@ -528,7 +528,7 @@ 取消 { ElMessage.success(`已${type}`) fetchData() @@ -528,7 +528,7 @@ 取消 >([]) // 表格数据 const checkoutList = ref([]) // 选中的内容 diff --git a/src/views/equipement/resume/error/error-interface.ts b/src/views/equipement/resume/error/error-interface.ts index f0135c9..e144ca7 100644 --- a/src/views/equipement/resume/error/error-interface.ts +++ b/src/views/equipement/resume/error/error-interface.ts @@ -32,6 +32,7 @@ approvalStatusName?: string // 审批状态类型 applyType?: string // 审批类型 + handleStatus?: string // 处置状态 } // 详情表单 diff --git a/src/views/equipement/resume/error/list.vue b/src/views/equipement/resume/error/list.vue index 3f25467..98cd284 100644 --- a/src/views/equipement/resume/error/list.vue +++ b/src/views/equipement/resume/error/list.vue @@ -307,7 +307,7 @@ }) } // 审批删除--已取消、全部 - else if (type === '删除' && (row.approvalStatusName === '已取消' || active.value === '0')) { + else if (type === '删除' && (row.approvalStatusName === '已取消' || active.value === '0' || (active.value === '5' && row.handleStatus !== '异常处置申请通过'))) { approvalDelete({ id: row.id, taskId: row.taskId! }).then(() => { ElMessage.success(`已${type}`) fetchData() @@ -528,7 +528,7 @@ 取消 >([]) // 表格数据 const checkoutList = ref([]) // 选中的内容 diff --git a/src/views/system/baseInfo/autograph/addDialog.vue b/src/views/system/baseInfo/autograph/addDialog.vue index 2cb3cb8..d51e6d9 100644 --- a/src/views/system/baseInfo/autograph/addDialog.vue +++ b/src/views/system/baseInfo/autograph/addDialog.vue @@ -260,7 +260,7 @@ - + {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}