Pārlūkot izejas kodu

feat提示文案修改

xiaweibo 3 mēneši atpakaļ
vecāks
revīzija
1589e737fd
32 mainītis faili ar 95 papildinājumiem un 95 dzēšanām
  1. 1 1
      src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanManagement/components/areaCheckPlanManagementDetail.vue
  2. 1 1
      src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanManagementDept/components/areaCheckPlanManagementDeptDetail.vue
  3. 1 1
      src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanManagementDept/components/areaCheckPlanRecordDetailDept.vue
  4. 1 1
      src/views/production-safety/hiddenTroubleInvestigationAndGovernance/checkTemplateManagement/checkTemplateManagement.vue
  5. 3 3
      src/views/production-safety/hiddenTroubleInvestigationAndGovernance/checkTemplateManagement/components/checkTemplateManagementDetail.vue
  6. 4 4
      src/views/production-safety/hiddenTroubleInvestigationAndGovernance/employeeReportHiddenTroubleManagement/components/employeeReportHiddenTroubleManagementDetail.vue
  7. 2 2
      src/views/production-safety/hiddenTroubleInvestigationAndGovernance/employeeReportHiddenTroubleManagement/employeeReportHiddenTroubleManagement.vue
  8. 8 8
      src/views/production-safety/hiddenTroubleInvestigationAndGovernance/hiddenTroubleAccountManagement/components/hiddenTroubleAccountManagementDetail.vue
  9. 5 5
      src/views/production-safety/hiddenTroubleInvestigationAndGovernance/hiddenTroubleAccountManagement/hiddenTroubleAccountManagement.vue
  10. 2 2
      src/views/production-safety/hiddenTroubleInvestigationAndGovernance/hiddenTroubleCategoryManagement/components/hiddenTroubleCategoryManagementDetail.vue
  11. 2 2
      src/views/production-safety/hiddenTroubleInvestigationAndGovernance/hiddenTroubleCategoryManagement/hiddenTroubleCategoryManagement.vue
  12. 2 2
      src/views/production-safety/hiddenTroubleInvestigationAndGovernance/hiddenTroubleReviewManagement/components/hiddenTroubleReviewManagementDetail.vue
  13. 2 2
      src/views/production-safety/hiddenTroubleInvestigationAndGovernance/hiddenTroubleReviewManagement/hiddenTroubleReviewManagement.vue
  14. 3 3
      src/views/production-safety/hiddenTroubleInvestigationAndGovernance/oneByOneManagement/components/OneByOneAuditDetail.vue
  15. 4 4
      src/views/production-safety/hiddenTroubleInvestigationAndGovernance/oneByOneManagement/components/oneByOneManagementDetail.vue
  16. 4 4
      src/views/production-safety/hiddenTroubleInvestigationAndGovernance/oneByOneManagement/oneByOneManagement.vue
  17. 3 3
      src/views/production-safety/hiddenTroubleInvestigationAndGovernance/oneByOneManagementDept/components/oneByOneManagementDeptDetail.vue
  18. 1 1
      src/views/production-safety/hiddenTroubleInvestigationAndGovernance/oneByOneManagementDept/oneByOneManagementDept.vue
  19. 3 3
      src/views/production-safety/safetyAssessment/evaluationDepartment/components/EvaluationDepartmentAdvancedPerson.vue
  20. 4 4
      src/views/production-safety/safetyAssessment/evaluationDepartment/components/EvaluationDepartmentFeedback.vue
  21. 6 6
      src/views/production-safety/safetyAssessment/evaluationSystem/components/EvaluationSystemAdvancedPerson.vue
  22. 4 4
      src/views/production-safety/safetyAssessment/evaluationSystem/components/EvaluationSystemDetail.vue
  23. 6 6
      src/views/production-safety/safetyAssessment/evaluationSystem/components/EvaluationSystemFeedback.vue
  24. 2 2
      src/views/production-safety/safetyAssessment/evaluationSystem/components/EvaluationTarget.vue
  25. 3 3
      src/views/production-safety/safetyAssessment/evaluationSystem/evaluationSystem.vue
  26. 2 2
      src/views/production-safety/safetyAssessment/inventory/components/InventoryDetail.vue
  27. 2 2
      src/views/production-safety/safetyAssessment/inventory/inventory.vue
  28. 2 2
      src/views/production-safety/safetyAssessment/pointDeduction/components/PointDeductionDetail.vue
  29. 2 2
      src/views/production-safety/safetyAssessment/pointDeduction/pointDeduction.vue
  30. 5 5
      src/views/production-safety/safetyAssessment/receiptRecord/components/ReceiptRecordDetail.vue
  31. 3 3
      src/views/production-safety/safetyAssessment/receiptRecord/receiptRecord.vue
  32. 2 2
      src/views/production-safety/safetyAssessment/receiptRecord/receiptRecordAdministratorReview.vue

