diff --git a/src/components/ViewEvaluationModal/index.js b/src/components/ViewEvaluationModal/index.js index ff93e47..0080771 100644 --- a/src/components/ViewEvaluationModal/index.js +++ b/src/components/ViewEvaluationModal/index.js @@ -45,7 +45,7 @@ const ViewEvaluationModal = (props) => { label: "是否符合", children: getLabelName({ list: EVALUATION_IS_COMPLIANT_ENUM, status: item.isCompliant }) || "未考评", }, - ...(item.isCompliant === 0 ? [{ label: "不符合原因", children: item.nonCompliantReason, span: 2 }] : []), + ...(String(item.isCompliant) === "0" ? [{ label: "不符合原因", children: item.nonCompliantReason, span: 2 }] : []), ])), ]} /> diff --git a/src/pages/Container/Supervision/HiddenEvaluation/HiddenList/index.js b/src/pages/Container/Supervision/HiddenEvaluation/HiddenList/index.js index 4a7d5dc..3ec70b2 100644 --- a/src/pages/Container/Supervision/HiddenEvaluation/HiddenList/index.js +++ b/src/pages/Container/Supervision/HiddenEvaluation/HiddenList/index.js @@ -162,6 +162,7 @@ function HiddenList(props) { const EvaluationModalComponent = (props) => { const { getUserInfo } = useGetUserInfo(); const [form] = FormBuilder.useForm(); + const [showNonCompliantReason, setShowNonCompliantReason] = useState(false); const [list, setList] = useState([]); const getData = async () => { const { data } = await props["hiddenEvaluationHiddenEvaluationView"]({ @@ -195,7 +196,6 @@ const EvaluationModalComponent = (props) => { props.getData(); } }; - return ( { label: "是否符合", children: getLabelName({ list: EVALUATION_IS_COMPLIANT_ENUM, status: item.isCompliant }) || "未考评", }, - ...(item.isCompliant === 0 ? [{ label: "不符合原因", children: item.nonCompliantReason, span: 2 }] : []), + ...(String(item.isCompliant) === "0" ? [{ label: "不符合原因", children: item.nonCompliantReason, span: 2 }] : []), ])), ]} /> @@ -228,6 +228,11 @@ const EvaluationModalComponent = (props) => { showActionButtons={false} span={24} onFinish={onSubmit} + onValuesChange={(changedValues, allValues) => { + if (Object.prototype.hasOwnProperty.call(changedValues, "isCompliant")) { + setShowNonCompliantReason(String(allValues.isCompliant) === "0"); + } + }} labelCol={{ span: 6 }} values={{ isCompliant: "1", @@ -248,8 +253,7 @@ const EvaluationModalComponent = (props) => { name: "nonCompliantReason", label: "不符合原因", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, - dependencies: ["isCompliant"], - hidden: formValues => !(formValues.isCompliant === "0"), + hidden: !showNonCompliantReason, }, ]} />