권한정리 - 비행계획승인

src/components/basis/flight/aprv/FlightPlanAprvGrid.js

@@ -7,50 +7,18 @@ import { useSelector } from 'react-redux';
 
 const FlightPlanAprvGrid = ({
   data,
-  // columns,
   handleChangeSelected,
   handleClickAprv,
-  joinList,
-  selectGroup,
-  handleChangeCheckbox,
   paginationPerPage,
   pagination,
   paginationRowsPerPageOptions,
   handlerPageChange,
-  total
+  total,
+  isMyGroup
 }) => {
-  const [aprvAuth, setAprvAuth] = useState('');
   const { loading } = useSelector(state => state.loadingReducer);
 
-  useEffect(() => {
-    joinList.forEach(c => {
-      if (c.groupId === selectGroup.groupId) {
-        if (c.groupAuthCd === 'NORMAL') {
-          setAprvAuth(false);
-        } else if (c.groupAuthCd === 'MASTER' || c.groupAuthCd === 'LEADER') {
-          setAprvAuth(true);
-        }
-      }
-    });
-  }, [selectGroup]);
-
   const columns = [
-    // {
-    //   id: '',
-    //   name: '',
-    //   minWidth: '50px',
-    //   cell: (row, i) => (
-    //     <>
-    //       <CustomInput
-    //         type='checkbox'
-    //         id={`check${i + 1}`}
-    //         name={`check${i + 1}`}
-    //         // checked={checkState}
-    //         onChange={e => handleChangeCheckbox(e, row)}
-    //       />
-    //     </>
-    //   )
-    // },
     {
       id: 'planSno',
       name: '번호',
@@ -87,7 +55,10 @@ const FlightPlanAprvGrid = ({
       name: '상세보기',
       cell: row => {
         return (
-          <Link to={`/basis/flight/plan/detail/${row.planSno}`} size='sm'>
+          <Link
+            to={`/basis/flight/plan/detail/${row.planSno}?type=aprv`}
+            size='sm'
+          >
             상세보기
           </Link>
         );
@@ -109,7 +80,7 @@ const FlightPlanAprvGrid = ({
             color='primary'
             size='sm'
             onClick={handleClickAprv('aprv')}
-            {...(aprvAuth ? {} : { disabled: true })}
+            {...(isMyGroup ? {} : { disabled: true })}
           >
             승인
           </Button.Ripple>
@@ -118,7 +89,7 @@ const FlightPlanAprvGrid = ({
             size='sm'
             style={{ marginLeft: 10 }}
             onClick={handleClickAprv('notAprov')}
-            {...(aprvAuth ? {} : { disabled: true })}
+            {...(isMyGroup ? {} : { disabled: true })}
           >
             미승인
           </Button.Ripple>

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

@@ -46,21 +46,13 @@ const FlightPlanGrid = ({
       id: 'moveDetail',
       name: '상세보기',
       cell: row => {
-        // let mine = false;
-        // if (user.authId === 'SUPER') {
-        //   mine = true;
-        // } else if (user.authId === 'ADMIN' || user.authId === 'USER') {
-        //   if (row.createUserId === user.userId) {
-        //     mine = true;
-        //   }
-        // }
-
         return (
-          <>
+          <Link
-            <Link to={`/basis/flight/plan/detail/${row.planSno}`} size='sm'>
+            to={`/basis/flight/plan/detail/${row.planSno}?type=plan`}
+            size='sm'
+          >
             상세보기
           </Link>
-          </>
         );
       }
     }

src/containers/basis/flight/aprv/FlightPlanAprvContainer.js

@@ -28,7 +28,6 @@ const initSearchData = {
 
 const FlightPlanAprvContainer = () => {
   const dispatch = useDispatch();
-  const history = useHistory();
   const [searchData, setSearchData] = useState(initSearchData);
   const [selPlanSnoList, setSelPlanSnoList] = useState([]);
   const {
@@ -47,6 +46,10 @@ const FlightPlanAprvContainer = () => {
     desc: '',
     color: ''
   });
+
+  //승인/미승인버튼 활성/비활성 제어
+  const [isMyGroup, setIsMyGroup] = useState();
+
   const columns = [
     {
       // id: 'groupNm',
@@ -104,7 +107,8 @@ const FlightPlanAprvContainer = () => {
               handleGroupSelect({
                 groupId: row?.groupId,
                 groupNm: row?.groupNm,
-                groupAuthCd: row?.groupAuthCd
+                groupAuthCd: row?.groupAuthCd,
+                myGroupAuthCd: row?.myGroupAuthCd
               });
             }}
           >
@@ -115,18 +119,16 @@ const FlightPlanAprvContainer = () => {
     }
   ];
 
-  const handleGroupSelect = ({ groupId, groupNm, groupAuthCd }) => {
+  const handleGroupSelect = ({
+    groupId,
+    groupNm,
+    groupAuthCd,
+    myGroupAuthCd
+  }) => {
     const param = searchData;
-
     param.cstmrSno = user.cstmrSno;
     param.groupId = groupId;
-    // if (groupAuthCd === 'CREATER' || groupAuthCd === 'ADMIN') {
+
-    if (
-      groupAuthCd === 'MASTER' ||
-      groupAuthCd === 'LEADER' ||
-      user.authId === 'SUPER' ||
-      user.authId === 'ADMIN'
-    ) {
     dispatch(
       FlightAction.FLIGHT_PLAN_GROUP_SELECT({
         cstmrSno: user.cstmrSno,
@@ -147,15 +149,21 @@ const FlightPlanAprvContainer = () => {
       };
     });
     dispatch(FlightAction.FLIGHT_APRV_LIST.request({ ...param, page: 1 }));
-    } else {
+
-      setModal({
+    //승인/미승인버튼 활성/비활성 제어
-        isOpen: true,
+    let my = false;
-        title: '권한 확인',
+    if (user.authId === 'SUPER') {
-        desc: '승인정보 확인을 위해서는 운영자 권한이 필요합니다. 운영자에게 권한을 부여받고 다시 시도해 주세요.',
+      my = true;
-        color: 'info'
+    } else if (user.authId === 'ADMIN') {
-      });
+      if (myGroupAuthCd) {
-      return;
+        my = true;
+      }
+    } else if (user.authId === 'USER') {
+      if (groupAuthCd) {
+        my = true;
+      }
     }
+    setIsMyGroup(my);
   };
 
   const handlerGroupCancel = () => {
@@ -252,39 +260,9 @@ const FlightPlanAprvContainer = () => {
 
   return (
     <CustomMainLayout title={'비행계획서 승인'}>
-      {/* <div className='pal-card-box'> */}
+      <div className='pal-card-box'>
-      <div className='mt-2 pal-card-box'>
         <Row>
-          {/* <Col sm='12'>
-            <FlightPlanAprvSearch
-              searchData={searchData}
-              handleChangeSearchData={handleChangeSearchData}
-              handleSearch={handleSearch}
-            />
-            <FlightPlanAprvGrid
-              data={aprvList}
-              columns={columns}
-              handleChangeSelected={handleChangeSelected}
-              handleClickAprv={handleClickAprv}
-            />
-
-            <FlightPlanGrid
-              planListData={aprvList}
-              handleMoveDetail={handleMoveDetail}
-              handleChangeSelected={handleChangeSelected}
-              handleClickAprv={handleClickAprv}
-            />
-          </Col> */}
-          {/* <Col sm='4'>
-            <FlightPlanAprvGroupGrid
-              data={joinList}
-              count={joinListCount}
-              columns={columns}
-            />
-          </Col> */}
-          {/* <Col sm='4'> */}
           <Col sm='12' lg='12'>
-
             {user ? (
               <>
                 <FlightPlanAprvGroupGrid
@@ -317,7 +295,6 @@ const FlightPlanAprvContainer = () => {
                   handlerPageChange={onChangePage}
                   data={aprvList}
                   handleClickAprv={handleClickAprv}
-                  // joinList={joinList}
                   {...(user?.authId === 'SUPER' || user?.authId === 'ADMIN'
                     ? { joinList: groupList }
                     : { joinList: joinList })}
@@ -329,11 +306,11 @@ const FlightPlanAprvContainer = () => {
                   paginationPerPage={10}
                   paginationRowsPerPageOptions={[10, 20, 30, 40]}
                   total={total}
+                  isMyGroup={isMyGroup}
                   // handleChangeCheckbox={handleChangeCheckbox}
                 />
               </>
             ) : (
-              // <div className='no-dataTable'>
               <div className='mt-2 no-dataTable'>
                 그룹 목록에서 상세보기를 클릭하세요.
               </div>

src/containers/basis/flight/plan/FlightPlanDetailContainer.js

@@ -8,9 +8,8 @@ import {
   initFlight,
   initFlightBas
 } from '../../../../modules/basis/flight/models/basisFlightModel';
-import { AiFillPropertySafety } from 'react-icons/ai';
 import { ErrorModal } from '../../../../components/modal/ErrorModal';
-import { CgArrowLeftR } from 'react-icons/cg';
+import qs from 'qs';
 
 const initModal = {
   area: false,
@@ -18,9 +17,10 @@ const initModal = {
   arcrft: false
 };
 
-const FlightPlanDetailContainer = () => {
+const FlightPlanDetailContainer = props => {
   const dispatch = useDispatch();
   const urlParams = useParams();
+  const { search } = useLocation();
   const { user } = useSelector(state => state.authState);
   const flightState = useSelector(state => state.flightState);
   const { detail, pilotSelect, arcrftSelect, areaList, selectGroup } =
@@ -52,7 +52,10 @@ const FlightPlanDetailContainer = () => {
     }
   }, [date]);
 
-  //본인이 등록한 기체가 아니면 true
+  //목록에서 넘어오는지 승인에서 넘어오는지 체크
+  const { type } = qs.parse(search, { ignoreQueryPrefix: true });
+
+  //본인이 등록한 기체가 아니거나 승인에서 넘어오면 true
   const [isDisabled, setIsDisabled] = useState(false);
 
   useEffect(() => {
@@ -71,6 +74,7 @@ const FlightPlanDetailContainer = () => {
       groupId: sessionStorage.getItem('groupId')
     });
 
+    if (type === 'plan') {
       if (user?.authId === 'ADMIN' || user?.authId === 'USER') {
         if (detail?.createUserId !== '') {
           if (detail?.createUserId != user.userId) {
@@ -80,6 +84,9 @@ const FlightPlanDetailContainer = () => {
           }
         }
       }
+    } else if (type === 'aprv') {
+      setIsDisabled(true);
+    }
   }, [detail]);
 
   useEffect(() => {