From c06790bf66650715dfe41482e15c163442a27c8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?sanguu516=28=EB=B0=95=EC=83=81=ED=98=84=29?=
 <sanguu516@naver.com>
Date: Tue, 26 Sep 2023 17:57:43 +0900
Subject: [PATCH] =?UTF-8?q?laanc=20=EC=8A=B9=EC=9D=B8=20=EC=9A=94=EC=B2=AD?=
 =?UTF-8?q?=20=EA=B8=B0=EC=B2=B4=20=EC=A0=95=EB=B3=B4=20=ED=95=AD=EB=AA=A9?=
 =?UTF-8?q?=EB=85=B8=EC=B6=9C=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/containers/laanc/LaancPlanContainer.js |  24 +++-
 src/views/laanc/LaancStep1.js              | 133 ++++++++++-----------
 2 files changed, 86 insertions(+), 71 deletions(-)

diff --git a/src/containers/laanc/LaancPlanContainer.js b/src/containers/laanc/LaancPlanContainer.js
index 3ae9ba00..b21fbd1b 100644
--- a/src/containers/laanc/LaancPlanContainer.js
+++ b/src/containers/laanc/LaancPlanContainer.js
@@ -130,7 +130,17 @@ export default function LaancPlanContainer({
 
     const currentDate = moment(); // 현재 날짜와 시간을 가져옵니다.
 
-    if (!schFltStDt.isAfter(currentDate) || !schFltEndDt.isAfter(currentDate)) {
+    if (!detailData.commercial) {
+      setModal2({
+        isOpen: true,
+        title: '필수값 입력 오류',
+        desc: '비행 종류(상업/비상업)를 선택해주세요.'
+      });
+      return false;
+    } else if (
+      !schFltStDt.isAfter(currentDate) ||
+      !schFltEndDt.isAfter(currentDate)
+    ) {
       setModal2({
         isOpen: true,
         title: '필수값 입력 오류',
@@ -176,7 +186,11 @@ export default function LaancPlanContainer({
       });
 
       return false;
-    } else if (!detailData.arcrftList[0].arcrftTypeCd) {
+    } else if (
+      !detailData.arcrftList[0].arcrftTypeCd &&
+      (detailData.commercial === 'COMMERCIAL' ||
+        detailData.arcrftList[0].arcrftWdth == '11')
+    ) {
       setModal2({
         isOpen: true,
         title: '필수값 입력 오류',
@@ -184,7 +198,11 @@ export default function LaancPlanContainer({
       });
 
       return false;
-    } else if (!detailData.arcrftList[0].groupNm) {
+    } else if (
+      !detailData.arcrftList[0].groupNm &&
+      (detailData.commercial === 'COMMERCIAL' ||
+        detailData.arcrftList[0].arcrftWdth == '11')
+    ) {
       setModal2({
         isOpen: true,
         title: '필수값 입력 오류',
diff --git a/src/views/laanc/LaancStep1.js b/src/views/laanc/LaancStep1.js
index 252ee53c..7e1981ad 100644
--- a/src/views/laanc/LaancStep1.js
+++ b/src/views/laanc/LaancStep1.js
@@ -124,8 +124,8 @@ export default function LaancStep1({
                   }}
                 >
                   <option value=''>= 선택 =</option>
-                  <option value={'상업'}>상업</option>
-                  <option value={'비상업'}>비상업</option>
+                  <option value={'COMMERCIAL'}>상업</option>
+                  <option value={'NON-COMMERCIAL'}>비상업</option>
                 </Input>
               </FormGroup>
             </Col>
@@ -373,75 +373,72 @@ export default function LaancStep1({
                       }}
                     >
                       <option value=''>= 선택 =</option>
-                      <option value='최대이륙중량 250g 이하'>
-                        = 최대이륙중량 250g 이하 =
-                      </option>
-                      <option value='250g초과 ~ 2kg 이하'>
-                        = 250g초과 ~ 2kg 이하 =
-                      </option>
-                      <option value='2kg초과~7kg이하'>
-                        = 2kg초과~7kg이하 =
-                      </option>
-                      <option value='7kg초과~25kg이하'>
-                        = 7kg초과~25kg이하 =
-                      </option>
-                      <option value='25kg초과'>= 25kg초과 =</option>
+                      <option value='7'>= 최대이륙중량 250g 이하 =</option>
+                      <option value='8'>= 250g초과 ~ 2kg 이하 =</option>
+                      <option value='9'>= 2kg초과~7kg이하 =</option>
+                      <option value='10'>= 7kg초과~25kg이하 =</option>
+                      <option value='11'>= 25kg초과 =</option>
                     </Input>
                   </FormGroup>
                 </Col>
-                <Col className='list-input' md='4'>
-                  <FormGroup>
-                    <Label for='test'>
-                      <span className='necessary'>*</span>기체 종류
-                    </Label>
-                    <Input
-                      type='select'
-                      id='arcrftTypeCd'
-                      name='arcrftTypeCd'
-                      value={data.arcrftList[0].arcrftTypeCd}
-                      size='sm'
-                      onChange={e => {
-                        const { name, value } = e.target;
-                        handleChange({
-                          type: 'arcrft',
-                          name,
-                          value
-                        });
-                      }}
-                    >
-                      <option value=''>= 선택 =</option>
-                      <option>무인 비행기</option>
-                      <option>무인 비행선</option>
-                      <option>무인 멀티콥터</option>
-                      <option>무인 헬리콥터</option>
-                    </Input>
-                  </FormGroup>
-                </Col>
-                <Col className='list-input' md='4'>
-                  <FormGroup>
-                    <Label for='test'>
-                      <span className='necessary'>*</span>기체 신고 번호
-                    </Label>
-                    <Input
-                      type='text'
-                      id='groupNm'
-                      name='groupNm'
-                      // defaultValue={data.email || ''}
-                      value={data.arcrftList[0].groupNm}
-                      size='sm'
-                      onChange={e => {
-                        const { name, value } = e.target;
-                        handleChange({
-                          type: 'arcrft',
-                          name,
-                          value
-                        });
-                      }}
-                      // innerRef={data}
-                      placeholder=''
-                    />
-                  </FormGroup>
-                </Col>
+                {data.commercial === 'COMMERCIAL' ||
+                data.arcrftList[0].arcrftWdth == '11' ? (
+                  <>
+                    <Col className='list-input' md='4'>
+                      <FormGroup>
+                        <Label for='test'>
+                          <span className='necessary'>*</span>기체 종류
+                        </Label>
+                        <Input
+                          type='select'
+                          id='arcrftTypeCd'
+                          name='arcrftTypeCd'
+                          value={data.arcrftList[0].arcrftTypeCd}
+                          size='sm'
+                          onChange={e => {
+                            const { name, value } = e.target;
+                            handleChange({
+                              type: 'arcrft',
+                              name,
+                              value
+                            });
+                          }}
+                        >
+                          <option value=''>= 선택 =</option>
+                          <option>무인 비행기</option>
+                          <option>무인 비행선</option>
+                          <option>무인 멀티콥터</option>
+                          <option>무인 헬리콥터</option>
+                        </Input>
+                      </FormGroup>
+                    </Col>
+                    <Col className='list-input' md='4'>
+                      <FormGroup>
+                        <Label for='test'>
+                          <span className='necessary'>*</span>기체 신고 번호
+                        </Label>
+                        <Input
+                          type='text'
+                          id='groupNm'
+                          name='groupNm'
+                          // defaultValue={data.email || ''}
+                          value={data.arcrftList[0].groupNm}
+                          size='sm'
+                          onChange={e => {
+                            const { name, value } = e.target;
+                            handleChange({
+                              type: 'arcrft',
+                              name,
+                              value
+                            });
+                          }}
+                          // innerRef={data}
+                          placeholder=''
+                        />
+                      </FormGroup>
+                    </Col>
+                  </>
+                ) : null}
               </Row>
             </Col>
           </Row>