+ 1 - 1
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanManagement/components/areaCheckPlanManagementDetail.vue

@@ -879,7 +879,7 @@
       await loadRecordList();
     } catch (e) {
       console.error('下入账失败:', e);
-      ElMessage.error('下入账失败,请稍后重试');
+      ElMessage.error(e?.message || e?.data || '下入账失败,请稍后重试');
     } finally {
       sandConfirmLoading.value = false;
     }

+ 1 - 1
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanManagementDept/components/areaCheckPlanManagementDeptDetail.vue

@@ -659,7 +659,7 @@
       await loadRecordList();
     } catch (e) {
       console.error('部门端下入账失败:', e);
-      ElMessage.error('下入账失败,请稍后重试');
+      ElMessage.error(e?.message || e?.data || '下入账失败,请稍后重试');
     } finally {
       sandConfirmLoadingDept.value = false;
     }

+ 1 - 1
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanManagementDept/components/areaCheckPlanRecordDetailDept.vue

@@ -193,7 +193,7 @@
       router.back();
     } catch (e) {
       console.error('新增检查日志提交失败:', e);
-      ElMessage.error('提交失败,请稍后重试');
+      ElMessage.error(e?.message || e?.data || '提交失败,请稍后重试');
     }
   };
 

+ 1 - 1
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/checkTemplateManagement/checkTemplateManagement.vue

@@ -214,7 +214,7 @@
       getTableData();
     } catch (e) {
       console.error('删除检查单模版失败:', e);
-      ElMessage.error('删除失败,请重试');
+      ElMessage.error(e?.message || e?.data || '删除失败,请重试');
     }
   };
 

+ 3 - 3
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/checkTemplateManagement/components/checkTemplateManagementDetail.vue

@@ -229,7 +229,7 @@
       ElMessage.success('导入成功');
       await getDetail();
     } catch (e: any) {
-      ElMessage.error(e?.message || '导入失败');
+      ElMessage.error(e?.message || e?.data || '导入失败');
     }
   };
 
@@ -262,7 +262,7 @@
       if (checkItems.value.length === 0) checkItems.value = [createEmptyCheckItem()];
     } catch (e: any) {
       console.error('获取检查单模版详情失败:', e);
-      ElMessage.error(e?.message || '获取详情失败,请重试');
+      ElMessage.error(e?.message || e?.data || '获取详情失败,请重试');
     }
   };
 
@@ -321,7 +321,7 @@
       router.back();
     } catch (e: any) {
       console.error('保存检查单模版失败:', e);
-      ElMessage.error(e?.message || '保存失败,请重试');
+      ElMessage.error(e?.message || e?.data || '保存失败,请重试');
     }
   };
 

+ 4 - 4
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/employeeReportHiddenTroubleManagement/components/employeeReportHiddenTroubleManagementDetail.vue

@@ -164,7 +164,7 @@
       ruleFormData.attachment = JSON.stringify(jsonArr);
     } catch (e) {
       console.error('附件上传失败:', e);
-      ElMessage.error('附件上传失败,请重试');
+      ElMessage.error(e?.message || e?.data || '附件上传失败,请重试');
     }
   }
 
@@ -201,7 +201,7 @@
       cloneRuleFormData();
     } catch (e) {
       console.error('获取隐患上报详情失败:', e);
-      ElMessage.error('获取详情失败');
+      ElMessage.error(e?.message || e?.data || '获取详情失败');
     }
   };
 
@@ -243,7 +243,7 @@
       router.back();
     } catch (e) {
       console.error('审核失败:', e);
-      ElMessage.error('审核失败,请重试');
+      ElMessage.error(e?.message || e?.data || '审核失败,请重试');
     }
   };
 
@@ -278,7 +278,7 @@
       router.back();
     } catch (e) {
       console.error('提交失败:', e);
-      ElMessage.error('提交失败,请重试');
+      ElMessage.error(e?.message || e?.data || '提交失败,请重试');
     }
   };
 

