From ff7dc57012c5274f11f799dd6290dc38137098f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?qkr7828=28=EB=B0=95=EC=9E=AC=EC=9A=B0=29?=
 <qkr7828@palnet.co.kr>
Date: Wed, 13 Jul 2022 18:54:49 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=EA=B3=84=ED=9A=8D=EC=84=9C?=
 =?UTF-8?q?=20=EC=8B=A0=EC=B2=AD=20=ED=8F=BC(=EC=9E=91=EC=97=85=EC=A4=91)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/basis/dron/BasisDronForm.js    |   7 +-
 src/components/basis/dron/BasisIdntform.js    |  57 +++-
 .../basis/flight/plan/FlightPlanForm.js       | 251 ++++++++++++++++--
 .../basis/dron/BasisDronDetailContainer.js    |   2 +-
 .../basis/dron/BasisIdntfContainer.js         |   2 +
 5 files changed, 281 insertions(+), 38 deletions(-)

diff --git a/src/components/basis/dron/BasisDronForm.js b/src/components/basis/dron/BasisDronForm.js
index 86cb13d..5a3b0f3 100644
--- a/src/components/basis/dron/BasisDronForm.js
+++ b/src/components/basis/dron/BasisDronForm.js
@@ -8,7 +8,8 @@ import {
   FormGroup,
   Input,
   Label,
-  Row
+  Row,
+  Button
 } from 'reactstrap';
 import { ARCTFT_TYPE_CD, WGHT_TYPE_CD } from '../../../configs/constants';
 
