터미널ID 추가 작업

src/components/account/register/AccountRegisterForm.js

@@ -203,7 +203,9 @@ export const AccountRegisterForm = ({
       email: '',
       hpno: '',
       clncd: '+82',
-      crtfyNo: ''
+      crtfyNo: '',
+      company: '팔네트웍스',
+      trmnlId: 'SANDBOX-001'
     },
     resolver: yupResolver(SignupSchema)
   });
@@ -289,9 +291,15 @@ export const AccountRegisterForm = ({
 
   let hpno = '';
   let brthdyDate = '';
+  let trmnlId = '';
   const onChangeHandler = e => {
     const { name, value } = e.target;
 
+    if (name === 'company') {
+      trmnlId = value;
+      setValue('trmnlId', trmnlId);
+    }
+
     if (name === 'memberName') {
       setMemberName(value);
     }
@@ -578,7 +586,7 @@ export const AccountRegisterForm = ({
               </Button.Ripple> */}
             </div>
           </FormGroup>
-          <div className='form-group form-password-toggle col-md-6'>
+          <FormGroup tag={Col} md='6'>
             <Label className='form-label' for='userPswd'>
               <span className='necessary'>*</span>비밀번호
             </Label>
@@ -597,8 +605,51 @@ export const AccountRegisterForm = ({
             {errors && errors.userPswd && (
               <FormFeedback>{errors.userPswd.message}</FormFeedback>
             )}
-          </div>
-          <div className='form-group form-password-toggle col-md-6'>
+          </FormGroup>
+
+          <FormGroup tag={Col} md='6'>
+            <Label className='form-label' for='company'>
+              <span className='necessary'>*</span>소속회사
+            </Label>
+            <div className='input-btn'>
+              <Col md='5' xs='12'>
+                <Input
+                  type='select'
+                  name='company'
+                  id='company'
+                  onChange={onChangeHandler}
+                  // innerRef={register}
+                  className={classnames({
+                    'is-invalid': errors.company
+                  })}
+                >
+                  <option value={'SANDBOX-001'}>팔네트웍스</option>
+                  <option value={'ANTOS-001'}>ANTOS</option>
+                  <option value={'JAR-001'}>진에어</option>
+                </Input>
+                {errors && errors.company && (
+                  <FormFeedback>{errors.company.message}</FormFeedback>
+                )}
+              </Col>
+              <Col md='7' xs='12'>
+                <Input
+                  name='trmnlId'
+                  id='trmnlId'
+                  readOnly={true}
+                  onChange={onChangeHandler}
+                  innerRef={register}
+                  className={classnames({
+                    'is-invalid': errors.trmnlId
+                  })}
+                />
+                {errors && errors.trmnlId && (
+                  <FormFeedback>{errors.trmnlId.message}</FormFeedback>
+                )}
+              </Col>
+            </div>
+          </FormGroup>
+
+          <FormGroup tag={Col} md='6'>
             <Label className='form-label' for='confirmUserPaswd'>
               <span className='necessary'>*</span>비밀번호 확인
             </Label>
@@ -617,7 +668,7 @@ export const AccountRegisterForm = ({
             {errors && errors.confirmUserPaswd && (
               <FormFeedback>{errors.confirmUserPaswd.message}</FormFeedback>
             )}
-          </div>
+          </FormGroup>
         </Row>
         <div className='d-flex justify-content-between'>
           <Button.Ripple

src/components/basis/group/BaisGroupForm.js

@@ -77,7 +77,7 @@ export const BasisGroupForm = props => {
                               name='groupId'
                               bsSize='sm'
                               readOnly={true}
-                              value={props.groupData.groupId || ''}
+                              defaultValue={props.groupData.groupId || ''}
                               placeholder=''
                             />
                           </FormGroup>
@@ -107,6 +107,32 @@ export const BasisGroupForm = props => {
                           </FormGroup>
                         </Col>
 
+                        <Col className='list-input' md='4' sm='12'>
+                          <FormGroup>
+                            <Label for='trmnlId'>
+                              <span className='necessary'>*</span>터미널 ID
+                            </Label>
+                            <Input
+                              type='text'
+                              id='trmnlId'
+                              name='trmnlId'
+                              bsSize='sm'
+                              readOnly={true}
+                              // innerRef={register}
+                              defaultValue={props.groupData.trmnlId || ''}
+                              placeholder=''
+                              className={classnames({
+                                'is-invalid': errors.trmnlId
+                              })}
+                            />
+                            {errors && errors.trmnlId && (
+                              <FormFeedback>
+                                {errors.trmnlId.message}
+                              </FormFeedback>
+                            )}
+                          </FormGroup>
+                        </Col>
+
                         {/* <Col className='list-input' md='4' sm='12'>
                         <FormGroup>
                           <Label for='groupauthority'>그룹 구분 코드</Label>

src/containers/basis/group/BasisGroupApprovalContainer.js

@@ -170,6 +170,7 @@ export const BasisGroupApprovalContainer = props => {
 
   const [saveData, setSaveData] = useState({
     cstmrGroupSno: '',
+    trmnlId: '',
     // aprvlYn: 'N', //가입은 USER 로만
     aprvlYn: 'N', //가입은 NORMAL 로만
     aprvUserId: ''
@@ -259,14 +260,10 @@ export const BasisGroupApprovalContainer = props => {
       sortable: false,
       cell: (row, i) => {
         let disa = false;
-
+        let trmnlId = '';
         if (user.authId === 'ADMIN') {
           //모든 그룹 조회 가능
-          const my = groupList?.find(prev => {
-            if (prev.groupId === row?.groupId) {
-              return prev;
-            }
-          });
+          const my = groupList?.find(prev => prev.groupId === row?.groupId);
           if (my.myGroupAuthCd === 'NORMAL') {
             disa = true;
           } else if (!my.myGroupAuthCd) {
@@ -274,11 +271,8 @@ export const BasisGroupApprovalContainer = props => {
           }
         } else if (user.authId === 'USER') {
           //본인 그룹 조회 가능
-          const my = joinList?.find(prev => {
-            if (prev.groupId === row?.groupId) {
-              return prev;
-            }
-          });
+          const my = joinList?.find(prev => prev.groupId === row?.groupId);
+          trmnlId = my?.trmnlId;
           if (my?.groupAuthCd === 'NORMAL') {
             disa = true;
           }
@@ -288,7 +282,7 @@ export const BasisGroupApprovalContainer = props => {
           <Button.Ripple
             color='primary'
             className='badge badge-primary'
-            onClick={() => handlerAprvConfirm(row?.cstmrGroupSno)}
+            onClick={() => handlerAprvConfirm(row?.cstmrGroupSno, trmnlId)}
             disabled={disa}
           >
             승인처리
@@ -327,19 +321,19 @@ export const BasisGroupApprovalContainer = props => {
     param.page = page;
     dispatch(Actions.APPROVAL_LIST.request({ searchParams: param }));
   };
-  const handlerAprvConfirm = cstmrGroupSno => {
+  const handlerAprvConfirm = (cstmrGroupSno, trmnlId) => {
     setModal({
       isOpen: true,
       title: '승인 확인',
       desc: '해당 사용자를 승인 처리 하시겠습니까?'
     });
-
     //승인처리 시 권한부여 O
     setSaveData({
       cstmrGroupSno: cstmrGroupSno,
       aprvlYn: 'Y',
       aprvUserId: user?.userId,
-      groupAuthCd: 'NORMAL'
+      groupAuthCd: 'NORMAL',
+      trmnlId: trmnlId
     });
   };
 

src/containers/basis/group/BasisGroupDetailContainer.js

@@ -38,6 +38,7 @@ export const BasisGroupDetailContainer = () => {
 
   useEffect(() => {
     setGroupData({
+      trmnlId: user?.trmnlId,
       groupId: newGroupId,
       groupNm: '',
       type: 'create',
@@ -63,6 +64,7 @@ export const BasisGroupDetailContainer = () => {
 
   const handlerCreate = data => {
     const saveData = {
+      trmnlId: groupData.trmnlId,
       createDt: '',
       cstmrSno: groupData.cstmrSno,
       groupId: groupData.groupId,

src/modules/control/gp/models/controlGpModel.ts

@@ -118,6 +118,7 @@ export interface ControlGroupAuthData {
   arcrftSno: number;
   idntfNum: string;
   createUserId: string;
+  trmnlId: string;
 }
 
 export interface ControlGpFlightPlanDataList