결재 커밋밋

WebContent/WEB-INF/view/approval/amaranthApprovalSubmit.jsp

@@ -175,8 +175,8 @@ var g_appLineList = [];      // 결재라인 배열
 var g_selectedEmpIdx = -1;   // 사원 검색 목록에서 선택된 인덱스
 var g_selectedLineIdx = -1;  // 결재라인에서 선택된 인덱스
 var g_empListLoaded = false;  // 사원 목록 로드 여부
-var g_currentUserEmpSeq = "<%=CommonUtils.checkNull(((com.pms.common.bean.PersonBean)session.getAttribute(Constants.PERSON_BEAN)).getEmpseq())%>";
-var g_currentUserName = "<%=CommonUtils.checkNull(((com.pms.common.bean.PersonBean)session.getAttribute(Constants.PERSON_BEAN)).getUserName())%>";
+var g_currentUserEmpSeq = "<%=empseq%>";
+var g_currentUserName = "<%=connectUserName%>";
 
 // 파라미터
 var g_targetType = "<%=targetType%>";

WebContent/WEB-INF/view/approval/approvalList.jsp

@@ -8,39 +8,65 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> 
 <title><%=Constants.SYSTEM_NAME%></title>
 
-<%-- [주석 처리] 기존 JSTL 페이징 변수 - Amaranth API AJAX 방식으로 변경
+<!-- //JSTL 변수선언 -->
 <c:set var="totalCount" value="${empty TOTAL_COUNT?0:TOTAL_COUNT}" />
 <c:set var="maxPage" value="${empty MAX_PAGE_SIZE?1:MAX_PAGE_SIZE}" />
 <c:set var="nPage" value="${empty param.page?1:param.page}" />
 <c:set var="pageIndex" value="${(nPage-1)/10}" />
 <c:set var="nextPage" value="${empty NEXT_PAGE?1:NEXT_PAGE}" />
 <c:set var="prevPage" value="${empty PREV_PAGE?1:PREV_PAGE}" />
---%>
 
 <script type="text/javascript">
+
+<%-- [주석 처리] Amaranth API AJAX 방식 결재 목록 조회 - 일반 결재로 변경
 // 현재 페이지 및 페이징 상태
 var currentPage = 1;
 var maxPage = 1;
 var totalCount = 0;