+ 2 - 2
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/employeeReportHiddenTroubleManagement/employeeReportHiddenTroubleManagement.vue

@@ -250,7 +250,7 @@
       }
     } catch (e) {
       console.error('导出隐患上报失败:', e);
-      ElMessage.error('导出失败,请重试');
+      ElMessage.error(e?.message || e?.data || '导出失败,请重试');
     }
   };
 
@@ -311,7 +311,7 @@
       getTableData();
     } catch (e) {
       console.error('入账失败:', e);
-      ElMessage.error('入账失败,请重试');
+      ElMessage.error(e?.message || e?.data || '入账失败,请重试');
     }
   };
 

+ 8 - 8
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/hiddenTroubleAccountManagement/components/hiddenTroubleAccountManagementDetail.vue

@@ -303,7 +303,7 @@
       ruleFormData.attachments = (list || []).map((r) => r.fileUrl).filter(Boolean).join(',');
     } catch (e) {
       console.error('附件上传失败:', e);
-      ElMessage.error('附件上传失败,请重试');
+      ElMessage.error(e?.message || e?.data || '附件上传失败,请重试');
     }
   }
 
@@ -410,7 +410,7 @@
       cloneRuleFormData();
     } catch (e) {
       console.error('获取隐患详情失败:', e);
-      ElMessage.error('获取详情失败');
+      ElMessage.error(e?.message || e?.data || '获取详情失败');
     }
   };
 
@@ -451,7 +451,7 @@
       router.back();
     } catch (e) {
       console.error('保存隐患台账失败:', e);
-      ElMessage.error('保存失败,请重试');
+      ElMessage.error(e?.message || e?.data || '保存失败,请重试');
     }
   };
 
@@ -474,7 +474,7 @@
       router.back();
     } catch (e) {
       console.error('整改提交失败:', e);
-      ElMessage.error('整改提交失败,请重试');
+      ElMessage.error(e?.message || e?.data || '整改提交失败,请重试');
     }
   }
 
@@ -524,7 +524,7 @@
       getDetail();
     } catch (e) {
       console.error('复查提交失败:', e);
-      ElMessage.error('复查提交失败,请重试');
+      ElMessage.error(e?.message || e?.data || '复查提交失败,请重试');
     }
   }
 
@@ -549,7 +549,7 @@
       router.back();
     } catch (e) {
       console.error('审查通过提交失败:', e);
-      ElMessage.error('提交失败,请重试');
+      ElMessage.error(e?.message || e?.data || '提交失败,请重试');
     }
   }
 
@@ -571,7 +571,7 @@
       router.back();
     } catch (e) {
       console.error('审查不通过提交失败:', e);
-      ElMessage.error('提交失败,请重试');
+      ElMessage.error(e?.message || e?.data || '提交失败,请重试');
     }
   }
 
@@ -620,7 +620,7 @@
       showDeductDialog.value = false;
     } catch (e) {
       console.error('扣分失败:', e);
-      ElMessage.error('扣分失败,请重试');
+      ElMessage.error(e?.message || e?.data || '扣分失败,请重试');
     }
   }
 

+ 5 - 5
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/hiddenTroubleAccountManagement/hiddenTroubleAccountManagement.vue

@@ -354,7 +354,7 @@
       }
     } catch (e) {
       console.error('导出隐患台账失败:', e);
-      ElMessage.error('导出失败,请重试');
+      ElMessage.error(e?.message || e?.data || '导出失败,请重试');
     }
   };
 
@@ -387,7 +387,7 @@
       getTableData();
     } catch (e) {
       console.error('删除隐患台账失败:', e);
-      ElMessage.error('删除失败,请重试');
+      ElMessage.error(e?.message || e?.data || '删除失败,请重试');
     }
   };
 
@@ -426,7 +426,7 @@
       issueUserList.value = (userRes as any)?.records ?? [];
     } catch (e) {
       console.error('获取部门/用户列表失败:', e);
-      ElMessage.error('加载部门或负责人列表失败');
+      ElMessage.error(e?.message || e?.data || '加载部门或负责人列表失败');
       issueDeptTree.value = [];
       issueUserList.value = [];
     }
@@ -483,7 +483,7 @@
       getTableData();
     } catch (e) {
       console.error('下发失败:', e);
-      ElMessage.error('下发失败,请重试');
+      ElMessage.error(e?.message || e?.data || '下发失败,请重试');
     }
   };
 
