bug:20726
parent
3d3ef70f8f
commit
738d212477
|
|
@ -1,6 +1,6 @@
|
||||||
import { Connect } from "@cqsjjb/jjb-dva-runtime";
|
import { Connect } from "@cqsjjb/jjb-dva-runtime";
|
||||||
import { Button, Divider, Form, message, Modal } from "antd";
|
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 FormBuilder from "zy-react-library/components/FormBuilder";
|
||||||
import HiddenInfo from "zy-react-library/components/HiddenInfo/gwj";
|
import HiddenInfo from "zy-react-library/components/HiddenInfo/gwj";
|
||||||
import Page from "zy-react-library/components/Page";
|
import Page from "zy-react-library/components/Page";
|
||||||
|
|
@ -23,12 +23,12 @@ function Confirm(props) {
|
||||||
// 是否来自视频巡屏
|
// 是否来自视频巡屏
|
||||||
const [isFromVideoScreen, setIsFromVideoScreen] = useState(false);
|
const [isFromVideoScreen, setIsFromVideoScreen] = useState(false);
|
||||||
|
|
||||||
const xgfProjectInfo = useRef({});
|
// const xgfProjectInfo = useRef({});
|
||||||
|
//
|
||||||
const getXgfProjectInfo = async (id) => {
|
// const getXgfProjectInfo = async (id) => {
|
||||||
const { data } = await props["xgfProjectInfo"]({ id });
|
// const { data } = await props["xgfProjectInfo"]({ id });
|
||||||
xgfProjectInfo.current = data;
|
// xgfProjectInfo.current = data;
|
||||||
};
|
// };
|
||||||
|
|
||||||
const decideOption = () => {
|
const decideOption = () => {
|
||||||
const commonDeptUserFields = [
|
const commonDeptUserFields = [
|
||||||
|
|
@ -163,11 +163,11 @@ function Confirm(props) {
|
||||||
<HiddenInfo
|
<HiddenInfo
|
||||||
onGetData={(data) => {
|
onGetData={(data) => {
|
||||||
setData(data);
|
setData(data);
|
||||||
data.isRelated === 1 && getXgfProjectInfo(data.projectId);
|
// data.isRelated === 1 && getXgfProjectInfo(data.projectId);
|
||||||
setIsFromInspection(data.source === 4 || data.source === 5);
|
setIsFromInspection(data.source === 4 || data.source === 5);
|
||||||
setIsFromVideoScreen(data.source === 7);
|
setIsFromVideoScreen(data.source === 7);
|
||||||
const hiddenUserPresetsCO = data.hiddenUserPresetsCO || {};
|
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("deptId", hiddenUserPresetsCO.rectifyDeptId || data.hiddenFindDept);
|
||||||
form.setFieldValue("deptName", hiddenUserPresetsCO.rectifyDeptName || data.hiddenFindDeptName);
|
form.setFieldValue("deptName", hiddenUserPresetsCO.rectifyDeptName || data.hiddenFindDeptName);
|
||||||
form.setFieldValue("userId", hiddenUserPresetsCO.rectifyUserId || data.creatorId);
|
form.setFieldValue("userId", hiddenUserPresetsCO.rectifyUserId || data.creatorId);
|
||||||
|
|
@ -177,6 +177,12 @@ function Confirm(props) {
|
||||||
form.setFieldValue("checkUserId", hiddenUserPresetsCO.checkUserId || data.creatorId);
|
form.setFieldValue("checkUserId", hiddenUserPresetsCO.checkUserId || data.creatorId);
|
||||||
form.setFieldValue("checkUserName", hiddenUserPresetsCO.checkUserName || data.creatorName);
|
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);
|
||||||
|
}
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<Divider orientation="left">隐患确认</Divider>
|
<Divider orientation="left">隐患确认</Divider>
|
||||||
|
|
@ -216,6 +222,15 @@ function Confirm(props) {
|
||||||
form.setFieldValue("checkDeptName", "");
|
form.setFieldValue("checkDeptName", "");
|
||||||
form.setFieldValue("checkUserName", "");
|
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) => {
|
onGetLabel={(label) => {
|
||||||
form.setFieldValue("hiddenLevelName", label);
|
form.setFieldValue("hiddenLevelName", label);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue