Merge branch 'master' of http://gitea.palntour.com/pav/pav-home

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

@@ -646,35 +646,27 @@ const PilotForm = ({data, handleChange, index, handleDeleteArray}) => {
                     />
                 </FormGroup>
             </Col>
-            {index !== 0 ?
+            {data.groupNm?
+              (
                 <Col className='count-del-btn' xs={12} md={2} xl={2} >
-                    <Button.Ripple
+                  <Button.Ripple
-                        color='danger'
+                      color='danger'
-                        className='text-nowrap px-1'
+                      className='text-nowrap px-1'
-                        onClick={() =>
+                      onClick={() =>
-                            handleDeleteArray({ type: 'pilot', index })
+                          handleDeleteArray({ type: 'pilot', index })
-                        }
+                      }
-                        outline
+                      outline
-                    >
+                  >
-                        <X size={14} className='mr-50' />
+                      <X size={14} className='mr-50' />
-                        <span>삭제</span>
+                      <span>삭제</span>
-                    </Button.Ripple>
+                  </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>)
 }
@@ -787,35 +779,47 @@ const ArcrftForm = ({data, handleChange, index, handleDeleteArray}) => {
                     />
                 </FormGroup>
             </Col>
-            {index !== 0 ?
+            {/* {index !== 0 ?
-                <Col className='count-del-btn' xs={12} md={2} xl={2} >
+                (
-                    <Button.Ripple
+                  <Col className='count-del-btn' xs={12} md={2} xl={2} >
-                        color='danger'
+                      <Button.Ripple
-                        className='text-nowrap px-1'
+                          color='danger'
-                        onClick={() =>
+                          className='text-nowrap px-1'
-                            handleDeleteArray({ type: 'pilot', index })
+                          onClick={() =>
-                        }
+                              handleDeleteArray({ type: 'pilot', index })
-                        outline
+                          }
-                    >
+                          outline
-                        <X size={14} className='mr-50' />
+                      >
-                        <span>삭제</span>
+                          <X size={14} className='mr-50' />
-                    </Button.Ripple>
+                          <span>삭제</span>
-                </Col>
+                      </Button.Ripple>
+                  </Col>
+                )
                 :
+                <></>            
+            }             */}
+            {data.groupNm?
+              (
                 <Col className='count-del-btn' xs={12} md={2} xl={2} >
-                    <Button.Ripple
+                  <Button.Ripple
-                        color='danger'
+                      color='danger'
-                        className='text-nowrap px-1'
+                      className='text-nowrap px-1'
-                        onClick={() =>
+                      onClick={() =>
-                            handleDeleteArray({ type: 'pilot', index })
+                          handleDeleteArray({ type: 'arcrft', index })
-                        }
+                      }
-                        outline
+                      outline
-                    >
+                  >
-                        <X size={14} className='mr-50' />
+                      <X size={14} className='mr-50' />
-                        <span>삭제</span>
+                      <span>삭제</span>
-                    </Button.Ripple>
+                  </Button.Ripple>
                 </Col>
-            }            
+              )
+            :
+              (
+                <></>
+              )
+            }
+            
         </Row>
     </div>)
 }

src/modules/basis/flight/models/basisFlightModel.ts

@@ -191,7 +191,7 @@ export const initFlight = {
     memberName: '',
     email: '',
     hpno: '',
-    clncd: '+81',
+    clncd: '+82',
     addr: '',
     addrDtlCn: '',
     zip: '',
@@ -240,7 +240,7 @@ export const initFlight = {
       memberName: '',
       email: '',
       hpno: '',
-      clncd: '+81',
+      clncd: '+82',
       addr: '',
       addrDtlCn: '',
       zip: '',
@@ -298,7 +298,7 @@ export const initFlightBas = {
     memberName: '',
     email: '',
     hpno: '',
-    clncd: '+81',
+    clncd: '+82',
     addr: '',
     addrDtlCn: '',
     zip: '',
@@ -323,7 +323,7 @@ export const initFlightBas = {
     memberName: '',
     email: '',
     hpno: '',
-    clncd: '+81',
+    clncd: '+82',
     addr: '',
     addrDtlCn: '',
     zip: '',
@@ -389,7 +389,7 @@ export const initFlightBas = {
     memberName: '',
     email: '',
     hpno: '',
-    clncd: '+81',
+    clncd: '+82',
     addr: '',
     addrDtlCn: '',
     zip: '',
@@ -438,7 +438,7 @@ export const initFlightBas = {
       memberName: '',
       email: '',
       hpno: '',
-      clncd: '+81',
+      clncd: '+82',
       addr: '',
       addrDtlCn: '',
       zip: '',