@@ -568,7 +568,7 @@
       getTableData();
     } catch (e) {
       console.error('扣分失败:', e);
-      ElMessage.error('扣分失败,请重试');
+      ElMessage.error(e?.message || e?.data || '扣分失败,请重试');
     }
   };
 

+ 2 - 2
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/hiddenTroubleCategoryManagement/components/hiddenTroubleCategoryManagementDetail.vue

@@ -86,7 +86,7 @@
       cloneRuleFormData();
     } catch (e) {
       console.error('获取隐患类别详情失败:', e);
-      ElMessage.error('获取详情失败');
+      ElMessage.error(e?.message || e?.data || '获取详情失败');
     }
   };
 
@@ -114,7 +114,7 @@
       router.back();
     } catch (e) {
       console.error('保存隐患类别失败:', e);
-      ElMessage.error('保存失败,请重试');
+      ElMessage.error(e?.message || e?.data || '保存失败,请重试');
     }
   };
 

+ 2 - 2
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/hiddenTroubleCategoryManagement/hiddenTroubleCategoryManagement.vue

@@ -230,7 +230,7 @@
       }
     } catch (e) {
       console.error('导出隐患类别失败:', e);
-      ElMessage.error('导出失败,请重试');
+      ElMessage.error(e?.message || e?.data || '导出失败,请重试');
     }
   };
 
@@ -260,7 +260,7 @@
       getTableData();
     } catch (e) {
       console.error('删除隐患类别失败:', e);
-      ElMessage.error('删除失败,请重试');
+      ElMessage.error(e?.message || e?.data || '删除失败,请重试');
     }
   };
 

+ 2 - 2
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/hiddenTroubleReviewManagement/components/hiddenTroubleReviewManagementDetail.vue

@@ -176,7 +176,7 @@
       cloneRuleFormData();
     } catch (e) {
       console.error('获取院级文件详情失败:', e);
-      ElMessage.error('获取详情失败');
+      ElMessage.error(e?.message || e?.data || '获取详情失败');
     }
   };
 
@@ -210,7 +210,7 @@
       router.back();
     } catch (e) {
       console.error('保存院级文件失败:', e);
-      ElMessage.error('保存失败,请重试');
+      ElMessage.error(e?.message || e?.data || '保存失败,请重试');
     }
   };
 

+ 2 - 2
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/hiddenTroubleReviewManagement/hiddenTroubleReviewManagement.vue

@@ -235,7 +235,7 @@
       }
     } catch (e) {
       console.error('导出隐患上报失败:', e);
-      ElMessage.error('导出失败,请重试');
+      ElMessage.error(e?.message || e?.data || '导出失败,请重试');
     }
   };
 
@@ -275,7 +275,7 @@
       getTableData();
     } catch (e) {
       console.error('入账失败:', e);
-      ElMessage.error('入账失败,请重试');
+      ElMessage.error(e?.message || e?.data || '入账失败,请重试');
     }
   };
 

+ 3 - 3
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/oneByOneManagement/components/OneByOneAuditDetail.vue

@@ -224,7 +224,7 @@
       }
     } catch (e) {
       console.error('获取举一反三详情失败:', e);
-      ElMessage.error('获取详情失败');
+      ElMessage.error(e?.message || e?.data || '获取详情失败');
     }
   };
 
@@ -256,7 +256,7 @@
       router.back();
     } catch (e) {
       console.error('审核不通过失败:', e);
-      ElMessage.error('操作失败,请重试');
+      ElMessage.error(e?.message || e?.data || '操作失败,请重试');
     } finally {
       submitting.value = false;
     }
@@ -275,7 +275,7 @@
       router.back();
     } catch (e) {
       console.error('审核通过失败:', e);
-      ElMessage.error('操作失败,请重试');
+      ElMessage.error(e?.message || e?.data || '操作失败,请重试');
     } finally {
       submitting.value = false;
     }

+ 4 - 4
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/oneByOneManagement/components/oneByOneManagementDetail.vue

@@ -273,7 +273,7 @@
       cloneRuleFormData();
     } catch (e) {
       console.error('获取举一反三详情失败:', e);
-      ElMessage.error('获取详情失败');
+      ElMessage.error(e?.message || e?.data || '获取详情失败');
     }
   };
 