@@ -305,7 +306,7 @@ export const BasisDronForm = props => {
                     </Row>
                   </div>
                 </dt>
-                <dt>
+                {/* <dt>
                   <div className='search-info-ti d-flex justify-content-between'>
                     <h4 className='ti'>운영자 정보</h4>
                   </div>
@@ -359,7 +360,7 @@ export const BasisDronForm = props => {
                       </Col>
                     </Row>
                   </div>
-                </dt>
+                </dt> */}
               </dl>
 
               {/* <div className='d-flex align-items-center'>
diff --git a/src/components/basis/dron/BasisIdntform.js b/src/components/basis/dron/BasisIdntform.js
index a212ae9..6d3f3ae 100644
--- a/src/components/basis/dron/BasisIdntform.js
+++ b/src/components/basis/dron/BasisIdntform.js
@@ -11,6 +11,7 @@ import {
   DropdownItem,
   DropdownToggle,
   Card,
+  FormFeedback,
   CardHeader,
   CardBody,
   CardTitle,
@@ -62,28 +63,37 @@ export const BasisIdntfForm = props => {
                   <div className='search-info-box count-box'>
                     <CardBody className='pd-0'>
                       <Row>
-                        <Col xs={4} md={4} xl={4}>
+                        <Col xs={3} md={3} xl={2}>
                           <span className='sm-ti'>
-                            <span className='necessary'>*</span>
-                            식별번호
+                            <span className='necessary'>*</span>식별번호
                           </span>
                         </Col>
-                        <Col xs={3} md={3} xl={3}>
+                        <Col xs={3} md={3} xl={2}>
                           <span className='sm-ti'>
                             <span className='necessary'>*</span>장비타입
                           </span>
                         </Col>
-                        <Col xs={3} md={3} xl={3}>
+                        <Col xs={3} md={3} xl={2}>
                           <span className='sm-ti'>
                             <span className='necessary'>*</span>수정일자
                           </span>
                         </Col>
+                        <Col xs={3} md={3} xl={2}>
+                          <span className='sm-ti'>
+                            <span className='necessary'>*</span>소유자명
+                          </span>
+                        </Col>
+                        <Col xs={3} md={3} xl={2}>
+                          <span className='sm-ti'>
+                            <span className='necessary'>*</span>연락처
+                          </span>
+                        </Col>
                       </Row>
                       <Repeater count={props.count}>
                         {i => (
                           <Form key={i}>
                             <Row className='justify-content-between align-items-center'>
-                              <Col xs={4} md={4} xl={4}>
+                            <Col xs={3} md={3} xl={2}>
                                 <FormGroup className='form-label-group'>
                                   <Label for={`idntfNum.${i}`}>식별번호</Label>
                                   <Input
@@ -98,7 +108,7 @@ export const BasisIdntfForm = props => {
                                   ></Input>
                                 </FormGroup>
                               </Col>
-                              <Col xs={3} md={3} xl={3}>
+                              <Col xs={3} md={3} xl={2}>
                                 <FormGroup className='form-label-group'>
                                   <Label for={'idntfTypeCd'}>장비타입</Label>
                                   <Input
@@ -112,7 +122,7 @@ export const BasisIdntfForm = props => {
                                   ></Input>
                                 </FormGroup>
                               </Col>
-                              <Col xs={3} md={3} xl={3}>
+                              <Col xs={3} md={3} xl={2}>
                                 <FormGroup className='form-label-group'>
                                   <Label for={'updateDt'}>수정일자</Label>
                                   <Input
@@ -125,6 +135,37 @@ export const BasisIdntfForm = props => {
                                   ></Input>
                                 </FormGroup>
                               </Col>
+                              <Col xs={3} md={3} xl={2}>
+                                <FormGroup className='form-label-group'>
+                                  <Label for={`userName`}>소유자명</Label>
+                                  <Input
+                                    type='text'
+                                    // innerRef={props.data}
+                                    id={`userName`}
+                                    name={`ownerNm`}
+                                    placeholder=''
+                                    onChange={e => props.handlerInput(e, i)}
+                                    value={props.data[i].ownerNm}
+                                    readOnly={props.data[i].isSave}
+                                    size='sm'
+                                  ></Input>
+                                </FormGroup>
+                              </Col>
+                              <Col xs={3} md={3} xl={2}>
+                                <FormGroup className='form-label-group'>
+                                  <Label for={`phoneNumber`}>연락처</Label>
+                                  <Input
+                                    type='text'
+                                    // innerRef={props.data}
+                                    id={`phoneNumber`}
+                                    name={`hpno`}
+                                    onChange={e => props.handlerInput(e, i)}
+                                    value={props.data[i].hpno}
+                                    readOnly={props.data[i].isSave}
+                                    size='sm'
+                                  ></Input>
+                                </FormGroup>
+                              </Col>
                               <Col
                                 xs={12}
                                 md={2}
diff --git a/src/components/basis/flight/plan/FlightPlanForm.js b/src/components/basis/flight/plan/FlightPlanForm.js
index 26e633e..555fbd1 100644
--- a/src/components/basis/flight/plan/FlightPlanForm.js
+++ b/src/components/basis/flight/plan/FlightPlanForm.js
@@ -143,7 +143,7 @@ const FlightPlanForm = (props) => {
                               <Col className='list-input' lg={4} md={6} sm={12}>
                                 <FormGroup>                                                
                                   <Label for='test'>
-                                    <span className='necessary'>*</span>시작 기간
+                                    <span className='necessary'>*</span>비행시작일자
                                   </Label>
                                   <Flatpickr size='sm' className='form-control calendar-flat' />                                                                                        
                                 </FormGroup>
@@ -151,19 +151,15 @@ const FlightPlanForm = (props) => {
                               <Col className='list-input' lg={4} md={6} sm={12}>
                                 <FormGroup>
                                   <Label for='test'>
-                                    <span className='necessary'>*</span>종료 기간
+                                    <span className='necessary'>*</span>비행종료일자
                                   </Label>
                                   <Flatpickr size='sm' className='form-control calendar-flat' />   
                                 </FormGroup>
                               </Col>
-                            </Row>
-                          </div>
-                          <div className='search-info-box'>
-                            <Row>
                               <Col className='list-input' lg={4} md={6} sm={12}>
                                 <FormGroup>
                                   <Label for='test'>
-                                    <span className='necessary'>*</span>비행 장치
+                                    <span className='necessary'>*</span>비행 목적
                                   </Label>
                                   <Input
                                     type='select'
@@ -194,24 +190,28 @@ const FlightPlanForm = (props) => {
                                   </Input>
                                 </FormGroup>
                               </Col>
-                              <Col className='list-input' lg={4} md={6} sm={12}>
+                            </Row>
+                          </div>
+                          <div className='search-info-box'>
+                           
+                              {/* <Col className='list-input' lg={4} md={6} sm={12}>
                                 <FormGroup>
                                   <Label for='test'>
-                                    <span className='necessary'>*</span>비행 목적
+                                    <span className='necessary'>*</span>비행 장치
                                   </Label>
                                   <Input
                                     type='select'
                                     name='arcrftTypeCd'
                                     id='arcrftTypeCd'
                                     size='sm'
-                                    // innerRef={props.data}                                            
-                                    // className={classnames({
-                                    // 'is-invalid': props.errors.arcrftTypeCd
-                                    // })}
+                                    innerRef={props.data}                                            
+                                    className={classnames({
+                                    'is-invalid': props.errors.arcrftTypeCd
+                                    })}
                                   >
                                   <option value=''>= 선택 =</option>
-                                  {/* CDNOT 코드연동 필요 */}
-                                  {/* {ARCTFT_TYPE_CD.map(item => {
+                                  CDNOT 코드연동 필요
+                                  {ARCTFT_TYPE_CD.map(item => {
                                   return (
                                       <option
                                       value={item.code}
@@ -224,11 +224,12 @@ const FlightPlanForm = (props) => {
                                       {item.codeNm}
                                       </option>
                                   );
-                                  })} */}
+                                  })}
                                   </Input>
                                 </FormGroup>
