From 8884607c596a6de7de8cd3b8cf472039bdb43b05 Mon Sep 17 00:00:00 2001 From: LiuJiaNan <15703339975@163.com> Date: Wed, 19 Nov 2025 16:22:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- .../Average/Acceptance/Review/index.js | 8 ++++--- .../Average/Confirm/Review/index.js | 18 +++++++++------ .../Average/ConfirmUser/index.js | 20 ++++++++++------- .../BranchCompany/Average/Ledger/Add/index.js | 8 ++++--- .../Average/Ledger/List/index.js | 8 ++++--- .../BranchCompany/Average/Part/index.js | 22 +++++++++++-------- .../Average/Postponement/Review/index.js | 18 +++++++++------ .../Average/Rectification/List/index.js | 20 ++++++++++------- .../Average/Rectification/Review/index.js | 8 ++++--- .../Average/SpecialDisposal/Review/index.js | 8 ++++--- 11 files changed, 85 insertions(+), 55 deletions(-) diff --git a/package.json b/package.json index 285edc1..41f41ad 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-to-print": "^3.2.0", - "zy-react-library": "^1.0.99" + "zy-react-library": "^1.0.116" }, "devDependencies": { "@antfu/eslint-config": "^5.4.1", diff --git a/src/pages/Container/BranchCompany/Average/Acceptance/Review/index.js b/src/pages/Container/BranchCompany/Average/Acceptance/Review/index.js index cc95b72..4fb9a7e 100644 --- a/src/pages/Container/BranchCompany/Average/Acceptance/Review/index.js +++ b/src/pages/Container/BranchCompany/Average/Acceptance/Review/index.js @@ -17,13 +17,15 @@ function Rectification(props) { const { loading: uploadFileLoading, uploadFile } = useUploadFile(); const onSubmit = async (values) => { await uploadFile({ single: false, files: values.files, params: { type: UPLOAD_FILE_TYPE_ENUM["5"], foreignKey: query.hiddenId } }); - await props["acceptanceReview"]({ + const { success } = await props["acceptanceReview"]({ id: query.id, hiddenId: query.hiddenId, ...values, }); - message.success("操作成功"); - props.history.goBack(); + if (success) { + message.success("操作成功"); + props.history.goBack(); + } }; return (
diff --git a/src/pages/Container/BranchCompany/Average/Confirm/Review/index.js b/src/pages/Container/BranchCompany/Average/Confirm/Review/index.js index b8abf14..2403ca2 100644 --- a/src/pages/Container/BranchCompany/Average/Confirm/Review/index.js +++ b/src/pages/Container/BranchCompany/Average/Confirm/Review/index.js @@ -23,15 +23,17 @@ function Confirm(props) { title: "提示", content: "是否确认隐患？", onOk: async () => { - await props["confirmSubmit"]({ + const { success } = await props["confirmSubmit"]({ status: "1", rectificationType: data.rectificationType, ...values, id: data.id, hiddenId: data.hiddenId, }); - message.success("确认成功"); - props.history.goBack(); + if (success) { + message.success("确认成功"); + props.history.goBack(); + } }, }); }; @@ -217,16 +219,18 @@ function Confirm(props) { const RejectModalComponent = (props) => { const [form] = Form.useForm(); const onSubmit = async (values) => { - await props["confirmSubmit"]({ + const { success } = await props["confirmSubmit"]({ status: "0", ...values, id: props.data.id, hiddenId: props.data.hiddenId, rectificationType: props.data.rectificationType, }); - message.success("打回成功"); - props.onCancel(); - window.history.back(); + if (success) { + message.success("打回成功"); + props.onCancel(); + window.history.back(); + } }; return ( diff --git a/src/pages/Container/BranchCompany/Average/ConfirmUser/index.js b/src/pages/Container/BranchCompany/Average/ConfirmUser/index.js index 08f4fe2..25ca703 100644 --- a/src/pages/Container/BranchCompany/Average/ConfirmUser/index.js +++ b/src/pages/Container/BranchCompany/Average/ConfirmUser/index.js @@ -26,9 +26,11 @@ function HiddenConfirmUser(props) { title: "删除确认", content: "确定要删除吗？", onOk: async () => { - await props["confirmUserDelete"]({ id }); - message.success("删除成功"); - getData(); + const { success } = await props["confirmUserDelete"]({ id }); + if (success) { + message.success("删除成功"); + getData(); + } }, }); }; @@ -84,11 +86,13 @@ const AddModalComponent = (props) => { const [form] = Form.useForm(); const deptId = Form.useWatch("deptId", form); const onSubmit = async (values) => { - await props["confirmUserAdd"]({ ...values }); - message.success("操作成功"); - props.onCancel(); - form.resetFields(); - props.getData(); + const { success } = await props["confirmUserAdd"]({ ...values }); + if (success) { + message.success("操作成功"); + props.onCancel(); + form.resetFields(); + props.getData(); + } }; return ( diff --git a/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js b/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js index 2cd18d3..45463bf 100644 --- a/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js +++ b/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js @@ -115,14 +115,16 @@ function Add(props) { if (hiddenPartType === "input") { await props["partAdd"]({ hiddenregion: values.hiddenPart }); } - await props[!query.id ? "hiddenAdd" : "hiddenEdit"]({ + const { success } = await props[!query.id ? "hiddenAdd" : "hiddenEdit"]({ ...values, id: query.id, hiddenId: id, source: "1", }); - message.success("操作成功"); - props.history.goBack(); + if (success) { + message.success("操作成功"); + props.history.goBack(); + } }; const getAIHiddenImageRecognize = async () => { const hiddenImageFiles = form.getFieldValue("hiddenImageFiles"); diff --git a/src/pages/Container/BranchCompany/Average/Ledger/List/index.js b/src/pages/Container/BranchCompany/Average/Ledger/List/index.js index 2a38e1e..1016efc 100644 --- a/src/pages/Container/BranchCompany/Average/Ledger/List/index.js +++ b/src/pages/Container/BranchCompany/Average/Ledger/List/index.js @@ -41,9 +41,11 @@ function List(props) { title: "删除确认", content: "确定要删除吗？", onOk: async () => { - await props["hiddenDelete"]({ id }); - message.success("删除成功"); - getData(); + const { success } = await props["hiddenDelete"]({ id }); + if (success) { + message.success("删除成功"); + getData(); + } }, }); }; diff --git a/src/pages/Container/BranchCompany/Average/Part/index.js b/src/pages/Container/BranchCompany/Average/Part/index.js index 2a2a643..712d90d 100644 --- a/src/pages/Container/BranchCompany/Average/Part/index.js +++ b/src/pages/Container/BranchCompany/Average/Part/index.js @@ -37,10 +37,12 @@ function Part(props) { title: "删除确认", content: "确定要删除吗？", onOk: async () => { - await props["partDelete"]({ id }); - message.success("删除成功"); - getData(); - getTreeData(); + const { success } = await props["partDelete"]({ id }); + if (success) { + message.success("删除成功"); + getData(); + getTreeData(); + } }, }); }; @@ -186,11 +188,13 @@ const AddModalComponent = (props) => { props.id && getData(); }, [props.id]); const onSubmit = async (values) => { - await props[!props.id ? "partAdd" : "partEdit"]({ ...values, parentId: props.parentId, id: props.id }); - message.success("操作成功"); - props.onCancel(); - props.getData(); - props.getTreeData(); + const { success } = await props[!props.id ? "partAdd" : "partEdit"]({ ...values, parentId: props.parentId, id: props.id }); + if (success) { + message.success("操作成功"); + props.onCancel(); + props.getData(); + props.getTreeData(); + } }; return ( diff --git a/src/pages/Container/BranchCompany/Average/Postponement/Review/index.js b/src/pages/Container/BranchCompany/Average/Postponement/Review/index.js index a71de46..034d448 100644 --- a/src/pages/Container/BranchCompany/Average/Postponement/Review/index.js +++ b/src/pages/Container/BranchCompany/Average/Postponement/Review/index.js @@ -16,13 +16,15 @@ function Review(props) { title: "提示", content: "是否确认通过延期？", onOk: async () => { - await props["postponementReview"]({ + const { success } = await props["postponementReview"]({ id: query.id, hiddenId: query.hiddenId, state: 3, }); - message.success("操作成功"); - props.history.goBack(); + if (success) { + message.success("操作成功"); + props.history.goBack(); + } }, }); }; @@ -45,15 +47,17 @@ function Review(props) { const RejectModalComponent = (props) => { const [form] = Form.useForm(); const onSubmit = async (values) => { - await props["postponementReview"]({ + const { success } = await props["postponementReview"]({ state: "4", ...values, id: props.data.id, hiddenId: props.data.hiddenId, }); - message.success("打回成功"); - props.onCancel(); - window.history.back(); + if (success) { + message.success("打回成功"); + props.onCancel(); + window.history.back(); + } }; return ( diff --git a/src/pages/Container/BranchCompany/Average/Rectification/List/index.js b/src/pages/Container/BranchCompany/Average/Rectification/List/index.js index 7b6049b..99cab74 100644 --- a/src/pages/Container/BranchCompany/Average/Rectification/List/index.js +++ b/src/pages/Container/BranchCompany/Average/Rectification/List/index.js @@ -166,10 +166,12 @@ function List(props) { const TemporarySafetyMeasuresModalComponent = (props) => { const [form] = Form.useForm(); const onSubmit = async (values) => { - await props["rectificationAddTemporarySafetyMeasures"]({ id: props.id, ...values }); - message.success("操作成功"); - props.onCancel(); - props.getData(); + const { success } = await props["rectificationAddTemporarySafetyMeasures"]({ id: props.id, ...values }); + if (success) { + message.success("操作成功"); + props.onCancel(); + props.getData(); + } }; return ( @@ -200,10 +202,12 @@ const RequestAnExtensionModalComponent = (props) => { const { loading: uploadFileLoading, uploadFile } = useUploadFile(); const onSubmit = async (values) => { const { filePath } = await uploadFile({ files: values.files, params: { type: UPLOAD_FILE_TYPE_ENUM["138"] } }); - await props["rectificationRequestAnExtension"]({ hiddenId: props.id, ...values, disposalFile: filePath }); - message.success("操作成功"); - props.onCancel(); - props.getData(); + const { success } = await props["rectificationRequestAnExtension"]({ hiddenId: props.id, ...values, disposalFile: filePath }); + if (success) { + message.success("操作成功"); + props.onCancel(); + props.getData(); + } }; return ( diff --git a/src/pages/Container/BranchCompany/Average/Rectification/Review/index.js b/src/pages/Container/BranchCompany/Average/Rectification/Review/index.js index cff9d23..f019b72 100644 --- a/src/pages/Container/BranchCompany/Average/Rectification/Review/index.js +++ b/src/pages/Container/BranchCompany/Average/Rectification/Review/index.js @@ -25,13 +25,15 @@ function Rectification(props) { const onSubmit = async (values) => { await uploadFile({ single: false, files: values.afterRectificationImageFiles, params: { type: UPLOAD_FILE_TYPE_ENUM["4"], foreignKey: query.hiddenId } }); await uploadFile({ single: false, files: values.rectificationPlanImageFiles, params: { type: UPLOAD_FILE_TYPE_ENUM["8"], foreignKey: query.hiddenId } }); - await props["rectificationSave"]({ + const { success } = await props["rectificationSave"]({ id: query.id, hiddenId: query.hiddenId, ...values, }); - message.success("操作成功"); - props.history.goBack(); + if (success) { + message.success("操作成功"); + props.history.goBack(); + } }; const range = (start, end) => { const result = []; diff --git a/src/pages/Container/BranchCompany/Average/SpecialDisposal/Review/index.js b/src/pages/Container/BranchCompany/Average/SpecialDisposal/Review/index.js index 414e0c9..7e2f97a 100644 --- a/src/pages/Container/BranchCompany/Average/SpecialDisposal/Review/index.js +++ b/src/pages/Container/BranchCompany/Average/SpecialDisposal/Review/index.js @@ -19,14 +19,16 @@ function Review(props) { const { loading: uploadFileLoading, uploadFile } = useUploadFile(); const onSubmit = async (values) => { const { filePath } = await uploadFile({ files: values.files, params: { type: UPLOAD_FILE_TYPE_ENUM["138"] } }); - await props["specialDisposalReview"]({ + const { success } = await props["specialDisposalReview"]({ ...values, id: query.id, hiddenId: query.hiddenId, disposalFile: filePath, }); - message.success("操作成功"); - props.history.goBack(); + if (success) { + message.success("操作成功"); + props.history.goBack(); + } }; return (