@@ -303,7 +303,7 @@
       router.back();
     } catch (e) {
       console.error('保存举一反三失败:', e);
-      ElMessage.error('保存失败,请重试');
+      ElMessage.error(e?.message || e?.data || '保存失败,请重试');
     }
   };
 
@@ -359,7 +359,7 @@
       getDetail();
     } catch (e) {
       console.error('下发失败:', e);
-      ElMessage.error('下发失败,请重试');
+      ElMessage.error(e?.message || e?.data || '下发失败,请重试');
     }
   }
 
@@ -394,7 +394,7 @@
       getDetail();
     } catch (e) {
       console.error('审核失败:', e);
-      ElMessage.error('审核失败,请重试');
+      ElMessage.error(e?.message || e?.data || '审核失败,请重试');
     }
   }
 

+ 4 - 4
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/oneByOneManagement/oneByOneManagement.vue

@@ -312,7 +312,7 @@
       ElMessage.success('导出逻辑待实现');
     } catch (e) {
       console.error('导出举一反三失败:', e);
-      ElMessage.error('导出失败,请重试');
+      ElMessage.error(e?.message || e?.data || '导出失败,请重试');
     }
   };
 
@@ -342,7 +342,7 @@
       getTableData();
     } catch (e) {
       console.error('删除举一反三记录失败:', e);
-      ElMessage.error('删除失败,请重试');
+      ElMessage.error(e?.message || e?.data || '删除失败,请重试');
     }
   };
 
@@ -463,7 +463,7 @@
       getTableData();
     } catch (e) {
       console.error('下发失败:', e);
-      ElMessage.error('下发失败,请重试');
+      ElMessage.error(e?.message || e?.data || '下发失败,请重试');
     }
   }
 
@@ -475,7 +475,7 @@
       getTableData();
     } catch (e) {
       console.error('作废失败:', e);
-      ElMessage.error('作废失败,请重试');
+      ElMessage.error(e?.message || e?.data || '作废失败,请重试');
     }
   };
 

+ 3 - 3
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/oneByOneManagementDept/components/oneByOneManagementDeptDetail.vue

@@ -328,7 +328,7 @@
       getDetail();
     } catch (e) {
       console.error('反馈提交失败:', e);
-      ElMessage.error('反馈提交失败,请重试');
+      ElMessage.error(e?.message || e?.data || '反馈提交失败,请重试');
     }
   }
 
@@ -342,7 +342,7 @@
       }
     } catch (e) {
       console.error('获取举一反三详情失败:', e);
-      ElMessage.error('获取详情失败');
+      ElMessage.error(e?.message || e?.data || '获取详情失败');
     }
   };
 
@@ -405,7 +405,7 @@
       });
     } catch (e) {
       console.error('反馈提交失败:', e);
-      ElMessage.error('反馈提交失败,请重试');
+      ElMessage.error(e?.message || e?.data || '反馈提交失败,请重试');
     }
   }
 

+ 1 - 1
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/oneByOneManagementDept/oneByOneManagementDept.vue

@@ -208,7 +208,7 @@
       ElMessage.success('导出逻辑待实现');
     } catch (e) {
       console.error('导出举一反三失败:', e);
-      ElMessage.error('导出失败,请重试');
+      ElMessage.error(e?.message || e?.data || '导出失败,请重试');
     }
   };
 

+ 3 - 3
src/views/production-safety/safetyAssessment/evaluationDepartment/components/EvaluationDepartmentAdvancedPerson.vue

@@ -591,7 +591,7 @@
       getTableData();
     } catch (e) {
       console.error('保存失败:', e);
-      ElMessage.error(isEditMode.value ? '更新失败' : '保存失败');
+      ElMessage.error(e?.message || e?.data || (isEditMode.value ? '更新失败' : '保存失败'));
     }
   };
 
@@ -619,7 +619,7 @@
       normalForm.remark = detail.remark || '';
     } catch (e) {
       console.error('获取详情失败:', e);
-      ElMessage.error('获取详情失败');
+      ElMessage.error(e?.message || e?.data || '获取详情失败');
     }
   };
 
@@ -643,7 +643,7 @@
       // 用户取消删除或删除失败
       if (e !== 'cancel') {
         console.error('删除失败:', e);
-        ElMessage.error('删除失败');
+        ElMessage.error(e?.message || e?.data || '删除失败');
       }
     }
   };

