diff --git a/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js b/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js index 53d775f..f2706fe 100644 --- a/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js +++ b/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js @@ -16,7 +16,7 @@ import useDeleteFile from "zy-react-library/hooks/useDeleteFile"; import useGetFile from "zy-react-library/hooks/useGetFile"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useUploadFile from "zy-react-library/hooks/useUploadFile"; -import { getLabelName,validatorEndTime, validatorTimeGTCurrentDay } from "zy-react-library/utils"; +import { getLabelName, validatorEndTime, validatorTimeGTCurrentDay } from "zy-react-library/utils"; import { NS_QUALIFICATION_APPLY, NS_QUALIFICATION_MAINTENANCE } from "~/enumerate/namespace"; function Add(props) { @@ -233,13 +233,26 @@ const StepTwoComponent = (props) => { await getTypeGroup(data.details) setSpecialList(data.details || []); } else { - await getTypeGroup(specialList) - for (let i = 0; i < specialList.length; i++) { - specialList[i].files = await getFile({ - eqType: UPLOAD_FILE_TYPE_ENUM["148"], - eqForeignKey: specialList[i].applyDetailId - }); + const { data } = await props["qualificationMaintenanceInfo"]({ id: props.formValues.qualificationsId }); + const newSpecialList = data.details.map(item => { + const existsItem = specialList.find(specialItem => specialItem.qualificationsDetailId === item.id); + if (existsItem) { + return { ...item, ...existsItem }; + } + return item; + }) + + await getTypeGroup(newSpecialList) + for (let i = 0; i < newSpecialList.length; i++) { + if (newSpecialList[i].applyDetailId) { + newSpecialList[i].files = await getFile({ + eqType: UPLOAD_FILE_TYPE_ENUM["148"], + eqForeignKey: newSpecialList[i].applyDetailId + }); + } } + + setSpecialList(newSpecialList); } };