From 2777f47d318d717f649d152ec7df309b83f6c6c0 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Fri, 25 Nov 2022 10:19:06 +0900
Subject: [PATCH] =?UTF-8?q?2022-11-25=2010:18=20=EC=A1=B0=EC=A0=95?=
 =?UTF-8?q?=EC=A7=84=ED=96=89=EC=83=81=EC=84=B8=20=EB=85=B8=EC=B6=9C=20?=
 =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=88=98=EC=A0=95=EC=9E=91=EC=97=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp      | 46 ++++++++++++++---
 .../jsp/kccadr/adjPgrMgr/arm/armDetail.jsp    | 50 ++++++++++++++++++-
 .../jsp/kccadr/adjPgrMgr/arm/armReg.jsp       |  2 +-
 3 files changed, 89 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp
index d39cfbb0..81cdbdee 100644
--- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp
@@ -510,7 +510,8 @@ $(document).ready(function(){
 						<c:forEach var="list" items="${list_mgr}" varStatus="status">
 							<c:if test="${fn:length(list.menuId) eq '6'}">
 								<!-- 사건접수진행시 체크-->
-								<c:if test="${list.menuId ne '400000'}">
+								<c:if test="${list.menuId ne '400000' 
+								and fn:indexOf(list.menuId,'3090')<0}">
 									<c:set var="passMenuId">${list.menuId}</c:set>
 								</c:if>								
 								
@@ -616,12 +617,43 @@ $(document).ready(function(){
 						</c:if>											
 						
 						<!-- 조정권고안 체크-->
-						<c:if test="${lastMenuId eq '400000'}">
-							<script>
-							<!-- 조정진행워크플로우 현재 상태 체크 -->
-								$("#${passMenuId}").addClass("status02");
-								alert("#${passMenuId}");
-							</script>
+						<c:if test="${info.statCd eq '400000'
+							or fn:indexOf(info.statCd,'3090')>-1
+						}">
+						
+							<!-- 조정성립 체크-->
+							<c:if test="${fn:indexOf(passMenuId,'3040')>-1}">
+								<script>
+								//<!-- 조정진행워크플로우 현재 상태 체크 -->
+									$("#3040").addClass("status01");								
+								</script>
+							</c:if>
+	
+							<!-- 직권조정 체크-->						
+							<c:if test="${fn:indexOf(passMenuId,'3060')>-1}">
+								<script>
+								//<!-- 조정진행워크플로우 현재 상태 체크 -->
+									$("#3060").addClass("status01");
+									$("#3061").removeClass("status01");
+								</script>
+							</c:if>
+	
+							<!-- 조정권고안 체크-->						
+							<c:if test="${fn:indexOf(passMenuId,'3030')>-1}">
+								<script>
+								//<!-- 조정진행워크플로우 현재 상태 체크 -->
+									$("#3030").addClass("status01");
+								</script>
+							</c:if>
+													
+							<!-- 불성립 체크-->						
+							<c:if test="${fn:indexOf(passMenuId,'3070')>-1}">
+								<script>
+								//<!-- 조정진행워크플로우 현재 상태 체크 -->
+									$("#3070").addClass("status01");
+								</script>
+							</c:if>	
+							
 						</c:if>
 						
 																																				
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp
index 4e39547a..638cf281 100644
--- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp
@@ -181,6 +181,43 @@
 		});
 	}
 
+	function fnc_aprvl_pop(param){
+		var pop = document.pop;
+		pop.sbmtTyCd.value=param;
+		
+		//commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/adjReqMgrOffAppReqPop.do", '1000', '700', "entInfoPop", $('#pop'));
+		
+		if (param=='201010'){	//20, 30, 40			
+			commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop.do", '1000', '700', "entInfoPop", $('#pop'));
+			//commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop502030.do", '1000', '700', "entInfoPop502030", $('#pop'));
+		
+		}else if (param=='202010'){	//30
+			commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop30.do", '1000', '700', "entInfoPop30", $('#pop'));
+
+		}else if (param=='204010'
+					||	param=='205010'
+					||	param=='302010'
+					||	param=='303010'
+					||	param=='304010'
+					||	param=='305010'
+					||	param=='306010'
+					||	param=='307010'
+				){	//50
+			//204010, 307010, 305010, 304010, 303010, 306010, 302010, 205010
+			commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop50.do", '1000', '700', "entInfoPop50", $('#pop'));	
+
+		}else if (param=='309010'){	//50, 20, 30
+			commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop502030.do", '1000', '700', "entInfoPop502030", $('#pop'));
+		
+		}
+	}
+	
+	//결재 팝업 이후 처리내용
+	function fnc_aprvl_pop_ret(param){
+		//location.reload();
+		fncGoList('list'); //조정진행목록으로
+	}
+	
 	function sendDlvInfoPop() {
 		commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoPop.do", '580', '350', "dlvInfoPop", $('#dlvpop'));
 	}
@@ -263,6 +300,16 @@
 </script>
 </head>
 <body>
+	<!-- 고도화로 추가됨 -->
+	<form id="pop" name="pop" method="post">
+		<input type="hidden" id="adrSeq" name="adrSeq" value="<c:out value="${info.adrSeq}" />" />
+		<input type="hidden" id="adrSn" name="adrSn" value="<c:out value="${info.adrSn}" />" />
+		<input type="hidden" id="adrNo" name="adrNo" value="<c:out value="${info.adrNo}" />" />
+		
+		<!-- 고도화로 추가됨 -->
+		<input type="hidden" id="sbmtTyCd" name="sbmtTyCd" value=""/>
+		
+	</form>
 	<form id="dlvpop" name="dlvpop" method="post">
 		<input type="hidden" id="adrNo" name="adrNo" value="<c:out value="${info.adrNo}" />" />
 		<input type="hidden" id="adrSn" name="adrSn" value="<c:out value="${info.adrSn }" />" />
@@ -574,7 +621,8 @@
 							info.statCd eq '302050'
 							|| info.statCd eq '303090'
 							}">								                            
-                            	<button type="button" class="btnType02" onclick="fnc_aprvl_step_1('303010');">조정권고안 승인 요청</button>
+<!--                             	<button type="button" class="btnType02" onclick="fnc_aprvl_step_1('303010');">조정권고안 승인 요청</button> -->
+                            	<button type="button" class="btnType02" onclick="fnc_aprvl_pop('303010');">조정권고안 승인 요청</button>
 	                            <button type="button" class="btnType06" onclick="fncDel()">삭제</button>
 	                            <button type="button" class="btnType06" onclick="fncUpd()">수정</button>
                             </c:if>   	                        
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armReg.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armReg.jsp
index fefd9f57..7ac84916 100644
--- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armReg.jsp
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armReg.jsp
@@ -286,7 +286,7 @@
                     <div class="btn_wrap btn_layout01">
                         <div class="area_left"></div>
                         <div class="area_right">
-                            <button type="button" class="btnType02" onclick="fncReg('303010');">조정권고안 승인 요청</button>
+<!--                             <button type="button" class="btnType02" onclick="fncReg('303010');">조정권고안 승인 요청</button> -->
                             <button type="button" class="btnType06" onclick="fncReg()">등록</button>
                             <button type="button" class="btnType04" onclick="fncGoList()">취소</button>
                         </div>