+ 4 - 4
src/views/production-safety/safetyAssessment/evaluationDepartment/components/EvaluationDepartmentFeedback.vue

@@ -218,7 +218,7 @@
       await getDetail();
     } catch (e: any) {
       console.error('导入失败:', e);
-      ElMessage.error(e?.message || '导入失败,请重试');
+      ElMessage.error(e?.message || e?.data || '导入失败,请重试');
     } finally {
       // 清空文件选择
       if (target) {
@@ -242,7 +242,7 @@
       ElMessage.success('导出成功');
     } catch (e: any) {
       console.error('导出失败:', e);
-      ElMessage.error(e?.message || '导出失败,请重试');
+      ElMessage.error(e?.message || e?.data || '导出失败,请重试');
     }
   };
 
@@ -320,7 +320,7 @@
       }
     } catch (e) {
       console.error('获取部门考核详情失败:', e);
-      ElMessage.error('获取详情失败,请重试');
+      ElMessage.error(e?.message || e?.data || '获取详情失败,请重试');
     }
   };
 
@@ -410,7 +410,7 @@
       router.back();
     } catch (e: any) {
       console.error('提交失败:', e);
-      ElMessage.error(e?.message || '提交失败,请重试');
+      ElMessage.error(e?.message || e?.data || '提交失败,请重试');
     }
   };
 

+ 6 - 6
src/views/production-safety/safetyAssessment/evaluationSystem/components/EvaluationSystemAdvancedPerson.vue

@@ -624,15 +624,15 @@
         };
 
         // 新增模式:调用保存接口
-        await saveSecurityExamineAdvUserAdmin(createPayload);
+       return await saveSecurityExamineAdvUserAdmin(createPayload);
       }
       ElMessage.success('保存成功');
       handleDialogClose();
       getTableData();
     } catch (e) {
-      console.error('保存失败:', e);
-      ElMessage.error('保存失败');
-    }
+        console.error('保存失败:', e);
+        ElMessage.error(e?.message || e?.data || '保存失败');
+      }
   };
 
   const handleEdit = async (row: any) => {
@@ -660,7 +660,7 @@
       normalForm.remark = detail.remark || '';
     } catch (e) {
       console.error('获取详情失败:', e);
-      ElMessage.error('获取详情失败');
+      ElMessage.error(e?.message || e?.data || '获取详情失败');
     }
   };
 
@@ -684,7 +684,7 @@
       // 用户取消删除或删除失败
       if (e !== 'cancel') {
         console.error('删除失败:', e);
-        ElMessage.error('删除失败');
+        ElMessage.error(e?.message || e?.data || '删除失败');
       }
     }
   };

+ 4 - 4
src/views/production-safety/safetyAssessment/evaluationSystem/components/EvaluationSystemDetail.vue

@@ -301,7 +301,7 @@
       }
     } catch (e) {
       console.error('导入处理失败:', e);
-      ElMessage.error('导入处理失败');
+      ElMessage.error(e?.message || e?.data || '导入处理失败');
     }
   };
 
@@ -345,7 +345,7 @@
       }
     } catch (e: any) {
       console.error('导入失败:', e);
-      ElMessage.error(e?.message || '导入失败,请重试');
+      ElMessage.error(e?.message || e?.data || '导入失败,请重试');
     }
   };
 
@@ -654,7 +654,7 @@
       }
     } catch (e: any) {
       console.error('获取详情失败:', e);
-      ElMessage.error(e?.message || '获取详情失败,请重试');
+      ElMessage.error(e?.message || e?.data || '获取详情失败,请重试');
     }
   };
 
@@ -780,7 +780,7 @@
       router.back();
     } catch (e: any) {
       console.error('保存失败:', e);
-      ElMessage.error(e?.message || '保存失败,请重试');
+      ElMessage.error(e?.message || e?.data || '保存失败,请重试');
     }
   };
 

+ 6 - 6
src/views/production-safety/safetyAssessment/evaluationSystem/components/EvaluationSystemFeedback.vue

@@ -337,7 +337,7 @@
       await getDetail();
     } catch (e: any) {
       console.error('导入失败:', e);
-      ElMessage.error(e?.message || '导入失败,请重试');
+      ElMessage.error(e?.message || e?.data || '导入失败,请重试');
     } finally {
       // 清空文件选择
       if (target) {
@@ -361,7 +361,7 @@
       ElMessage.success('导出成功');
     } catch (e: any) {
       console.error('导出失败:', e);
-      ElMessage.error(e?.message || '导出失败,请重试');
+      ElMessage.error(e?.message || e?.data || '导出失败,请重试');
     }
   };
 
