diff --git a/src/components/basis/flight/plan/FlightPlanArcrft.js b/src/components/basis/flight/plan/FlightPlanArcrft.js index a853dc8d..a8de3bbb 100644 --- a/src/components/basis/flight/plan/FlightPlanArcrft.js +++ b/src/components/basis/flight/plan/FlightPlanArcrft.js @@ -7,7 +7,7 @@ const FlightPlanArcrft = ({ arcrftList, handleSelectArcrft }) => { const columns = [ {id: 'groupNm', name: '그룹 명', cell: row => (
{row.groupNm}
)}, {id: 'arcrftModelNm', name: '모델 명', cell: row => (
{row.arcrftModelNm}
)}, - {id: 'idntfTypeCd', name: '종류', cell: row => (
{row.idntfTypeCd}
)}, + {id: 'idntfTypeCd', name: '종류', cell: row => (
{row.arcrftTypeCd}
)}, {id: 'ownerNm', name: '소유자 명', cell: row => (
{row.ownerNm}
)}, {id: 'idntfNum', name: '식별 코드', cell: row => (
{row.idntfNum}
)}, { diff --git a/src/containers/basis/flight/plan/FlightPlanDetailContainer.js b/src/containers/basis/flight/plan/FlightPlanDetailContainer.js index 1cc27434..7b7903c6 100644 --- a/src/containers/basis/flight/plan/FlightPlanDetailContainer.js +++ b/src/containers/basis/flight/plan/FlightPlanDetailContainer.js @@ -34,6 +34,7 @@ const FlightPlanDetailContainer = () => { useEffect(() => { if(pilotSelect !== undefined) { + const pilotList = detailData.pilotList.concat(); const pilot = Object.assign({}, initFlightBas['pilot']); pilot.cstmrSno = pilotSelect.cstmrSno; @@ -41,12 +42,22 @@ const FlightPlanDetailContainer = () => { pilot.clncd = pilotSelect.clncd; pilot.email = pilotSelect.email; pilot.memberName = pilotSelect.memberName; - pilot.hpno = pilotSelect.hpno; + pilot.hpno = pilotSelect.hpno; + + pilotList.forEach((p, i) => { + if(p.cstmrSno === 0) { + pilotList[i] = pilot + } else { + if(i === pilotList.length-1) { + return pilotList.push(pilot); + } + } + }); setDetailData(prevState => { return { ...prevState, - ['pilotList']: [...prevState['pilotList'], pilot] + ['pilotList']: pilotList } }) } @@ -55,20 +66,32 @@ const FlightPlanDetailContainer = () => { useEffect(() => { if(arcrftSelect !== undefined) { + const arcrftList = detailData.arcrftList.concat(); const arcrft = Object.assign({}, initFlightBas['arcrft']); arcrft.arcrftSno = arcrftSelect.arcrftSno; - arcrft.groupId = arcrftSelect.groupNm; - arcrft.groupNm = arcrftSelect.clncd; + arcrft.groupId = arcrftSelect.groupId; + arcrft.groupNm = arcrftSelect.groupNm; arcrft.arcrftModelNm = arcrftSelect.arcrftModelNm; arcrft.idntfTypeCd = arcrftSelect.idntfTypeCd; + arcrft.arcrftTypeCd = arcrftSelect.arcrftTypeCd; arcrft.idntfNum = arcrftSelect.idntfNum; - arcrft.ownerNm = arcrftSelect.ownerNm; + arcrft.ownerNm = arcrftSelect.ownerNm; + + arcrftList.forEach((p, i) => { + if(p.arcrftSno === 0) { + arcrftList[i] = arcrft + } else { + if(i === arcrftList.length-1) { + return arcrftList.push(arcrft); + } + } + }); setDetailData(prevState => { return { ...prevState, - ['arcrftList']: [...prevState['arcrftList'], arcrft] + ['arcrftList']: arcrftList } }) }