+--%>
 
 $(function(){
 	$(document).ready(function(){
 		fnc_datepick();
-		// 페이지 로드 시 Amaranth API로 결재 목록 조회
-		fn_loadApprovalList(1);
 	});
 	
 	$(".searchInput").keyup(function(e){
-		if(e.keyCode == 13){
-			fn_searchAmaranth();
+		var keyCode = e.keyCode;
+		if(keyCode == 13){
+			fn_search();
 		}
 	});
 	
 	$("#btnSearch").click(function(){
-		fn_searchAmaranth();
+		fn_search();
 	});
+	
+	$(".btnApprovalDetail").click(function(){
+		var approvalObjId = $(this).attr("data-APPROVAL_OBJID");
+		var routeObjId = $(this).attr("data-ROUTE_OBJID");
+		var params = "?approvalObjId="+approvalObjId;
+		params += "&routeObjId="+routeObjId;
+		window.open("/approval/approvalDetail.do"+params,"approvalDetailPopup","width=650 height=620 menubar=no status=no");
+	});
+	
+    $("X.targetTypeA").each( function() {
+      var code = $(this).text();
+      var codeName = fnc_getApprovalTargetName(code);
+      $(this).text(codeName);
+    } );
 });
 
+function fn_search(){
+	document.form1.action = "/approval/approvalList.do";
+	document.form1.submit();
+}
+
+function openApprovalPop(){
+	window.open("/approval/approvalDetail.do","specDataPopUp","width=650 height=730 menubar=no status=no");
+}
+
+<%-- [주석 처리] Amaranth API AJAX 방식 함수들 - 필요 시 주석 해제하여 사용
+
 // Amaranth API 결재 문서 목록 조회
 function fn_loadApprovalList(page){
 	currentPage = page;
@@ -154,13 +180,8 @@ function fn_renderPaging(nPage, maxPage, totalCount){
 	
 	$("#pagingArea").html(html);
 }
-
-<%-- [주석 처리] 기존 form submit 방식 검색 - AJAX 방식으로 변경
-function fn_search(){
-	document.form1.action = "/approval/approvalList.do";
-	document.form1.submit();
-}
 --%>
+
 </script>
 
 </head> 
@@ -184,17 +205,33 @@ function fn_search(){
 			<table>
 					<tr>
 						<td class="">
-							<label for="" class="">검색어</label>
+							<label for="" class="">제목</label>
 						</td>
 						<td>
-							<input type="text" name="search_approvalTitle" id="search_approvalTitle" class="searchInput" value="" style="width:250px;" placeholder="제목/내용/작성자"/>
+							<input type="text" name="search_approvalTitle" id="search_approvalTitle" class="searchInput" value="${param.search_approvalTitle}" style="width:250px;"/>
 						</td>
 						<td class="">
-							<label for="" class="">기안일</label>
+							<label for="" class="">상신일</label>
 						</td>
 						<td>
-							<input type="text" name="search_fromDate" id="search_fromDate" value="" class="input_date_solo searchInput"> ~ <input type="text" name="search_toDate" id="search_toDate" value="" class="input_date_solo searchInput">
+							<input type="text" name="search_fromDate" id="search_fromDate" value="${param.search_fromDate}" class="input_date_solo searchInput"> ~ <input type="text" name="search_toDate" id="search_toDate" value="${param.search_toDate}" class="input_date_solo searchInput">
 						</td>
+						<td class="">
+							<label for="" class="">상신자</label>
+						</td>
+						<td>
+						    <input type="text" name="search_writerUserName" id="search_writerUserName" value="${param.search_writerUserName}" class="searchInput">
+						</td>
+						<%-- <td class="">
+							<label for="" class="">상태</label>
+						</td>
+						<td>
+							<select name="search_approvalStatus" id="search_approvalStatus">
+								<option value="">전체</option>
+								<option value="inProcess" ${param.search_approvalStatus eq 'inProcess'?'selected':''}>결재중</option>
+								<option value="complete" ${param.search_approvalStatus eq 'complete'?'selected':''}>결재완료</option>
+							</select>
+						</td> --%>
 					</tr>
 			</table>
 		</div>
@@ -204,20 +241,20 @@ function fn_search(){
 					<colgroup>
                         <col width="5%">
                         <col width="10%">
-                        <col width="12%">
+                        <col width="10%">
                         <col width="*">
                         <col width="10%">
-                        <col width="15%">
-					    <col width="8%">
+                        <col width="20%">
+					    <col width="10%">
 					</colgroup>
 					<thead>
 						<tr class="plm_thead">
 							<td>No</td>
-							<td>문서번호</td>
-							<td>양식명</td>
+							<td>결재번호</td>
+							<td>대상구분</td>
 							<td>제목</td>
-							<td>기안일</td>
-							<td>기안자</td>
+							<td>상신일</td>
+							<td>상신자</td>
 							<td>상태</td>
 						</tr>
 				</table>
@@ -227,23 +264,101 @@ function fn_search(){
 					<colgroup>
                         <col width="5%">
                         <col width="10%">
-                        <col width="12%">
+                        <col width="10%">
                         <col width="*">
                         <col width="10%">
-                        <col width="15%">
-					    <col width="8%">
+                        <col width="20%">
+					    <col width="10%">
 					</colgroup>
-					<tbody id="approvalListBody">
-						<tr style="text-align:center;">
-							<td colspan="7">조회중...</td>
-						</tr>
-					</tbody>
+					<c:choose>
+						<c:when test="${!empty LIST}">
+							<c:forEach var="item" items="${LIST}" varStatus="status">
+								<tr style="text-align:center;">
+									<td>${item.RNUM}</td>
+									<td>${item.ROUTE_NO}</td>
+									<td class="targetType">${item.TARGET_NAME}</td>
+									<td class="align_l4"><a href="#" class="btnApprovalDetail" data-APPROVAL_OBJID="${item.APPROVAL_OBJID}" data-ROUTE_OBJID="${item.ROUTE_OBJID}">${item.APPROVAL_TITLE}</a></td>
+									<td>${item.ROUTE_REGDATE}</td>
+									<td>${item.WRITER_DEPT_NAME} ${item.WRITER_USER_NAME}</td>
+									<td>
+										<c:choose>
+											<c:when test="${item.STATUS eq 'inProcess'}">
+												결재중
+											</c:when>
+											<c:when test="${item.STATUS eq 'reject'}">
+												반려
+											</c:when>
+											<c:when test="${item.STATUS eq 'complete'}">
+												결재완료
+											</c:when>
+											<c:when test="${item.STATUS eq 'cancel'}">
+												결재취소
+											</c:when>
+											<c:otherwise>
+												${item.STATUS}
+											</c:otherwise>
+										</c:choose>
+									</td>
+								</tr>
+							</c:forEach>
+						</c:when>
+						<c:otherwise>
+							<tr style="text-align:center;">
+								<td colspan="7">조회된 정보가 없습니다.</td>
+							</tr>						
+						</c:otherwise>
+					</c:choose>
 				</table>
 			</div>
 	      </div>
 			<div class="pdm_page">
-	      		<div class="page_pro" id="pagingArea">
+			
+			<%-- 
+			nPage ${nPage}
+			prevPage ${prevPage}
+			maxPage ${maxPage}
+			nextPage ${nextPage}
+			totalCount ${totalCount}
+			 --%>
+			
+	     	 <input type="hidden" name="page" id="page" value="${nPage}">
+	      	<c:if test="${!empty LIST}">
+	      	<div class="page_pro">
+	        		<table>
+						<tr>
+						<c:choose>
+							<c:when test="${nPage > 1}">
+								<td><a href="javascript:fnc_goPrev('${prevPage}');">prev</a></td>
+							</c:when>
+							<c:otherwise>
+								<td class="no_more_page">prev</td>
+							</c:otherwise>
+						</c:choose>
+						<c:forEach var="v" begin="${nPage>5?nPage-5:1}" end="${nPage>5?nPage+4:10}" step="1" varStatus="status">
+							<c:if test="${status.index -1 < maxPage}">
+								<c:choose>
+									<c:when test="${status.index eq nPage}">
+										<td><a href="#" class="now_page">${nPage}</a></td>
+									</c:when>
+									<c:otherwise>
+										<td><a href="javascript:fnc_goPage('${status.index}');">${status.index}</a></td>
+									</c:otherwise>
+								</c:choose>
+							</c:if>
+						</c:forEach>
+					 	<c:choose>
+					 		<c:when test="${nPage < maxPage}">
+					 			<td><a href="javascript:fnc_goNext('${nextPage}');">next</a></td>
+					 		</c:when>
+					 		<c:otherwise>
+					 			<td class="no_more_page">next</td>
+					 		</c:otherwise>
+					 	</c:choose>
+						</tr>
+					</table>
+					<p id="adminPageCount">총 ${totalCount}건</p>
 	      		</div>
+	      		</c:if>    
 	      	</div>
 	</div>
 	</div>

WebContent/WEB-INF/view/main/header.jsp

@@ -411,8 +411,8 @@ function fn_setApprovalCnt(){
 			        	
 			        	<!-- 우측 버튼 영역 -->
 			        	<td style="text-align: right; padding-right: 10px;">
-			        		<!-- <span id="blink" style="padding: 3px 6px; border-radius:3px; font-size:10px; background-color:#ff6b35; color:#fff; cursor:pointer; margin-right: 5px;" class="btnApprovalList blink_none">
-					        결재 <label class="notice_no">0</label>건</span> -->
+			        		<span id="blink" style="padding: 3px 6px; border-radius:3px; font-size:10px; background-color:#ff6b35; color:#fff; cursor:pointer; margin-right: 5px;" class="btnApprovalList blink_none">
+					        결재 <label class="notice_no">0</label>건</span>
 					        
 					        <a href="#" onclick="javascript:fn_openBoardList('qna');" style="color:#fff;background-color:#676868; border-radius:2px; padding:2px 4px; text-decoration: none; display: inline-block; font-size:9px; margin-right: 5px;">Q&A</a>