From 9893d5ed2cab23e4b80b4e3302265653f37c7a42 Mon Sep 17 00:00:00 2001 From: LiuJiaNan <15703339975@163.com> Date: Wed, 15 Apr 2026 16:40:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DvalidatorEndTime=E5=92=8Cvali?= =?UTF-8?q?datorTimeGECurrentDay=E6=96=B9=E6=B3=95=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- .../Container/BranchCompany/Qualification/Apply/Add/index.js | 4 ++-- .../Container/Local/Qualification/Review/Review/index.js | 4 ++-- .../ProjectReview/ProjectFilingApplication/Add/index.js | 4 ++-- .../ProjectReview/ProjectFilingApplicationTwo/Add/index.js | 5 ++--- .../Supervision/Qualification/Review/Review/index.js | 3 ++- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index af9ce30..741d645 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "lodash-es": "^4.17.21", "react": "^18.2.0", "react-dom": "^18.2.0", - "zy-react-library": "^1.2.14" + "zy-react-library": "^1.2.35" }, "devDependencies": { "@antfu/eslint-config": "^5.4.1", diff --git a/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js b/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js index 9fe3c74..21b87a6 100644 --- a/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js +++ b/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js @@ -16,7 +16,7 @@ import useDeleteFile from "zy-react-library/hooks/useDeleteFile"; import useGetFile from "zy-react-library/hooks/useGetFile"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useUploadFile from "zy-react-library/hooks/useUploadFile"; -import { getLabelName, validatorEndTime, validatorTimeGTCurrentDay } from "zy-react-library/utils"; +import { getLabelName, validatorEndTime, validatorTimeGECurrentDay } from "zy-react-library/utils"; import { NS_QUALIFICATION_APPLY, NS_QUALIFICATION_MAINTENANCE } from "~/enumerate/namespace"; function Add(props) { @@ -547,7 +547,7 @@ const FileUpload = (props) => { name: "qualificationsTermEnd", label: "有效期结束时间", render: FORM_ITEM_RENDER_ENUM.DATETIME, - rules: [validatorEndTime(qualificationsTermStart), validatorTimeGTCurrentDay()], + rules: [validatorEndTime({ startTime: qualificationsTermStart }), validatorTimeGECurrentDay({ type: "datetime" })], hidden: !(props.data.isValidity === 0), }, ]} diff --git a/src/pages/Container/Local/Qualification/Review/Review/index.js b/src/pages/Container/Local/Qualification/Review/Review/index.js index 7bdfaae..9b0ecea 100644 --- a/src/pages/Container/Local/Qualification/Review/Review/index.js +++ b/src/pages/Container/Local/Qualification/Review/Review/index.js @@ -91,7 +91,7 @@ const RejectModalComponent = (props) => { const PassModalComponent = (props) => { const [form] = Form.useForm(); - // const managerDept = Form.useWatch("managerDept", form); + const periodTermStart = Form.useWatch("periodTermStart", form); const onSubmit = async (values) => { const { success } = await props["qualificationReviewSubmit"]({ ...values, id: props.id, qualificationsAuditId: props.qualificationsAuditId, status: "400" }); @@ -140,7 +140,7 @@ const PassModalComponent = (props) => { render: FORM_ITEM_RENDER_ENUM.DATE, dependencies: ["isLongTerm"], hidden: formValues => !(formValues.isLongTerm === 0), - rules: [validatorEndTime(form.getFieldValue("periodTermStart"))], + rules: [validatorEndTime({ startTime: periodTermStart })], }, ]} /> diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js index 147acf8..c155bb7 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js @@ -359,7 +359,7 @@ const StepOneComponent = (props) => { name: "endProjectTime", label: "计划竣工时间", render: FORM_ITEM_RENDER_ENUM.DATE, - rules: [validatorEndTime(startProjectTime)], + rules: [validatorEndTime({ startTime: startProjectTime })], }, // { // name: "chooseForm", @@ -1290,7 +1290,7 @@ const FileUpload = (props) => { name: "endValidityPeriod", label: "有效期结束时间", render: FORM_ITEM_RENDER_ENUM.DATE, - rules: [validatorEndTime(startValidityPeriod)], + rules: [validatorEndTime({ startTime: startValidityPeriod })], }, { name: "files", diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwo/Add/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwo/Add/index.js index 6f8fce2..80c1af7 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwo/Add/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwo/Add/index.js @@ -7,7 +7,6 @@ import AddIcon from "zy-react-library/components/Icon/AddIcon"; import DepartmentLeftTree from "zy-react-library/components/LeftTree/Department/Gwj"; import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; -import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; import Table from "zy-react-library/components/Table"; @@ -297,7 +296,7 @@ const StepOneComponent = (props) => { { name: "userName", label: "项目负责人", onlyForLabel: true }, { name: "initiationTime", label: "立项时间", render: FORM_ITEM_RENDER_ENUM.DATE }, { name: "startProjectTime", label: "计划开始时间", render: FORM_ITEM_RENDER_ENUM.DATE }, - { name: "endProjectTime", label: "计划竣工时间", render: FORM_ITEM_RENDER_ENUM.DATE, rules: [validatorEndTime(startProjectTime)] }, + { name: "endProjectTime", label: "计划竣工时间", render: FORM_ITEM_RENDER_ENUM.DATE, rules: [validatorEndTime({ startTime: startProjectTime })] }, // { name: "chooseForm", label: "项目选取形式", render: form.setFieldValue("chooseFormName", label)} /> }, // { name: "chooseFormName", label: "项目选取形式名称", onlyForLabel: true }, { name: "fourNewFlag", label: "是否涉及四新工作内容", labelCol: { span: 8 }, render: FORM_ITEM_RENDER_ENUM.RADIO, items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }] }, @@ -971,7 +970,7 @@ const FileUpload = (props) => { name: "endValidityPeriod", label: "有效期结束时间", render: FORM_ITEM_RENDER_ENUM.DATE, - rules: [validatorEndTime(startValidityPeriod)], + rules: [validatorEndTime({ startTime: startValidityPeriod })], }, { name: "files", diff --git a/src/pages/Container/Supervision/Qualification/Review/Review/index.js b/src/pages/Container/Supervision/Qualification/Review/Review/index.js index df5269a..de3f1c6 100644 --- a/src/pages/Container/Supervision/Qualification/Review/Review/index.js +++ b/src/pages/Container/Supervision/Qualification/Review/Review/index.js @@ -100,6 +100,7 @@ const RejectModalComponent = (props) => { const PassModalComponent = (props) => { const [form] = Form.useForm(); + const periodTermStart = Form.useWatch("periodTermStart", form); const onSubmit = async (values) => { const { success } = await props["qualificationReviewSubmit"]({ ...values, id: props.id, qualificationsAuditId: props.qualificationsAuditId, status: "400" }); if (success) { @@ -147,7 +148,7 @@ const PassModalComponent = (props) => { render: FORM_ITEM_RENDER_ENUM.DATE, dependencies: ["isLongTerm"], hidden: formValues => !(formValues.isLongTerm === 0), - rules: [validatorEndTime(form.getFieldValue("periodTermStart"))], + rules: [validatorEndTime({ startTime: periodTermStart })], }, ]} />