-                              </Col>
-                              <Col className='list-input' lg={4} md={6} sm={12}>
+                              </Col> */}
+                             
+                              {/* <Col className='list-input' lg={4} md={6} sm={12}>
                                 <FormGroup>
                                   <Label for='test'>
                                     <span className='necessary'></span>비행 방식
@@ -237,21 +238,20 @@ const FlightPlanForm = (props) => {
                                     type='text'
                                     id='arcrftModelNm'
                                     name='arcrftModelNm'
-                                    // innerRef={props.data}
+                                    innerRef={props.data}
                                     size='sm'
                                     placeholder=''
-                                    // className={classnames({
-                                    // 'is-invalid': props.errors.arcrftModelNm
-                                    // })}
+                                    className={classnames({
+                                    'is-invalid': props.errors.arcrftModelNm
+                                    })}
                                   />
-                                  {/* {props.errors && props.errors.arcrftModelNm && (
+                                  {props.errors && props.errors.arcrftModelNm && (
                                       <FormFeedback>
                                       {props.errors.arcrftModelNm.message}
                                       </FormFeedback>
-                                  )} */}
+                                  )}
                                 </FormGroup>
-                              </Col>
-                            </Row>
+                              </Col> */}
                           </div>                                
                         </dt>
 
@@ -265,6 +265,205 @@ const FlightPlanForm = (props) => {
                               비행 구역 설정
                               </Button.Ripple>
                           </div>
+                          <div className='search-info-box'>
+                            <Row>
+                              <Col className='list-input' lg={4} md={6} sm={12}>
+                                <FormGroup>
+                                  <Label for='test'>
+                                    <span className='necessary'>*</span>좌표1
+                                  </Label>
+                                  <Input
+                                    type='text'
+                                    id='ownerNm'
+                                    name='ownerNm'                                                    
+                                    size='sm'
+                                    placeholder=''        
+                                    readOnly
+                                  />
+                                </FormGroup>
+                              </Col>
+                              <Col className='list-input' lg={5} md={7} sm={12}>
+                                <FormGroup className='m_ft'>
+                                  <div className='m_ft_box'>
+                                    <Label for='test'>
+                                      <span className='necessary'>*</span> 반경 / 고도
+                                    </Label>
+                                    <Input
+                                      type='text'
+                                      id='ownerNm'
+                                      name='ownerNm'                                                    
+                                      size='sm'
+                                      placeholder='반경'    
+                                      readOnly                                                      
+                                    />
+                                  </div>
+                                  <div className='m_ft_box'>
+                                    <Input
+                                      type='text'
+                                      id='ownerNm'
+                                      name='ownerNm'                                                    
+                                      size='sm'
+                                      placeholder='고도'   
+                                      readOnly                                                
+                                    />
+                                  </div>
+                                </FormGroup>
+                              </Col>        
+                            </Row>
+                          </div>
+                          <div className='search-info-box'>
+                            <Row>
+                              <Col className='list-input' lg={4} md={6} sm={12}>
+                                <FormGroup>
+                                  <Label for='test'>
+                                    <span className='necessary'>*</span>좌표2
+                                  </Label>
+                                <Input
+                                  type='text'
+                                  id='ownerNm'
+                                  name='ownerNm'                                                    
+                                  size='sm'
+                                  placeholder=''  
+                                  readOnly                                                 
+                                />
+                                </FormGroup>
+                              </Col>                                            
+                              <Col className='list-input' lg={5} md={6} sm={12}>
+                                <FormGroup>
+                                  <Label for='test'>
+                                    <span className='necessary'>*</span> 비행방식
+                                  </Label>
+                                <Input
+                                  type='text'
+                                  id='ownerNm'
+                                  name='ownerNm'                                                    
+                                  size='sm'
+                                  placeholder=''  
+                                  readOnly                                                 
+                                />
+                                </FormGroup>
+                              </Col>                      
+                              <Col className='list-input' lg={4} md={6} sm={12}>
+                                <FormGroup>
+                                  <Label for='test'>
+                                    <span className='necessary'>*</span>좌표3
+                                  </Label>
+                                <Input
+                                  type='text'
+                                  id='ownerNm'
+                                  name='ownerNm'                                                    
+                                  size='sm'
+                                  placeholder=''  
+                                  readOnly                                                 
+                                />
+                                </FormGroup>
+                              </Col>                           
+                                                                                                                   
+                            </Row>
+                          </div>
+                        </dt>
+                        <dt>
+                          <div className='search-info-ti d-flex justify-content-between'>
+                            <h4 className='ti'>조종사 정보</h4>
+                              <Button.Ripple 
+                                color="primary"
+                                onClick={props.openModal}
+                              >
+                               조종사 조회 
+                              </Button.Ripple>
+                          </div>
+                          <div className='search-info-box'>
+                            <Row>
+                              <Col className='list-input' lg={4} md={6} sm={12}>
+                                <FormGroup>
+                                  <Label for='test'>
+                                    <span className='necessary'>*</span>그룹명
+                                  </Label>
+                                  <Input
+                                    type='text'
+                                    id='ownerNm'
+                                    name='ownerNm'                                                    
+                                    size='sm'
+                                    placeholder=''        
+                                    readOnly
+                                  />
+                                </FormGroup>
+                              </Col>
+                              <Col className='list-input' lg={4} md={6} sm={12}>
+                                <FormGroup>
+                                  <Label for='test'>
+                                    <span className='necessary'>*</span>성명
+                                  </Label>
+                                <Input
+                                  type='text'
+                                  id='ownerNm'
+                                  name='ownerNm'                                                    
+                                  size='sm'
+                                  placeholder=''    
+                                  readOnly                                               
+                                />
+                                </FormGroup>
+                              </Col>
+                            </Row>
+                          </div>
+                          <div className='search-info-box'>
+                            <Row>
+                            <Col className='list-input' lg={4} md={7} sm={12}>
+                                <FormGroup className='m_ft'>
+                                  <div className='m_ft_box'>
+                                    <Label for='test'>
+                                      <span className='necessary'>*</span> 핸드폰 번호
+                                    </Label>
+                                    <Input
+                                      type='text'
+                                      id='ownerNm'
+                                      name='ownerNm'                                                    
+                                      size='sm'
+                                      placeholder='+82'    
+                                      readOnly                                                      
+                                    />
+                                  </div>
+                                  <div className='m_ft_box'>
+                                    <Input
+                                      type='text'
+                                      id='ownerNm'
+                                      name='ownerNm'                                                    
+                                      size='sm'
+                                      placeholder='010-0000-0000'
+                                      readOnly 
+                                                                                  
+                                    />
+                                  </div>
+                                </FormGroup>
+                              </Col>                     
+                              <Col className='list-input' lg={4} md={6} sm={12}>
+                                <FormGroup>
+                                    <Label for='test'>
+                                      <span className='necessary'>*</span>이메일
+                                    </Label>
+                                    <Input
+                                      type='text'
+                                      id='ownerNm'
+                                      name='ownerNm'                                                    
+                                      size='sm'
+                                      placeholder=''    
+                                      readOnly                                                      
+                                    />
+                                 </FormGroup>
+                              </Col>                                                                                        
+                            </Row>
+                          </div>
+                        </dt>
+                        <dt>
+                          <div className='search-info-ti d-flex justify-content-between'>
+                            <h4 className='ti'>기체 정보</h4>
+                              <Button.Ripple 
+                                color="primary"
+                                onClick={props.openModal}
+                              >
+                                　기체 조회　   
+                              </Button.Ripple>
+                          </div>
                           <div className='search-info-box'>
                             <Row>
                               <Col className='list-input' lg={4} md={6} sm={12}>
diff --git a/src/containers/basis/dron/BasisDronDetailContainer.js b/src/containers/basis/dron/BasisDronDetailContainer.js
index 5da5703..045f758 100644
--- a/src/containers/basis/dron/BasisDronDetailContainer.js
+++ b/src/containers/basis/dron/BasisDronDetailContainer.js
@@ -44,11 +44,11 @@ export const BasisDronDetailContainer = props => {
       prdctNum: '',
       imageUrl: '',
       wghtTypeCd: '',
-      ownerSno: '',
       createDt: '',
       createUserId: '',
       updateUserId: '',
       updateDt: '',
+      ownerSno: '',
       ownerNm: '',
       hpno: ''
     },
diff --git a/src/containers/basis/dron/BasisIdntfContainer.js b/src/containers/basis/dron/BasisIdntfContainer.js
index 083a3e9..5e67cc9 100644
--- a/src/containers/basis/dron/BasisIdntfContainer.js
+++ b/src/containers/basis/dron/BasisIdntfContainer.js
@@ -14,6 +14,8 @@ export const BasisIdntfContainer = props => {
     id: '',
     idntfNum: '',
     idntfTypeCd: 'DRON',
+    ownerNm:'',
+    hpno:'',
     isSave: false
   });