@@ -496,7 +496,7 @@
       }
     } catch (e) {
       console.error('获取考核对象详情失败:', e);
-      ElMessage.error('获取详情失败,请重试');
+      ElMessage.error(e?.message || e?.data || '获取详情失败,请重试');
     }
   };
 
@@ -584,7 +584,7 @@
       router.back();
     } catch (e: any) {
       console.error('提交失败:', e);
-      ElMessage.error(e?.message || '提交失败,请重试');
+      ElMessage.error(e?.message || e?.data || '提交失败,请重试');
     }
   };
   const handleSubmitItem = async () => {
@@ -656,7 +656,7 @@
       router.back();
     } catch (e: any) {
       console.error('提交失败:', e);
-      ElMessage.error(e?.message || '提交失败,请重试');
+      ElMessage.error(e?.message || e?.data || '提交失败,请重试');
     }
   };
 
@@ -688,7 +688,7 @@
       router.back();
     } catch (e: any) {
       console.error('操作失败:', e);
-      ElMessage.error(e?.message || '操作失败,请重试');
+      ElMessage.error(e?.message || e?.data || '操作失败,请重试');
     }
   };
 

+ 2 - 2
src/views/production-safety/safetyAssessment/evaluationSystem/components/EvaluationTarget.vue

@@ -589,7 +589,7 @@
       getTableData();
     } catch (e: any) {
       console.error('删除失败:', e);
-      ElMessage.error(e?.message || '删除失败,请重试');
+      ElMessage.error(e?.message || e?.data || '删除失败,请重试');
     }
   };
 
@@ -600,7 +600,7 @@
       getTableData();
     } catch (e: any) {
       console.error('作废失败:', e);
-      ElMessage.error(e?.message || '作废失败,请重试');
+      ElMessage.error(e?.message || e?.data || '作废失败,请重试');
     }
   };
 

+ 3 - 3
src/views/production-safety/safetyAssessment/evaluationSystem/evaluationSystem.vue

@@ -484,7 +484,7 @@
       getTableData();
     } catch (e: any) {
       console.error('删除失败:', e);
-      ElMessage.error(e?.message || '删除失败,请重试');
+      ElMessage.error(e?.message || e?.data || '删除失败,请重试');
     }
   };
 
@@ -546,7 +546,7 @@
       getTableData();
     } catch (e) {
       console.error('下发失败:', e);
-      ElMessage.error(e?.data || '下发失败,请重试');
+      ElMessage.error(e?.message || e?.data || '下发失败,请重试');
     }
   };
 
@@ -558,7 +558,7 @@
       getTableData();
     } catch (e: any) {
       console.error('作废失败:', e);
-      ElMessage.error(e?.message || '作废失败,请重试');
+      ElMessage.error(e?.message || e?.data || '作废失败,请重试');
     }
   };
 

+ 2 - 2
src/views/production-safety/safetyAssessment/inventory/components/InventoryDetail.vue

@@ -85,7 +85,7 @@
       cloneRuleFormData();
     } catch (e) {
       console.error('获取物品库存详情失败:', e);
-      ElMessage.error('获取详情失败');
+      ElMessage.error(e?.message || e?.data || '获取详情失败');
     }
   };
 
@@ -117,7 +117,7 @@
       router.back();
     } catch (e) {
       console.error('保存物品库存失败:', e);
-      ElMessage.error('保存失败,请重试');
+      ElMessage.error(e?.message || e?.data || '保存失败,请重试');
     }
   };
 

+ 2 - 2
src/views/production-safety/safetyAssessment/inventory/inventory.vue

@@ -207,7 +207,7 @@
       }
     } catch (e) {
       console.error('导出物品库存失败:', e);
-      ElMessage.error('导出失败,请重试');
+      ElMessage.error(e?.message || e?.data || '导出失败,请重试');
     }
   };
 
@@ -237,7 +237,7 @@
       getTableData();
     } catch (e) {
       console.error('删除物品库存失败:', e);
-      ElMessage.error('删除失败,请重试');
+      ElMessage.error(e?.message || e?.data || '删除失败,请重试');
     }
   };
 

