diff --git a/src/components/basis/flight/plan/FlightPlanForm.js b/src/components/basis/flight/plan/FlightPlanForm.js index 8cc21bd..b0434a4 100644 --- a/src/components/basis/flight/plan/FlightPlanForm.js +++ b/src/components/basis/flight/plan/FlightPlanForm.js @@ -646,20 +646,35 @@ const PilotForm = ({data, handleChange, index, handleDeleteArray}) => { /> - + {index !== 0 ? - handleDeleteArray({ type: 'pilot'}) + handleDeleteArray({ type: 'pilot', index }) } outline > 삭제 - + + : + + + handleDeleteArray({ type: 'pilot', index }) + } + outline + > + + 삭제 + + + } ) } @@ -772,13 +787,27 @@ const ArcrftForm = ({data, handleChange, index, handleDeleteArray}) => { /> - + {index !== 0 ? + + + handleDeleteArray({ type: 'pilot', index }) + } + outline + > + + 삭제 + + + : - handleDeleteArray({ type: 'arcrft', index }) + handleDeleteArray({ type: 'pilot', index }) } outline > @@ -786,7 +815,7 @@ const ArcrftForm = ({data, handleChange, index, handleDeleteArray}) => { 삭제 - + } ) } diff --git a/src/containers/basis/flight/plan/FlightPlanDetailContainer.js b/src/containers/basis/flight/plan/FlightPlanDetailContainer.js index ca6f657..f4b31a8 100644 --- a/src/containers/basis/flight/plan/FlightPlanDetailContainer.js +++ b/src/containers/basis/flight/plan/FlightPlanDetailContainer.js @@ -379,7 +379,9 @@ const FlightPlanDetailContainer = () => { break; } } - + useEffect(()=>{ + console.log(detailData); + },[detailData]) // 저장 const handleSave = () => { @@ -389,6 +391,8 @@ const FlightPlanDetailContainer = () => { title: '필수값 입력 오류', desc: '이름을 입력해주세요.' }); + + return false; } else if (!detailData.hpno) { setModal2({ @@ -396,6 +400,8 @@ const FlightPlanDetailContainer = () => { title: '필수값 입력 오류', desc: '전화번호를 입력해주세요.' }); + + return false; } else if(!detailData.email){ setModal2({ @@ -403,6 +409,8 @@ const FlightPlanDetailContainer = () => { title: '필수값 입력 오류', desc: '이메일을 입력해주세요.' }); + + return false; } else if (!detailData.areaList[0].coordList[0].lat) { setModal2({ @@ -410,6 +418,8 @@ const FlightPlanDetailContainer = () => { title: '필수값 입력 오류', desc: '좌표를 선택해주세요.' }); + + return false; } else if (!detailData.areaList[0].fltElev) { setModal2({ @@ -417,6 +427,8 @@ const FlightPlanDetailContainer = () => { title: '필수값 입력 오류', desc: '반경/고도를 입력해주세요.' }); + + return false; } else if (!detailData.areaList[0].fltMethod) { setModal2({ @@ -424,6 +436,8 @@ const FlightPlanDetailContainer = () => { title: '필수값 입력 오류', desc: '비행방식를 입력해주세요.' }); + + return false; } else if (!detailData.pilotList[0].groupNm) { setModal2({ @@ -431,6 +445,8 @@ const FlightPlanDetailContainer = () => { title: '필수값 입력 오류', desc: '조종사를 선택해주세요.' }); + + return false; } else if (!detailData.arcrftList[0].groupNm) { setModal2({ @@ -438,10 +454,13 @@ const FlightPlanDetailContainer = () => { title: '필수값 입력 오류', desc: '기체를 선택해주세요.' }); + + return false; } - else if (!detailData.planSno[0]) { + + if (!detailData.planSno) { dispatch(Actions.FLIGHT_PLAN_CREATE.request(detailData)); - } else { + } else { dispatch(Actions.FLIGHT_PLAN_UPDATE.request(detailData)); }