Merge branch 'master' of http://118.219.150.34:50501/DBNT/kcscDev

egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus.jsx

@@ -1,13 +1,41 @@
-import React from 'react';
+import React, { useState, useEffect } from 'react';
-import { Link } from 'react-router-dom';
+import { Link, useLocation, useNavigate } from 'react-router-dom';
+
+import * as EgovNet from 'api/egovFetch';
 
 import URL from 'constants/url';
 
 import { default as EgovLeftNav } from 'components/leftmenu/EgovLeftNavAdmin';
-
+import EgovPagingPaginationInfo from 'components/EgovPagingPaginationInfo';
 
 function ProgressStatus(props) {
 
+    const location = useLocation();
+
+    const [listItem, setListItem] = useState([]);
+    const [paginationInfo, setPaginationInfo] = useState({});
+    const [searchCondition, setSearchCondition] = useState(location.state?.searchCondition || { pageIndex: 1, searchCnd: '0', searchWrd: '' });
+
+    const requestOptions = {
+        method: "GET",
+        headers: {
+            'Content-type': 'application/json'
+        }
+    }
+
+    const getList = (searchCondition) => {  
+        
+        EgovNet.requestFetch(`/contents/api/popup-manage/list?page=${searchCondition.pageIndex-1}&size=10&sort=popupSeq,desc`,
+            requestOptions,
+            function (resp) {
+                console.log('%o', resp);
+                setListItem(resp.result.listPopup);
+                setPaginationInfo({...resp.result.paginationInfo});
+            }
+        );
+        
+    }
+
     const Location = React.memo(function Location() {
         return (
             <div className="location">
@@ -39,7 +67,44 @@ function ProgressStatus(props) {
                             <h1 className="tit_1">진행현황 관리</h1>
                         </div>
 
-                        여기에 구현해주세요.
+                        {/* <!-- 게시판목록 --> */}
+                        <div className="board_list BRD008">
+                                <div className="head">
+                                    <span>번호</span>
+                                    <span>제목</span>
+                                    <span>기간</span>
+                                    <span>사용여부</span>
+                                </div>
+                                <div className="result">                                    
+                                    {/* <!-- case : 데이터 없을때 --> */}
+                                    {listItem.length === 0 &&
+                                        <p className="no_data" key="0">검색된 결과가 없습니다.</p>
+                                    }                                    
+                                    {listItem.map((it)=>(
+                                        <div className='list_item' key={it.seq}>
+                                            <div>{it.number}</div>
+                                        </div>
+                                    ))}
+                                </div>
+                            </div>
+                            {/* <!--// 게시판목록 --> */}
+
+
+
+                            
+
+                            {/* <!-- Paging --> */}
+                            <div className="board-bot">
+                                <div></div>
+                                <EgovPagingPaginationInfo pagination={paginationInfo} setPaginationInfo={setPaginationInfo} moveToPage={passedPage => {
+                                    getList({ ...searchCondition, pageIndex: passedPage })
+                                }} />
+                                <div className="right_col btn1">
+                                    <Link to={URL.ADMIN__CONTENTS__POP_UP__CREATE} className="btn btn_blue_h46 w_100">등록</Link>
+                                </div>
+                                
+                            </div>
+                            {/* <!--/ Paging --> */}
                         {/* <!--// 본문 --> */}
                     </div>
                 </div>

egovframe-template-simple-react-contribution/src/pages/admin/config/CommitteeCodeMgt.jsx

@@ -191,9 +191,8 @@ function CommitteeCodeMgt(props) {
                                 setDepth04List({});
                         }
                     }
-                    
 
-                    alert('삭제 되었습니다.');
+                    //alert('삭제 되었습니다.');
                 }
             );
         };

egovframe-template-simple-react-contribution/src/pages/admin/config/CommitteeCodeMgt/CommitteeCodeRegistrationPopup.jsx

@@ -107,6 +107,7 @@ function CommitteeCodeRegistrationPopup(props) {
                 props.setSearchCondition({...props.searchCondition, paramCodeGroup, paramCodeLevel : props.createOrModifyCondition.paramCodeLevel});
 
                 props.setOpen(false);
+                setInputValues({});
             }
         );
     }