diff --git a/src/pages/Container/BranchCompany/Qualification/EntrustedQualification/list/index.js b/src/pages/Container/BranchCompany/Qualification/EntrustedQualification/list/index.js index d3d523f..1b9e5fc 100644 --- a/src/pages/Container/BranchCompany/Qualification/EntrustedQualification/list/index.js +++ b/src/pages/Container/BranchCompany/Qualification/EntrustedQualification/list/index.js @@ -52,9 +52,19 @@ function List(props) { title: "操作", fixed: "right", width: 180, - hidden: !props.permission("fgs-bwtzz-sh"), render: (_, record) => ( + + { + props.permission("fgs-bwtzz-sh") && + ( + ) + } ), }, diff --git a/src/pages/Container/Local/Qualification/Review/Review/index.js b/src/pages/Container/Local/Qualification/Review/Review/index.js index dcb0cb4..ed55ca9 100644 --- a/src/pages/Container/Local/Qualification/Review/Review/index.js +++ b/src/pages/Container/Local/Qualification/Review/Review/index.js @@ -91,6 +91,7 @@ const RejectModalComponent = (props) => { const PassModalComponent = (props) => { const [form] = Form.useForm(); + const isLongTerm = Form.useWatch("isLongTerm", form); const periodTermStart = Form.useWatch("periodTermStart", form); const onSubmit = async (values) => { @@ -132,14 +133,14 @@ const PassModalComponent = (props) => { label: "有效开始时间", render: FORM_ITEM_RENDER_ENUM.DATE, dependencies: ["isLongTerm"], - hidden: formValues => !(formValues.isLongTerm === 0), + hidden: !(isLongTerm === 0), }, { name: "periodTermEnd", label: "有效结束时间", render: FORM_ITEM_RENDER_ENUM.DATE, dependencies: ["isLongTerm"], - hidden: formValues => !(formValues.isLongTerm === 0), + hidden: !(isLongTerm === 0), rules: [validatorEndTime({ startTime: periodTermStart })], }, ]} diff --git a/src/pages/Container/Supervision/Qualification/Review/Review/index.js b/src/pages/Container/Supervision/Qualification/Review/Review/index.js index 1129637..8504ce5 100644 --- a/src/pages/Container/Supervision/Qualification/Review/Review/index.js +++ b/src/pages/Container/Supervision/Qualification/Review/Review/index.js @@ -99,8 +99,8 @@ const RejectModalComponent = (props) => { }; const PassModalComponent = (props) => { - console.log(props) const [form] = Form.useForm(); + const isLongTerm = Form.useWatch("isLongTerm", 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" }); @@ -147,14 +147,14 @@ const PassModalComponent = (props) => { label: "有效开始时间", render: FORM_ITEM_RENDER_ENUM.DATE, dependencies: ["isLongTerm"], - hidden: formValues => !(formValues.isLongTerm === 0), + hidden: !(isLongTerm === 0), }, { name: "periodTermEnd", label: "有效结束时间", render: FORM_ITEM_RENDER_ENUM.DATE, dependencies: ["isLongTerm"], - hidden: formValues => !(formValues.isLongTerm === 0), + hidden: !(isLongTerm === 0), rules: [validatorEndTime({ startTime: periodTermStart })], }, ]}