diff --git a/src/pages/Container/BranchCompany/Average/Confirm/Review/index.js b/src/pages/Container/BranchCompany/Average/Confirm/Review/index.js index 28c5124..c58288a 100644 --- a/src/pages/Container/BranchCompany/Average/Confirm/Review/index.js +++ b/src/pages/Container/BranchCompany/Average/Confirm/Review/index.js @@ -1,6 +1,6 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Divider, Form, message, Modal } from "antd"; -import { useRef, useState } from "react"; +import { useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; import HiddenInfo from "zy-react-library/components/HiddenInfo/gwj"; import Page from "zy-react-library/components/Page"; @@ -23,12 +23,12 @@ function Confirm(props) { // 是否来自视频巡屏 const [isFromVideoScreen, setIsFromVideoScreen] = useState(false); - const xgfProjectInfo = useRef({}); - - const getXgfProjectInfo = async (id) => { - const { data } = await props["xgfProjectInfo"]({ id }); - xgfProjectInfo.current = data; - }; + // const xgfProjectInfo = useRef({}); + // + // const getXgfProjectInfo = async (id) => { + // const { data } = await props["xgfProjectInfo"]({ id }); + // xgfProjectInfo.current = data; + // }; const decideOption = () => { const commonDeptUserFields = [ @@ -163,11 +163,11 @@ function Confirm(props) { { setData(data); - data.isRelated === 1 && getXgfProjectInfo(data.projectId); + // data.isRelated === 1 && getXgfProjectInfo(data.projectId); setIsFromInspection(data.source === 4 || data.source === 5); setIsFromVideoScreen(data.source === 7); const hiddenUserPresetsCO = data.hiddenUserPresetsCO || {}; - if (data.source !== 4 || data.source !== 7) { + if (data.source !== 4 && data.source !== 7) { form.setFieldValue("deptId", hiddenUserPresetsCO.rectifyDeptId || data.hiddenFindDept); form.setFieldValue("deptName", hiddenUserPresetsCO.rectifyDeptName || data.hiddenFindDeptName); form.setFieldValue("userId", hiddenUserPresetsCO.rectifyUserId || data.creatorId); @@ -177,6 +177,12 @@ function Confirm(props) { form.setFieldValue("checkUserId", hiddenUserPresetsCO.checkUserId || data.creatorId); form.setFieldValue("checkUserName", hiddenUserPresetsCO.checkUserName || data.creatorName); } + if (data.isRelated === 1) { + form.setFieldValue("deptId", hiddenUserPresetsCO.rectifyDeptId || data.hiddenFindDept); + form.setFieldValue("deptName", hiddenUserPresetsCO.rectifyDeptName || data.hiddenFindDeptName); + form.setFieldValue("userId", hiddenUserPresetsCO.rectifyUserId || data.creatorId); + form.setFieldValue("userName", hiddenUserPresetsCO.rectifyUserName || data.creatorName); + } }} /> 隐患确认 @@ -216,6 +222,15 @@ function Confirm(props) { form.setFieldValue("checkDeptName", ""); form.setFieldValue("checkUserName", ""); } + else { + if (data.isRelated === 1) { + const hiddenUserPresetsCO = data.hiddenUserPresetsCO || {}; + form.setFieldValue("deptId", hiddenUserPresetsCO.rectifyDeptId || data.hiddenFindDept); + form.setFieldValue("deptName", hiddenUserPresetsCO.rectifyDeptName || data.hiddenFindDeptName); + form.setFieldValue("userId", hiddenUserPresetsCO.rectifyUserId || data.creatorId); + form.setFieldValue("userName", hiddenUserPresetsCO.rectifyUserName || data.creatorName); + } + } }} onGetLabel={(label) => { form.setFieldValue("hiddenLevelName", label);