비행계획서 유효성 검사 (최종)

src/components/basis/flight/plan/FlightPlanForm.js

@@ -646,13 +646,13 @@ const PilotForm = ({data, handleChange, index, handleDeleteArray}) => {
                     />
                 </FormGroup>
             </Col>
-          
+            {index !== 0 ?
                 <Col className='count-del-btn' xs={12} md={2} xl={2} >
                     <Button.Ripple
                         color='danger'
                         className='text-nowrap px-1'
                         onClick={() =>
-                            handleDeleteArray({ type: 'pilot'})
+                            handleDeleteArray({ type: 'pilot', index })
                         }
                         outline
                     >
@@ -660,6 +660,21 @@ const PilotForm = ({data, handleChange, index, handleDeleteArray}) => {
                         <span>삭제</span>
                     </Button.Ripple>
                 </Col>
+                :
+                <Col className='count-del-btn' xs={12} md={2} xl={2} >
+                <Button.Ripple
+                    color='danger'
+                    className='text-nowrap px-1'
+                    onClick={() =>
+                        handleDeleteArray({ type: 'pilot', index })
+                    }
+                    outline
+                >
+                    <X size={14} className='mr-50' />
+                    <span>삭제</span>
+                </Button.Ripple>
+            </Col>
+            }            
         </Row>
     </div>)
 }
@@ -772,13 +787,13 @@ const ArcrftForm = ({data, handleChange, index, handleDeleteArray}) => {
                     />
                 </FormGroup>
             </Col>
-         
+            {index !== 0 ?
                 <Col className='count-del-btn' xs={12} md={2} xl={2} >
                     <Button.Ripple
                         color='danger'
                         className='text-nowrap px-1'
                         onClick={() =>
-                            handleDeleteArray({ type: 'arcrft', index })
+                            handleDeleteArray({ type: 'pilot', index })
                         }
                         outline
                     >
@@ -786,7 +801,21 @@ const ArcrftForm = ({data, handleChange, index, handleDeleteArray}) => {
                         <span>삭제</span>
                     </Button.Ripple>
                 </Col>
-           
+                :
+                <Col className='count-del-btn' xs={12} md={2} xl={2} >
+                    <Button.Ripple
+                        color='danger'
+                        className='text-nowrap px-1'
+                        onClick={() =>
+                            handleDeleteArray({ type: 'pilot', index })
+                        }
+                        outline
+                    >
+                        <X size={14} className='mr-50' />
+                        <span>삭제</span>
+                    </Button.Ripple>
+                </Col>
+            }            
         </Row>
     </div>)
 }

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,8 +454,11 @@ const FlightPlanDetailContainer = () => {
                 title: '필수값 입력 오류',
                 desc: '기체를 선택해주세요.'
               });
+
+              return false;
         }
-        else if (!detailData.planSno[0]) {
+
+        if (!detailData.planSno) {
             dispatch(Actions.FLIGHT_PLAN_CREATE.request(detailData));
         } else {      
             dispatch(Actions.FLIGHT_PLAN_UPDATE.request(detailData));