zcloud_gbs
/
zcloud_gbs_qualifications-react
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复validatorEndTime和validatorTimeGECurrentDay方法实现错误

master
LiuJiaNan 2026-04-15 16:40:44 +08:00
parent 1a0f66b1d3
commit 9893d5ed2c
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -30,7 +30,7 @@
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"zy-react-library": "^1.2.14" "zy-react-library": "^1.2.35"
}, },
"devDependencies": { "devDependencies": {
"@antfu/eslint-config": "^5.4.1", "@antfu/eslint-config": "^5.4.1",

4
src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js
View File

@ -16,7 +16,7 @@ import useDeleteFile from "zy-react-library/hooks/useDeleteFile";
import useGetFile from "zy-react-library/hooks/useGetFile"; import useGetFile from "zy-react-library/hooks/useGetFile";
import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
import useUploadFile from "zy-react-library/hooks/useUploadFile"; 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"; import { NS_QUALIFICATION_APPLY, NS_QUALIFICATION_MAINTENANCE } from "~/enumerate/namespace";
function Add(props) { function Add(props) {
@ -547,7 +547,7 @@ const FileUpload = (props) => {
name: "qualificationsTermEnd", name: "qualificationsTermEnd",
label: "有效期结束时间", label: "有效期结束时间",
render: FORM_ITEM_RENDER_ENUM.DATETIME, render: FORM_ITEM_RENDER_ENUM.DATETIME,
rules: [validatorEndTime(qualificationsTermStart), validatorTimeGTCurrentDay()], rules: [validatorEndTime({ startTime: qualificationsTermStart }), validatorTimeGECurrentDay({ type: "datetime" })],
hidden: !(props.data.isValidity === 0), hidden: !(props.data.isValidity === 0),
}, },
]} ]}

4
src/pages/Container/Local/Qualification/Review/Review/index.js
View File

@ -91,7 +91,7 @@ const RejectModalComponent = (props) => {
const PassModalComponent = (props) => { const PassModalComponent = (props) => {
const [form] = Form.useForm(); const [form] = Form.useForm();
// const managerDept = Form.useWatch("managerDept", form); const periodTermStart = Form.useWatch("periodTermStart", form);
const onSubmit = async (values) => { const onSubmit = async (values) => {
const { success } = await props["qualificationReviewSubmit"]({ ...values, id: props.id, qualificationsAuditId: props.qualificationsAuditId, status: "400" }); 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, render: FORM_ITEM_RENDER_ENUM.DATE,
dependencies: ["isLongTerm"], dependencies: ["isLongTerm"],
hidden: formValues => !(formValues.isLongTerm === 0), hidden: formValues => !(formValues.isLongTerm === 0),
rules: [validatorEndTime(form.getFieldValue("periodTermStart"))], rules: [validatorEndTime({ startTime: periodTermStart })],
}, },
]} ]}
/> />

4
src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js
View File

@ -359,7 +359,7 @@ const StepOneComponent = (props) => {
name: "endProjectTime", name: "endProjectTime",
label: "计划竣工时间", label: "计划竣工时间",
render: FORM_ITEM_RENDER_ENUM.DATE, render: FORM_ITEM_RENDER_ENUM.DATE,
rules: [validatorEndTime(startProjectTime)], rules: [validatorEndTime({ startTime: startProjectTime })],
}, },
// { // {
// name: "chooseForm", // name: "chooseForm",
@ -1290,7 +1290,7 @@ const FileUpload = (props) => {
name: "endValidityPeriod", name: "endValidityPeriod",
label: "有效期结束时间", label: "有效期结束时间",
render: FORM_ITEM_RENDER_ENUM.DATE, render: FORM_ITEM_RENDER_ENUM.DATE,
rules: [validatorEndTime(startValidityPeriod)], rules: [validatorEndTime({ startTime: startValidityPeriod })],
}, },
{ {
name: "files", name: "files",

5
src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwo/Add/index.js
View File

@ -7,7 +7,6 @@ import AddIcon from "zy-react-library/components/Icon/AddIcon";
import DepartmentLeftTree from "zy-react-library/components/LeftTree/Department/Gwj"; import DepartmentLeftTree from "zy-react-library/components/LeftTree/Department/Gwj";
import Page from "zy-react-library/components/Page"; import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; 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 PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj";
import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
@ -297,7 +296,7 @@ const StepOneComponent = (props) => {
{ name: "userName", label: "项目负责人", onlyForLabel: true }, { name: "userName", label: "项目负责人", onlyForLabel: true },
{ name: "initiationTime", label: "立项时间", render: FORM_ITEM_RENDER_ENUM.DATE }, { name: "initiationTime", label: "立项时间", render: FORM_ITEM_RENDER_ENUM.DATE },
{ name: "startProjectTime", 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: <DictionarySelect dictValue="project_choose_form" onGetLabel={label => form.setFieldValue("chooseFormName", label)} /> }, // { name: "chooseForm", label: "项目选取形式", render: <DictionarySelect dictValue="project_choose_form" onGetLabel={label => form.setFieldValue("chooseFormName", label)} /> },
// { name: "chooseFormName", label: "项目选取形式名称", onlyForLabel: true }, // { name: "chooseFormName", label: "项目选取形式名称", onlyForLabel: true },
{ name: "fourNewFlag", label: "是否涉及四新工作内容", labelCol: { span: 8 }, render: FORM_ITEM_RENDER_ENUM.RADIO, items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }] }, { 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", name: "endValidityPeriod",
label: "有效期结束时间", label: "有效期结束时间",
render: FORM_ITEM_RENDER_ENUM.DATE, render: FORM_ITEM_RENDER_ENUM.DATE,
rules: [validatorEndTime(startValidityPeriod)], rules: [validatorEndTime({ startTime: startValidityPeriod })],
}, },
{ {
name: "files", name: "files",

3
src/pages/Container/Supervision/Qualification/Review/Review/index.js
View File

@ -100,6 +100,7 @@ const RejectModalComponent = (props) => {
const PassModalComponent = (props) => { const PassModalComponent = (props) => {
const [form] = Form.useForm(); const [form] = Form.useForm();
const periodTermStart = Form.useWatch("periodTermStart", form);
const onSubmit = async (values) => { const onSubmit = async (values) => {
const { success } = await props["qualificationReviewSubmit"]({ ...values, id: props.id, qualificationsAuditId: props.qualificationsAuditId, status: "400" }); const { success } = await props["qualificationReviewSubmit"]({ ...values, id: props.id, qualificationsAuditId: props.qualificationsAuditId, status: "400" });
if (success) { if (success) {
@ -147,7 +148,7 @@ const PassModalComponent = (props) => {
render: FORM_ITEM_RENDER_ENUM.DATE, render: FORM_ITEM_RENDER_ENUM.DATE,
dependencies: ["isLongTerm"], dependencies: ["isLongTerm"],
hidden: formValues => !(formValues.isLongTerm === 0), hidden: formValues => !(formValues.isLongTerm === 0),
rules: [validatorEndTime(form.getFieldValue("periodTermStart"))], rules: [validatorEndTime({ startTime: periodTermStart })],
}, },
]} ]}
/> />