修改 项目确认 生成重点作业 取值问题
parent
63dfcaeae8
commit
2c37ff1840
|
|
@ -30,8 +30,9 @@ module.exports = {
|
|||
// 应用Key
|
||||
appKey: "",
|
||||
// fileUrl: "https://jpfz.qhdsafety.com/gbsFileTest/",
|
||||
// fileUrl: "http://192.168.20.240:9787/mnt/",
|
||||
fileUrl: "https://skqhdg.porthebei.com:9004/file/uploadFiles2/",
|
||||
// fileUrl: "https://skqhdg.porthebei.com:9004/file/uploadFiles2/",
|
||||
fileUrl: "",
|
||||
|
||||
},
|
||||
// public/index.html注入全局变量
|
||||
windowInject: {
|
||||
|
|
|
|||
|
|
@ -107,3 +107,7 @@ export const keyProjectAdd = declareRequest(
|
|||
"qualificationStatisticsLoading",
|
||||
"Post > @/keyProject/keyProject/save",
|
||||
);
|
||||
export const userListAll = declareRequest(
|
||||
"qualificationStatisticsLoading",
|
||||
"Get > /basicInfo/user/listAll",
|
||||
);
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ function List(props) {
|
|||
onClick={() => {
|
||||
props.history.push(`./reView?id=${record.id}&projectStatusLast=2`);
|
||||
}}
|
||||
disabled={record.projectStatus === 2 && record.currentUserCanAudit === 2}
|
||||
// disabled={record.projectStatus === 2 && record.currentUserCanAudit === 2}
|
||||
>
|
||||
{record.projectStatus === 2 ? "确认" : "查看"}
|
||||
</Button>
|
||||
|
|
|
|||
|
|
@ -84,6 +84,7 @@ function Review(props) {
|
|||
const [keyProjectModalOpen, setKeyProjectModalOpen] = useState(false);
|
||||
const [keyProjectSubmitting, setKeyProjectSubmitting] = useState(false);
|
||||
const [auditPassParams, setAuditPassParams] = useState({});
|
||||
const [xgfDirectorData, setXgfDirectorData] = useState({});
|
||||
const { uploadFile, loading: uploadFileLoading } = useUploadFile();
|
||||
const { getUserInfo } = useGetUserInfo();
|
||||
const [userInfo, setUserInfo] = useState({});
|
||||
|
|
@ -135,6 +136,20 @@ function Review(props) {
|
|||
useEffect(() => {
|
||||
getCurrentUserInfo();
|
||||
}, []);
|
||||
const getXgfMasterUserFun = (id, userId) => {
|
||||
|
||||
props.userListAll({ corpinfoId: id }).then((res) => {
|
||||
const list = Array.isArray(res?.data) ? res.data : [];
|
||||
list.forEach((item) => {
|
||||
item.bianma = item.id;
|
||||
item.name = item.userName || item.name;
|
||||
if ( item.id === userId) {
|
||||
setXgfDirectorData(item)
|
||||
}
|
||||
});
|
||||
|
||||
});
|
||||
};
|
||||
const getData = async (id = query.id) => {
|
||||
const projectDetailResult = await props["projectDetail"]({ id });
|
||||
if (!projectDetailResult || !projectDetailResult.data) {
|
||||
|
|
@ -172,6 +187,8 @@ function Review(props) {
|
|||
else {
|
||||
projectData.corpInfo = null;
|
||||
}
|
||||
|
||||
getXgfMasterUserFun(projectData.corpinfoId, projectData.userId);
|
||||
setInfo(projectData);
|
||||
};
|
||||
|
||||
|
|
@ -231,6 +248,7 @@ function Review(props) {
|
|||
}
|
||||
|
||||
const values = keyProjectForm.getFieldsValue(true);
|
||||
|
||||
setKeyProjectSubmitting(true);
|
||||
try {
|
||||
if (values.projectWorkFlag === 1) {
|
||||
|
|
@ -265,9 +283,9 @@ function Review(props) {
|
|||
jurisdictionCorpinfoId: userInfo.corpinfoId,
|
||||
jurisdictionDepartmentId: userInfo.departmentId,
|
||||
xgfCorpinfoId: info.corpInfo && info.corpInfo.id,
|
||||
xgfMasterUserId: info.corpInfo && info.corpInfo.updateId,
|
||||
xgfMasterPhone: info.corpInfo && info.corpInfo.lrMobile,
|
||||
|
||||
xgfMasterUserId: xgfDirectorData.id,
|
||||
xgfMasterPhone: xgfDirectorData.phone,
|
||||
createSource:2,
|
||||
keyProjectId: agreementFileUuid,
|
||||
applyStatus: 1,
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue