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

# WARNING: head commit changed in the meantime

Browse Source 
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
This commit is contained in:
myname 2024-12-16 11:00:48 +09:00
parent 8d0836a8db
commit 3150ead21a
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/seed/com/gtm/base/GwBaseController.java
View File

@ -629,9 +629,9 @@ public class GwBaseController {
EgovMap paramsCnt = new EgovMap(); EgovMap paramsCnt = new EgovMap();
if ("1".equals(s_jobID)) //소재기 내부보고 if ("1".equals(s_jobID)) //소제기 내부보고
{ {
paramsCnt.put("docId", "22"); paramsCnt.put("docId", "78");
}else if ("2".equals(s_jobID)) //당사자 통지 }else if ("2".equals(s_jobID)) //당사자 통지
{ {

22
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp
View File

@ -2469,7 +2469,7 @@ function mediationSmall(){
var url = ""; var url = "";
$("#type").val("L"); $("#type").val("L");
var param = jQuery('#frm').serialize(); var param = jQuery('#frm').serialize();
url = "/gtm/case/ajax/nanumHisDelSelTmp.do"; url = "/gtm/newcase/ajax/nanumHisDelSelTmp.do";
XHR2(url, param, function(r){ XHR2(url, param, function(r){
$.each(r.data, function(k,v) { $.each(r.data, function(k,v) {
$('#nanumHisDelSelTmp').append('<option value="'+v.caseNo+'_'+v.docId+'_'+v.result+'">'+v.orginName+'('+v.docId+')('+v.result+')('+v.seqNo+')</option>'); $('#nanumHisDelSelTmp').append('<option value="'+v.caseNo+'_'+v.docId+'_'+v.result+'">'+v.orginName+'('+v.docId+')('+v.result+')('+v.seqNo+')</option>');
@ -2483,7 +2483,7 @@ function mediationSmall(){
var url = ""; var url = "";
$("#type").val("L"); $("#type").val("L");
var param = jQuery('#frm').serialize(); var param = jQuery('#frm').serialize();
url = "/gtm/case/ajax/nanumHisDelSelProTmp.do"; url = "/gtm/newcase/ajax/nanumHisDelSelProTmp.do";
XHR2(url, param, function(r){ XHR2(url, param, function(r){
$.each(r.data, function(k,v) { $.each(r.data, function(k,v) {
if (v.codeDepth == 1){ if (v.codeDepth == 1){
@ -3247,6 +3247,13 @@ function atendReqPopOpen(caseNo){
window.open(popUrl, "", popOption); window.open(popUrl, "", popOption);
} }
function fileFirstPopOpen(caseNo){
alert('작업중')
return;
var popUrl = "/gtm/case/trublprocessmng/dtaPop/jsp/Page.do?caseNo="+caseNo;
var popOption = "width=1024, height=750, resizable=no, scrollbars=no, status=no;";
window.open(popUrl, "", popOption);
}
function fileHistoryPopOpen(fileGubun, title){ function fileHistoryPopOpen(fileGubun, title){
@ -3950,7 +3957,7 @@ function nanumHisDelProTmp(p_type){
$("#caseNoTmp").val($("#caseNo").val()); $("#caseNoTmp").val($("#caseNo").val());
var param = jQuery('#callbackFrm').serialize(); var param = jQuery('#callbackFrm').serialize();
url = "/gtm/case/ajax/nanumMasterProcessChg.do"; url = "/gtm/newcase/ajax/nanumMasterProcessChg.do";
XHR2(url, param, function(r){ XHR2(url, param, function(r){
alert(r.resultMessage); alert(r.resultMessage);
location.reload(); location.reload();
@ -4596,6 +4603,7 @@ function clipCallTmp(){
<button type="button" class="btn btn_text btn_36 subgray_border btn-default" onclick="atendReqPopOpen('${caseNo}');">출석현황</button> <button type="button" class="btn btn_text btn_36 subgray_border btn-default" onclick="atendReqPopOpen('${caseNo}');">출석현황</button>
<button type="button" class="btn btn_text btn_36 subgray_border btn-default" onclick="cfrnctrnsferPop();">협의회이관</button> <button type="button" class="btn btn_text btn_36 subgray_border btn-default" onclick="cfrnctrnsferPop();">협의회이관</button>
<button type="button" class="btn btn_text btn_36 subgray_border btn-default dayLength">기간연장</button> <button type="button" class="btn btn_text btn_36 subgray_border btn-default dayLength">기간연장</button>
<button type="button" class="btn btn_text btn_36 subgray_border btn-default"onclick="fileFirstPopOpen('${caseNo}');">요구현황(작업중)</button>
</div> </div>
</div> </div>
</c:if> </c:if>
@ -4623,6 +4631,7 @@ function clipCallTmp(){
<button type="button" class="btn-default btn btn_text btn_36 gray_border fl" onclick="atendReqPopOpen('${caseNo}');">출석현황</button> <button type="button" class="btn-default btn btn_text btn_36 gray_border fl" onclick="atendReqPopOpen('${caseNo}');">출석현황</button>
<button type="button" class="btn-default btn btn_text btn_36 gray_border fr" onclick="cfrnctrnsferPop();">협의회이관</button> <button type="button" class="btn-default btn btn_text btn_36 gray_border fr" onclick="cfrnctrnsferPop();">협의회이관</button>
<button type="button" class="btn-default btn btn_text btn_36 gray_border fr dayLength">기간연장</button> <button type="button" class="btn-default btn btn_text btn_36 gray_border fr dayLength">기간연장</button>
<button type="button" class="btn btn_text btn_36 subgray_border btn-default"onclick="fileFirstPopOpen('${caseNo}');">요구현황(작업중)</button>
</div> </div>
</div> </div>
</c:if> </c:if>
@ -4636,6 +4645,7 @@ function clipCallTmp(){
<button type="button" class="btn-default btn btn_text btn_36 blue_border fl" id="finalCheckOp" onclick="nanumCall('16', '(피)신청인의 분쟁종료 요청사실 보고');">공정위 선보고용 종료통지</button> <button type="button" class="btn-default btn btn_text btn_36 blue_border fl" id="finalCheckOp" onclick="nanumCall('16', '(피)신청인의 분쟁종료 요청사실 보고');">공정위 선보고용 종료통지</button>
<button type="button" class="btn-default btn btn_text btn_36 gray_border fl" onclick="fileReqPopOpen('${caseNo}');">요구현황</button> <button type="button" class="btn-default btn btn_text btn_36 gray_border fl" onclick="fileReqPopOpen('${caseNo}');">요구현황</button>
<button type="button" class="btn-default btn btn_text btn_36 gray_border fl" onclick="atendReqPopOpen('${caseNo}');">출석현황</button> <button type="button" class="btn-default btn btn_text btn_36 gray_border fl" onclick="atendReqPopOpen('${caseNo}');">출석현황</button>
<button type="button" class="btn btn_text btn_36 subgray_border btn-default"onclick="fileFirstPopOpen('${caseNo}');">요구현황(작업중)</button>
</div> </div>
</c:if> </c:if>
<c:if test="${masterData.statePro == '0405000000' && (memberPosition == '0912000000' || memberPosition == '0911000000' || memberPosition == '0915000000')}"> <c:if test="${masterData.statePro == '0405000000' && (memberPosition == '0912000000' || memberPosition == '0911000000' || memberPosition == '0915000000')}">
@ -4685,7 +4695,7 @@ function clipCallTmp(){
<c:choose> <c:choose>
<c:when test="${masterData.statePro == '0406000000'}"> <c:when test="${masterData.statePro == '0406000000'}">
<div class="area_left"> <div class="area_left">
<button type="button" class="btn-default btn btn_text btn_36 blue_border fl" onclick="nanumCallGeneral('1', '소재기 내부보고');">소재기 내부보고</button> <button type="button" class="btn-default btn btn_text btn_36 blue_border fl" onclick="nanumCallGeneral('1', '소제기 내부보고');">소제기 내부보고</button>
<button type="button" class="btn-default btn btn_text btn_36 blue_border fl" onclick="nanumCallGeneral('2', '당사자 통지');">당사자 통지</button> <button type="button" class="btn-default btn btn_text btn_36 blue_border fl" onclick="nanumCallGeneral('2', '당사자 통지');">당사자 통지</button>
<button type="button" class="btn-default btn btn_text btn_36 blue_border fl" onclick="nanumCallGeneral('3', '수소법원 통지');">수소법원 통지</button> <button type="button" class="btn-default btn btn_text btn_36 blue_border fl" onclick="nanumCallGeneral('3', '수소법원 통지');">수소법원 통지</button>
</div> </div>
@ -4720,7 +4730,7 @@ function clipCallTmp(){
</c:if> </c:if>
<!-- 임시 --> <!-- 임시 -->
<!--
<div class="btn_wrap"> <div class="btn_wrap">
<div class="area_left" style="flex-wrap:wrap;"> <div class="area_left" style="flex-wrap:wrap;">
@ -4756,7 +4766,7 @@ function clipCallTmp(){
</div> </div>
</div> </div>
-->
<div class="col-table data-table"> <div class="col-table data-table">
<table> <table>