tolag3/kcc_adr_advc_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/hylee/kcc_adr_advc_git

Browse Source
This commit is contained in:
myname 2023-05-11 16:38:25 +09:00
commit 1246d6341e
8 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/egovframework/egovProps/globals_local.properties
View File

@ -33,8 +33,8 @@ Globals.DriverClassName=cubrid.jdbc.driver.CUBRIDDriver
#\ud074\ub77c\uc6b0\ub4dc \uc11c\ubc84
#Globals.Url=jdbc:cubrid:158.247.225.133:30000:kcc_adrs4:::?charset=utf8
#\uac1c\ubc1c\uc11c\ubc84
#Globals.Url=jdbc:CUBRID:119.193.215.98:30000:kcc_adr_advc_test:::?charset=utf8
Globals.Url=jdbc:cubrid:119.193.215.98:30000:kcc_adr_advc:::?charset=utf8
Globals.Url=jdbc:CUBRID:119.193.215.98:30000:kcc_adr_advc_test:::?charset=utf8
#Globals.Url=jdbc:cubrid:119.193.215.98:30000:kcc_adr_advc:::?charset=utf8
#\uc2e4\uc11c\ubc84
#Globals.Url=jdbc:cubrid:192.168.39.146:30000:kcc_adr_advc:::?charset=utf8

2
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp
View File

@ -367,7 +367,9 @@ $(document).ready(function(){
success: function (returnData, status) {
if(returnData.result == 'FAIL'){
if(returnData.message != ''){
if(returnData.message != undifined){
alert(returnData.message);
}
}else{
alert("처리중 오류가 발생하였습니다.");
}

6
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp
View File

@ -1244,11 +1244,11 @@
</c:when>
<c:when test="${status.count eq info.step}">
<c:set var="approveClass" value="approve_waiting on"/>
<c:set var="approveText" value="결재대기"/>
<c:set var="approveText" value="결재대기(전결)"/>
</c:when>
<c:when test="${list.sbmtYn eq 'A'}">
<c:set var="approveClass" value="approve_waiting"/>
<c:set var="approveText" value="결재대기"/>
<c:set var="approveText" value="결재대기(전결)"/>
</c:when>
</c:choose>
<div class="pgr_box <c:out value='${approveClass}' />">
@ -1309,8 +1309,8 @@
<c:if test="${(info.confirmStatus eq '01' or info.confirmStatus eq '02') and fn:indexOf(info.targetId, LoginVO.uniqId) ne -1
}">
<!-- and auth ne 'ROLE_ADMIN' -->
<button type="button" class="btnType02" onclick="fncReject(); return false;">반려</button>
<button type="button" class="btnType06" onclick="fncConfirm(); return false;">결재</button>
<button type="button" class="btnType02" onclick="fncReject(); return false;">반려</button>
</c:if>
<button type="button" class="btnType03" onclick="fncGoList(); return false;">목록</button>

6
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp
View File

@ -1181,11 +1181,11 @@ function getPageUrl(idx) {
</c:when>
<c:when test="${status.count eq info.step}">
<c:set var="approveClass" value="approve_waiting on"/>
<c:set var="approveText" value="결재대기"/>
<c:set var="approveText" value="결재대기(전결)"/>
</c:when>
<c:when test="${list.sbmtYn eq 'A'}">
<c:set var="approveClass" value="approve_waiting"/>
<c:set var="approveText" value="결재대기"/>
<c:set var="approveText" value="결재대기(전결)"/>
</c:when>
</c:choose>
<div class="pgr_box <c:out value='${approveClass}' />">
@ -1243,8 +1243,8 @@ function getPageUrl(idx) {
<%-- 최고관리자의 경우 결재, 반려 버튼 미노출 --%>
<c:if test="${(info.confirmStatus eq '01' or info.confirmStatus eq '02') and fn:indexOf(info.targetId, LoginVO.uniqId) ne -1
and auth ne 'ROLE_ADMIN'}">
<button type="button" class="btnType02" onclick="fncReject(); return false;">반려</button>
<button type="button" class="btnType06" onclick="fncConfirm(); return false;">결재</button>
<button type="button" class="btnType02" onclick="fncReject(); return false;">반려</button>
</c:if>
<button type="button" class="btnType03" onclick="fncGoList(); return false;">목록</button>
</div>

3
src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp
View File

@ -368,8 +368,7 @@ resInfo--%>
</div>
<div class="tab_cont on">
<%-- 웹접근성 인증 주석처리_이준호_230321 --%>
<%-- <jsp:include page="/WEB-INF/jsp/web/kccadr/kccadrCom/workFlowJsp.jsp"></jsp:include> --%>
<jsp:include page="/WEB-INF/jsp/web/kccadr/kccadrCom/workFlowJsp.jsp"></jsp:include>
<c:if test="${not empty master.appDe}">

3
src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail_in_workflow.jsp
View File

@ -267,8 +267,7 @@
</head>
<body>
<br/><br/>
<%-- 웹접근성 인증 주석처리_이준호_230321 --%>
<%-- <jsp:include page="/WEB-INF/jsp/web/kccadr/kccadrCom/workFlowJsp.jsp"></jsp:include> --%>
<jsp:include page="/WEB-INF/jsp/web/kccadr/kccadrCom/workFlowJsp.jsp"></jsp:include>
</body>
</html>

3
src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp
View File

@ -79,8 +79,7 @@ function tutorialPop(){
<div class="inner">
<div class="cont_tit">
<h2>조정신청</h2>
<%-- 웹접근성 인증 주석처리_이준호_230321 --%>
<%-- <button type="button" class="btnType03" onclick="tutorialPop();">조정신청서 등록 튜토리얼</button> --%>
<button type="button" class="btnType03" onclick="tutorialPop();">조정신청서 등록 튜토리얼</button>
</div>

4
src/main/webapp/innorix/innorix.js
View File

@ -9,7 +9,9 @@
// 라이선스 유형 : INNORIX WP 91일 체험 (만료 2022-09-30)
/*var INNORIX_LICENSE = "WEiCgfGkBpqQN/Zw0Ae0YQDFQoK5vit/hNZK/8gGNUm+mtjwAJr4dLSFCiLgiY9BOWSg925hgOfaW1olUgUTccrrl6Y=";*/
// 라이선스 유형 : INNORIX WP 91일 체험 (만료 2022-12-31)
/*var INNORIX_LICENSE = "SQeXVJiPNj/2u6W8BXoc1pX1l1D0Dc1azbDxUT+BQPLxsV86kF62+FUvIaofOXnArJTjp9kn/ZtUA+Ps0JFla2QGiu0=";*/
//var INNORIX_LICENSE = "SQeXVJiPNj/2u6W8BXoc1pX1l1D0Dc1azbDxUT+BQPLxsV86kF62+FUvIaofOXnArJTjp9kn/ZtUA+Ps0JFla2QGiu0=";
// 라이선스 유형 : INNORIX WP 30일 체험 (만료 2023-05-05)
//var INNORIX_LICENSE = "3v0AzGS0JgwSdFHLQQxxtUkUhisBNnaQemUNZDGw/tswnXPMQE446fqMs3uzb/EOWHvJhjRifBmG2cB2twGldoZzpkI=";
// 운영라이선스 적용
var INNORIX_LICENSE = "FXA8KvVU99M9Ubbr3Yrz91zCNqyXdWCqUQ/OO1f7lj3nifVZZjuLqJIlHXjosrbPynCFJat5fwEgP/RVXftvXSsXmAHSnTVLYciyf8XmbxH8SLfUdCIEnFo+zL8=";