+ 2 - 2
src/views/production-safety/safetyAssessment/pointDeduction/components/PointDeductionDetail.vue

@@ -153,7 +153,7 @@
       cloneRuleFormData();
     } catch (e) {
       console.error('获取月度扣分详情失败:', e);
-      ElMessage.error('获取详情失败');
+      ElMessage.error(e?.message || e?.data || '获取详情失败');
     }
   };
 
@@ -186,7 +186,7 @@
       router.back();
     } catch (e) {
       console.error('保存月度扣分失败:', e);
-      ElMessage.error('保存失败,请重试');
+      ElMessage.error(e?.message || e?.data || '保存失败,请重试');
     }
   };
 

+ 2 - 2
src/views/production-safety/safetyAssessment/pointDeduction/pointDeduction.vue

@@ -208,7 +208,7 @@
       }
     } catch (e) {
       console.error('导出月度扣分失败:', e);
-      ElMessage.error('导出失败,请重试');
+      ElMessage.error(e?.message || e?.data || '导出失败,请重试');
     }
   };
 
@@ -238,7 +238,7 @@
       getTableData();
     } catch (e) {
       console.error('删除月度扣分失败:', e);
-      ElMessage.error('删除失败,请重试');
+      ElMessage.error(e?.message || e?.data || '删除失败,请重试');
     }
   };
 

+ 5 - 5
src/views/production-safety/safetyAssessment/receiptRecord/components/ReceiptRecordDetail.vue

@@ -378,7 +378,7 @@
       cloneRuleFormData();
     } catch (e) {
       console.error('获取物品领取记录详情失败:', e);
-      ElMessage.error('获取详情失败');
+      ElMessage.error(e?.message || e?.data || '获取详情失败');
     }
   };
 
@@ -440,7 +440,7 @@
       }
     } catch (e) {
       console.error('保存物品领取记录失败:', e);
-      ElMessage.error('保存失败,请重试');
+      ElMessage.error(e?.message || e?.data || '保存失败,请重试');
     }
   };
 
@@ -476,7 +476,7 @@
         router.back();
       } catch (e) {
         console.error('提交审批失败:', e);
-        ElMessage.error('提交审批失败,请重试');
+        ElMessage.error(e?.message || e?.data || '提交审批失败,请重试');
       }
     });
   };
@@ -489,7 +489,7 @@
       router.back();
     } catch (e) {
       console.error('审核失败:', e);
-      ElMessage.error('审核失败,请重试');
+      ElMessage.error(e?.message || e?.data || '审核失败,请重试');
     }
   };
 
@@ -501,7 +501,7 @@
       router.back();
     } catch (e) {
       console.error('审核失败:', e);
-      ElMessage.error('审核失败,请重试');
+      ElMessage.error(e?.message || e?.data || '审核失败,请重试');
     }
   };
 

+ 3 - 3
src/views/production-safety/safetyAssessment/receiptRecord/receiptRecord.vue

@@ -263,7 +263,7 @@
       }
     } catch (e) {
       console.error('导出物品领取记录失败:', e);
-      ElMessage.error('导出失败,请重试');
+      ElMessage.error(e?.message || e?.data || '导出失败,请重试');
     }
   };
 
@@ -293,7 +293,7 @@
       getTableData();
     } catch (e) {
       console.error('删除物品领取记录失败:', e);
-      ElMessage.error('删除失败,请重试');
+      ElMessage.error(e?.message || e?.data || '删除失败,请重试');
     }
   };
 
@@ -304,7 +304,7 @@
       getTableData();
     } catch (e) {
       console.error('确认领取失败:', e);
-      ElMessage.error('确认领取失败,请重试');
+      ElMessage.error(e?.message || e?.data || '确认领取失败,请重试');
     }
   };
 

+ 2 - 2
src/views/production-safety/safetyAssessment/receiptRecord/receiptRecordAdministratorReview.vue

@@ -271,7 +271,7 @@
       }
     } catch (e) {
       console.error('导出物品领取记录失败:', e);
-      ElMessage.error('导出失败,请重试');
+      ElMessage.error(e?.message || e?.data || '导出失败,请重试');
     }
   };
 
@@ -292,7 +292,7 @@
       getTableData();
     } catch (e) {
       console.error('删除物品领取记录失败:', e);
-      ElMessage.error('删除失败,请重试');
+      ElMessage.error(e?.message || e?.data || '删除失败,请重试');
     }
   };