diff --git a/src/pages/Container/SafetyEvalBusiness/CustomerManage/index.js b/src/pages/Container/SafetyEvalBusiness/CustomerManage/index.js index 2548ec2..673d9b9 100644 --- a/src/pages/Container/SafetyEvalBusiness/CustomerManage/index.js +++ b/src/pages/Container/SafetyEvalBusiness/CustomerManage/index.js @@ -125,9 +125,11 @@ const CustomerManage = (props) => { title: "确认删除", content: "确定要删除这个客户吗?", onOk: async () => { - await props.customerDelete({ data: record.id }); - message.success("删除成功"); - getData(); + const res = await props.customerDelete({ data: record.id }); + if (res?.success !== false) { + message.success("删除成功"); + getData(); + } }, }); }; diff --git a/src/pages/Container/SafetyEvalBusiness/EvalProject/Create/index.js b/src/pages/Container/SafetyEvalBusiness/EvalProject/Create/index.js index 7debfa8..591291e 100644 --- a/src/pages/Container/SafetyEvalBusiness/EvalProject/Create/index.js +++ b/src/pages/Container/SafetyEvalBusiness/EvalProject/Create/index.js @@ -105,13 +105,12 @@ const EvalProjectCreate = (props) => { }; if (isView) { params.id = projectId; - await props.evalProjectSave(params); - message.success("修改成功"); - } else { - await props.evalProjectSave(params); - message.success("创建成功"); } - props.history.goBack(); + const res = await props.evalProjectSave(params); + if (res?.success) { + message.success(isView ? "修改成功" : "创建成功"); + props.history.goBack(); + } }); }; diff --git a/src/pages/Container/SafetyEvalBusiness/EvalProject/List/index.js b/src/pages/Container/SafetyEvalBusiness/EvalProject/List/index.js index 079758d..84cf830 100644 --- a/src/pages/Container/SafetyEvalBusiness/EvalProject/List/index.js +++ b/src/pages/Container/SafetyEvalBusiness/EvalProject/List/index.js @@ -74,9 +74,11 @@ const EvalProject = (props) => { title: "确认删除", content: "确定要删除这个项目吗?", onOk: async () => { - await props.evalProjectDelete({ data: [record.id] }); - message.success("删除成功"); - getData(); + const res = await props.evalProjectDelete({ data: [record.id] }); + if (res?.success !== false) { + message.success("删除成功"); + getData(); + } }, }); }; @@ -107,7 +109,7 @@ const EvalProject = (props) => { width: 100, render: (phase) => { const color = phase === "延期" ? "error" : phase === "正常" ? "success" : undefined; - return {phase || "-"}; + return phase ? {phase} : ""; }, }, { diff --git a/src/pages/Container/SafetyEvalBusiness/ProjectDocLibrary/index.js b/src/pages/Container/SafetyEvalBusiness/ProjectDocLibrary/index.js index 8d0c17b..7e31ad5 100644 --- a/src/pages/Container/SafetyEvalBusiness/ProjectDocLibrary/index.js +++ b/src/pages/Container/SafetyEvalBusiness/ProjectDocLibrary/index.js @@ -90,7 +90,7 @@ const ProjectDocLibrary = (props) => { const handleUploadSubmit = async () => { const values = await uploadForm.validateFields(); - await props.evalProjectDocSave({ + const res = await props.evalProjectDocSave({ projectId: values.projectId, projectDocUrl: values.file.map((item) => ({ project_doc_url: item.url, @@ -98,9 +98,11 @@ const ProjectDocLibrary = (props) => { materialType: values.materialType, })), }); - message.success("上传成功"); - setUploadModalOpen(false); - getData(); + if (res?.success !== false) { + message.success("上传成功"); + setUploadModalOpen(false); + getData(); + } }; const columns = [