diff --git a/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js b/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js index 6daa8f4..1c63088 100644 --- a/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js +++ b/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js @@ -176,6 +176,21 @@ function Add(props) { } }, [form, hiddenLevel, isBigOrMajorHidden]); + useEffect(() => { + if (isRelated !== 1) + return; + + form.setFieldsValue({ + rectificationType: 2, + rectificationDescr: undefined, + afterRectificationImageFiles: undefined, + checkDeptId: undefined, + checkDeptName: undefined, + checkUserId: undefined, + checkUserName: undefined, + }); + }, [form, isRelated]); + const clearHiddenRecognizeState = () => { selectHiddens.current = []; currentProcessHiddenIndex.current = -1; @@ -274,6 +289,17 @@ function Add(props) { checkUserId: undefined, checkUserName: undefined, } + : isRelated === 1 + ? { + ...values, + rectificationType: 2, + rectificationDescr: undefined, + afterRectificationImageFiles: [], + checkDeptId: undefined, + checkDeptName: undefined, + checkUserId: undefined, + checkUserName: undefined, + } : values; await deleteFile({ single: false, files: deleteHiddenImageFiles.current }); await deleteFile({ single: false, files: deleteHiddenVideoFiles.current }); @@ -387,6 +413,7 @@ function Add(props) { { name: "hiddenImageFiles", label: "隐患图片", + dependencies: ["isRelated"], render: ( form.setFieldValue("hiddenLevelName", label)} /> ), @@ -470,6 +501,8 @@ function Add(props) { items: IS_RELATED_ENUM.map(item => ({ ...item, bianma: +item.bianma })), componentProps: { onChange: () => { + form.setFieldValue("hiddenLevel", undefined); + form.setFieldValue("hiddenLevelName", ""); form.setFieldValue("projectName", ""); form.setFieldValue("rectificationDeptId", ""); form.setFieldValue("rectificationDeptName", ""); @@ -624,11 +657,12 @@ function Add(props) { name: "rectificationType", label: "隐患处置", render: FORM_ITEM_RENDER_ENUM.RADIO, - items: isBigOrMajorHidden + items: (isBigOrMajorHidden || isRelated === 1) ? HIDDEN_RECTIFICATION_TYPE_ENUM.filter(item => item.bianma === 2) : HIDDEN_RECTIFICATION_TYPE_ENUM, span: 24, componentProps: { + disabled: isRelated === 1, onChange: (value) => { if (isAi === 1) { form.setFieldValue("rectificationDescr", selectHiddens.current[currentProcessHiddenIndex.current].rectificationSuggestions); diff --git a/src/pages/Container/BranchCompany/MajorHidden/Confirm/Review/index.js b/src/pages/Container/BranchCompany/MajorHidden/Confirm/Review/index.js index 49c424d..c5a57e3 100644 --- a/src/pages/Container/BranchCompany/MajorHidden/Confirm/Review/index.js +++ b/src/pages/Container/BranchCompany/MajorHidden/Confirm/Review/index.js @@ -167,7 +167,6 @@ function Confirm(props) { label: "隐患级别", render: ( { clearLevelRelatedFields(); form.setFieldValue("hiddenLevel", value); diff --git a/src/pages/Container/Supervision/MajorHidden/HiddenRecord/HiddenList/index.js b/src/pages/Container/Supervision/MajorHidden/HiddenRecord/HiddenList/index.js index e1f306c..54e709d 100644 --- a/src/pages/Container/Supervision/MajorHidden/HiddenRecord/HiddenList/index.js +++ b/src/pages/Container/Supervision/MajorHidden/HiddenRecord/HiddenList/index.js @@ -88,8 +88,8 @@ function HiddenList(props) { { title: "确认人", dataIndex: "confirmUserName", width: 130 }, { title: "核实人", dataIndex: "verifyUserName", width: 130 }, { title: "核定人", dataIndex: "approveUserName", width: 130 }, - { title: "整改人", dataIndex: "rectifyUserName", width: 130 }, - { title: "验收人", dataIndex: "hiddenYUserName", width: 130 }, + { title: "整改人", dataIndex: "rectifyUserName", width: 130, hidden: query.type === "hiddenLevel2002" }, + { title: "验收人", dataIndex: "hiddenYUserName", width: 130, hidden: query.type === "hiddenLevel2002" }, { title: "隐患状态", dataIndex: "state", render: (_, recode) => getLabelName({ list: HIDDEN_STATE_ENUM, status: recode.state }) }, { title: "操作",