diff --git a/src/main/webapp/WEB-INF/jsp/fims/admin-copySggStng-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/admin-copySggStng-info.jsp index 7b5b51c4..f61ba84c 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/admin-copySggStng-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/admin-copySggStng-info.jsp @@ -1,64 +1,73 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> -
-
-
-
-
- - -
-
- - -
-
- - -
-
- - - + + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + + +
+
-
-
- - + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/admin-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/admin-main.jsp index cd82366c..554cc8da 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/admin-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/admin-main.jsp @@ -1,7 +1,7 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> -
+
최고관리자 메뉴
@@ -71,6 +71,7 @@
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp index 6a98c91b..190bc054 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp @@ -264,12 +264,19 @@ $(document).ready(function(){ data : params, success : (resp) => { + let dialogName = "layoutInfoDialog"; + let dialogId = dialogName+"-"+uuid(); + dialog.open({ - id : "layoutInfoDialog", + id : dialogId, title : "레이아웃 정보", size : "xl", content : resp, init : () => { + setDialogZindex(); + $("#"+dialogId).attr("name", dialogName); + $("#"+dialogId).attr("data-ref-doctx","${pageName}"); + var parentRes = new Object(); var childReq = pageObject.childReq.pop(); @@ -283,7 +290,6 @@ $(document).ready(function(){ pageObject.parentRes.push(parentRes); - setDialogZindex(); } }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp index d8c04686..eec060ff 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp @@ -307,7 +307,7 @@ $(document).ready(function(){ data : info, success : (resp) => { if(resp.saved){ - dialog.close("layoutInfoDialog"); + dialog.close($P.selfDlgId()); dialog.alert({ content:"저장되었습니다.", init : () => { @@ -332,7 +332,7 @@ $(document).ready(function(){ }, success : (resp) => { if(resp.saved){ - dialog.close("layoutInfoDialog"); + dialog.close($P.selfDlgId()); dialog.alert({ content:"삭제되었습니다.", init : () => { diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp index 796f04dc..7b7f92fd 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp @@ -821,11 +821,17 @@ $(document).ready(function(){ url : dialogUrl, data : params, success : (resp) => { - + + let dialogName = "totalInfoMainDialog"; + let dialogId = "totalInfoMainDialog"; //dialogName+"-"+uuid(); + dialog.open({ - id : "totalInfoMainDialog", + id : dialogId, title : "개별총정보", size : "xxl", content : resp, - init : () => {} + init : () => { + $("#"+dialogId).attr("name", dialogName); + $("#"+dialogId).attr("data-ref-doctx","${pageName}"); + } }); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp index 3a8ab410..4b6c0069 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp @@ -306,10 +306,16 @@ $(document).ready(function(){ data : params, success : (resp) => { + let dialogName = "totalInfoMainDialog"; + let dialogId = "totalInfoMainDialog"; //dialogName+"-"+uuid(); + dialog.open({ - id : "totalInfoMainDialog", + id : dialogId, title : "개별총정보", size : "xxl", content : resp, - init : () => {} + init : () => { + $("#"+dialogId).attr("name", dialogName); + $("#"+dialogId).attr("data-ref-doctx","${pageName}"); + } }); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp index 3490e62a..8c6aea69 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp @@ -248,25 +248,29 @@ $(document).ready(function(){ if(type == "file") url = $P.ctrl.urls.newInfoByFile; if(type == "hand") url = $P.ctrl.urls.newInfoByHand; - var dialogId = ""; - if(type == "file") dialogId = "fileDialog"; - if(type == "hand") dialogId = "manualDialog"; - + let dialogName = ""; + if(type == "file") dialogName = "fileDialog"; + if(type == "hand") dialogName = "manualDialog"; + var title = ""; if(type == "file") title = "단속파일 등록"; if(type == "hand") title = "단속자료 수기 등록"; - - + ajax.get({ url : url, data : {}, success : (resp) => { + let dialogId = dialogName+"-"+uuid(); + dialog.open({ id: dialogId, title: title, content:resp, size: "xxl", - init:() => {} + init:() => { + $("#"+dialogId).attr("name", dialogName); + $("#"+dialogId).attr("data-ref-doctx","${pageName}"); + } }); } }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp index 08ec0f20..a54b8960 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp @@ -498,7 +498,7 @@ $(document).ready(function(){ focusClose(); } }); - dialog.close("manualDialog"); + dialog.close($P.selfDlgId()); } } @@ -573,7 +573,6 @@ $(document).ready(function(){ $P.$find("vhrno").onEnterPress(function(){ - var alertDialogId = "alertDialog"; var crdnYmd = $P.$find("crdnYmd").val().replaceAll("-", ""); var vhrnoEl = event.target; var vhrno = vhrnoEl.value; diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp index 79a5178d..97109671 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp @@ -499,11 +499,16 @@ $(document).ready(function(){ url : $P.ctrl.urls.getInfo, data : params, success : (resp) => { - + let dialogName = "totalInfoMainDialog"; + let dialogId = "totalInfoMainDialog"; //dialogName+"-"+uuid(); + dialog.open({ - id : "totalInfoMainDialog", + id : dialogId, title : "개별총정보", size : "xxl", content : resp, - init : () => {} + init : () => { + $("#"+dialogId).attr("name", dialogName); + $("#"+dialogId).attr("data-ref-doctx","${pageName}"); + } }); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp index a554471a..1c691367 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp @@ -289,12 +289,18 @@ $(document).ready(function(){ url : $P.ctrl.urls.getInfo, data: param, success:(resp) => { + let dialogName = "exmptnvhclDialog"; + let dialogId = dialogName+"-"+uuid(); + dialog.open({ - id: "exmptnvhclDialog", + id: dialogId, title: "면제차량 수정", content:resp, size: "lg", init:() => { + $("#"+dialogId).attr("name", dialogName); + $("#"+dialogId).attr("data-ref-doctx","${pageName}"); + var parentRes = new Object(); var childReq = pageObject.childReq.pop(); @@ -318,12 +324,18 @@ $(document).ready(function(){ url : $P.ctrl.urls.newInfo, data: {}, success:(resp) => { + let dialogName = "exmptnvhclDialog"; + let dialogId = dialogName+"-"+uuid(); + dialog.open({ - id: "exmptnvhclDialog", + id: dialogId, title: "면제차량 등록", content:resp, size: "lg", init:() => { + $("#"+dialogId).attr("name", dialogName); + $("#"+dialogId).attr("data-ref-doctx","${pageName}"); + var parentRes = new Object(); var childReq = pageObject.childReq.pop(); @@ -391,8 +403,11 @@ $(document).ready(function(){ url : wctx.url("/BPV/crdn/crdn08/030/list.do"), data: { "exmptnVhclId" : dataKey }, success:(resp) => { + let dialogName = "exmptnvhclHistoryDialog"; + let dialogId = dialogName+"-"+uuid(); + dialog.open({ - id: "exmptnvhclHistoryDialog", + id: dialogId, title: "면제차량 이력", content : resp, size: "xxl", diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08020-info.jsp index 0455d88b..47206313 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08020-info.jsp @@ -149,7 +149,7 @@ $(document).ready(function(){ focusClose(); } }); - dialog.close("exmptnvhclDialog"); + dialog.close($P.selfDlgId()); $P.provided.refreshList(); } }; diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp index a863f308..c6459528 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp @@ -722,11 +722,20 @@ $(document).ready(function(){ url : wctx.url("/"+params.taskSeCd + "/payer/info.do"), data : params || {}, success : (resp) => { + + let dialogName = "payerDialog"; + let dialogId = dialogName+"-"+uuid(); + dialog.open({ - id : "payerDialog", + id : dialogId, title : dialogTitle, content : resp, size : "lg", + init : () => { + $("#"+dialogId).attr("name", dialogName); + $("#"+dialogId).attr("data-ref-doctx","${pageName}"); + + } onClose : () => { $P.refreshPayer(); } // callback }); } @@ -1098,11 +1107,11 @@ $(document).ready(function(){ $("#"+dialogId).attr("data-ref-doctx","${pageName}"); $(document).find("div.modal").last().on('shown.bs.modal', function () { - - $("#"+$P.refDlgId("crdnListDialog")).find("[name='schCrdnYmdFrom']").set(""); - $("#"+$P.refDlgId("crdnListDialog")).find("[name='schCrdnYmdTo']").set(""); - $("#"+$P.refDlgId("crdnListDialog")).find("[name='vhrno']").set($P.$find("vhrno").val()); - $("#"+$P.refDlgId("crdnListDialog")).find(".btn-search").eq(0).click(); + let refDlgId = $P.refDlgId("crdnListDialog"); + $("#"+refDlgId).find("[name='schCrdnYmdFrom']").set(""); + $("#"+refDlgId).find("[name='schCrdnYmdTo']").set(""); + $("#"+refDlgId).find("[name='vhrno']").set($P.$find("vhrno").val()); + $("#"+refDlgId).find(".btn-search").eq(0).click(); }); }, onClose : () => {} @@ -1136,11 +1145,11 @@ $(document).ready(function(){ $("#"+dialogId).attr("data-ref-doctx","${pageName}"); $(document).find("div.modal").last().on('shown.bs.modal', function () { - - $("#"+$P.refDlgId("cvlcptDscsnListDialog")).find("[name='schDscsnYmdFrom']").set(""); - $("#"+$P.refDlgId("cvlcptDscsnListDialog")).find("[name='schDscsnYmdTo']").set(""); - $("#"+$P.refDlgId("cvlcptDscsnListDialog")).find("[name='schVhrno']").set($P.$find("vhrno").val()); - $("#"+$P.refDlgId("cvlcptDscsnListDialog")).find(".btn-search").eq(0).click(); + let refDlgId = $P.refDlgId("crdnListDialog"); + $("#"+refDlgId).find("[name='schDscsnYmdFrom']").set(""); + $("#"+refDlgId).find("[name='schDscsnYmdTo']").set(""); + $("#"+refDlgId).find("[name='schVhrno']").set($P.$find("vhrno").val()); + $("#"+refDlgId).find(".btn-search").eq(0).click(); }); }, onClose : () => {} diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp index ebee92d2..f84dd230 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp @@ -440,11 +440,16 @@ $(document).ready(function(){ url : $P.ctrl.urls.getInfo, data : params, success : (resp) => { - + let dialogName = "totalInfoMainDialog"; + let dialogId = "totalInfoMainDialog"; //dialogName+"-"+uuid(); + dialog.open({ - id : "totalInfoMainDialog", + id : dialogId, title : "개별총정보", size : "xxl", content : resp, - init : () => {} + init : () => { + $("#"+dialogId).attr("name", dialogName); + $("#"+dialogId).attr("data-ref-doctx","${pageName}"); + } }); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp index d84fa9c2..5a1b2a39 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp @@ -419,10 +419,16 @@ $(document).ready(function(){ data : params, success : (resp) => { + let dialogName = "totalInfoMainDialog"; + let dialogId = "totalInfoMainDialog"; //dialogName+"-"+uuid(); + dialog.open({ - id : "totalInfoMainDialog", + id : dialogId, title : "개별총정보", size : "xxl", content : resp, - init : () => {} + init : () => { + $("#"+dialogId).attr("name", dialogName); + $("#"+dialogId).attr("data-ref-doctx","${pageName}"); + } }); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc04010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc04010-main.jsp index 8ce4b8b8..e3a861ad 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc04010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc04010-main.jsp @@ -407,10 +407,10 @@ $(document).ready(function(){ init : () => { $("#"+dialogId).attr("name", dialogName); $("#"+dialogId).attr("data-ref-doctx","${pageName}"); - - initDatepicker(document.getElementById($P.refDlgId("seallDmndDialog"))); - $("#"+$P.refDlgId("seallDmndDialog")).find("[name='rcptYmd']").datepicker('setDate', TODAY()); - $("#"+$P.refDlgId("seallDmndDialog")).find("[name='btnCreate']").on("click", () => $P.fnCreateDmnd()); + let refDlgId = $P.refDlgId("seallDmndDialog"); + initDatepicker(document.getElementById(refDlgId)); + $("#"+refDlgId).find("[name='rcptYmd']").datepicker('setDate', TODAY()); + $("#"+refDlgId).find("[name='btnCreate']").on("click", () => $P.fnCreateDmnd()); }, onClose : () => {} }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc05010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc05010-main.jsp index 0b116f7a..786b19c2 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc05010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc05010-main.jsp @@ -660,10 +660,10 @@ $(document).ready(function(){ init : () => { $("#"+dialogId).attr("name", dialogName); $("#"+dialogId).attr("data-ref-doctx","${pageName}"); + let refDlgId = $P.refDlgId(dialogName); + $("#"+refDlgId).find("[name='preview']").val(result); - $("#"+$P.refDlgId("previewDialog")).find("[name='preview']").val(result); - $("#"+$P.refDlgId("previewDialog")).find("[name='btnClose']").on("click", - () => dialog.close($P.refDlgId("previewDialog")); + $("#"+refDlgId).find("[name='btnClose']").on("click", () => dialog.close(refDlgId)); }, onOk : () => {}, onClose : () => {} diff --git a/src/main/webapp/WEB-INF/jsp/fims/payer/payer01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/payer/payer01020-info.jsp index 8a044906..d63f7d65 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/payer/payer01020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/payer/payer01020-info.jsp @@ -182,7 +182,8 @@ // 저장 callback $P.control.onSave = (resp) => { - let dialogTitle = $("#" + $P.control.prefix + "Dialog--${openerPageName}").find("h5.modal-title").html(); + + let dialogTitle = $($("#frmEdit--${pageName}").parents(".modal")[0]).find("h5.modal-title").html(); let showMessage = resp.rtnMsg.replace(/[S]|[F]/g, dialogTitle); // 메시지 출력 @@ -192,7 +193,7 @@ }); if (resp.saved) { - dialog.close($P.control.prefix + "Dialog--${openerPageName}"); + dialog.close($("#frmEdit--${pageName}").parents(".modal")[0].id); } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp index ad886a2a..73483942 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp @@ -425,21 +425,26 @@ $(document).ready(function() { var url = wctx.url("/sprt/sprt01/100/info.do"); - var dialogId = "inputEtcCnDialog"; ajax.get({ url : url , data : { crdnIds : crdnIds.join(",") } , success : (resp) => { + let dialogName = "inputEtcCnDialog"; + let dialogId = dialogName+"-"+uuid(); + dialog.open({ id : dialogId , title : "특기사항입력-일괄" , size : "xl" , content : resp , init : () => { - - var found = $("#"+dialogId).find("table template")[0].innerHTML; + $("#"+dialogId).attr("name", dialogName); + $("#"+dialogId).attr("data-ref-doctx","${pageName}"); + let refDlgId = $P.refDlgId(dialogName); + + var found = $("#"+refDlgId).find("table template")[0].innerHTML; var trs = cur.inStrings(found, null); - $("#"+dialogId).find("tbody").html(trs.join()); + $("#"+refDlgId).find("tbody").html(trs.join()); } , onClose : () => { } }); @@ -467,24 +472,27 @@ $(document).ready(function() { var url = wctx.url("/sprt/sprt01/110/info.do"); - var dialogId = "printCrdnDialog"; - ajax.get({ url : url , data : { crdnIds : crdnIds.join(",") } , success : (resp) => { + let dialogName = "printCrdnDialog"; + let dialogId = dialogName+"-"+uuid(); + dialog.open({ id : dialogId , title : "종합조회-단속내역" , size : "xl" , content : resp , init : () => { - + $("#"+dialogId).attr("name", dialogName); + $("#"+dialogId).attr("data-ref-doctx","${pageName}"); + let refDlgId = $P.refDlgId(dialogName); - var found = $("#"+dialogId).find("table template")[0].innerHTML; + var found = $("#"+refDlgId).find("table template")[0].innerHTML; var trs1 = upDataset.inStrings(found, null); var trs2 = downDataset.inStrings(found, null); - $("#"+dialogId).find("tbody").html(trs1.join()+trs2.join()); + $("#"+refDlgId).find("tbody").html(trs1.join()+trs2.join()); } , onClose : () => { } }); @@ -509,22 +517,26 @@ $(document).ready(function() { var url = wctx.url("/sprt/sprt01/120/info.do"); - var dialogId = "printBillDialog"; - ajax.get({ url : url , data : { crdnIds : crdnIds.join(",") } , success : (resp) => { + let dialogName = "printBillDialog"; + let dialogId = dialogName+"-"+uuid(); + dialog.open({ id : dialogId , title : "종합조회-교부청구서,채권신고서" , size : "xl" , content : resp , init : () => { - - var found = $("#"+dialogId).find("table template")[0].innerHTML; + $("#"+dialogId).attr("name", dialogName); + $("#"+dialogId).attr("data-ref-doctx","${pageName}"); + let refDlgId = $P.refDlgId(dialogName); + + var found = $("#"+refDlgId).find("table template")[0].innerHTML; var trs = upDataset.inStrings(found, null); - $("#"+dialogId).find("tbody").html(trs.join()); + $("#"+refDlgId).find("tbody").html(trs.join()); var parentRes = new Object(); @@ -585,23 +597,26 @@ $(document).ready(function() { var url = wctx.url("/sprt/sprt01/140/info.do"); - var dialogId = "printAdvntceDialog"; - ajax.get({ url : url , data : { crdnIds : crdnIds.join(",") } , success : (resp) => { + let dialogName = "printAdvntceDialog"; + let dialogId = dialogName+"-"+uuid(); + dialog.open({ id : dialogId, title : "종합조회-사전통지서", size : "xl", content : resp, init : () => { - + $("#"+dialogId).attr("name", dialogName); + $("#"+dialogId).attr("data-ref-doctx","${pageName}"); + let refDlgId = $P.refDlgId(dialogName); - var found = $("#"+dialogId).find("table template")[0].innerHTML; + var found = $("#"+refDlgId).find("table template")[0].innerHTML; var trs = upDataset.inStrings(found, null); - $("#"+dialogId).find("tbody").html(trs.join()); + $("#"+refDlgId).find("tbody").html(trs.join()); var parentRes = new Object(); @@ -640,22 +655,26 @@ $(document).ready(function() { var url = wctx.url("/sprt/sprt01/150/info.do"); - var dialogId = "printNhtDialog"; - ajax.get({ url : url , data : { crdnIds : crdnIds.join(",") } , success : (resp) => { + let dialogName = "printNhtDialog"; + let dialogId = dialogName+"-"+uuid(); + dialog.open({ id : dialogId, title : "종합조회-고지서", size : "xl", content : resp, init : () => { - - var found = $("#"+dialogId).find("table template")[0].innerHTML; + $("#"+dialogId).attr("name", dialogName); + $("#"+dialogId).attr("data-ref-doctx","${pageName}"); + let refDlgId = $P.refDlgId(dialogName); + + var found = $("#"+refDlgId).find("table template")[0].innerHTML; var trs = upDataset.inStrings(found, null); - $("#"+dialogId).find("tbody").html(trs.join()); + $("#"+refDlgId).find("tbody").html(trs.join()); var parentRes = new Object(); @@ -712,12 +731,19 @@ $(document).ready(function() { url : url , data : params , success : (resp) => { + + let dialogName = "totalInfoMainDialog"; + let dialogId = "totalInfoMainDialog"; //dialogName+"-"+uuid(); + dialog.open({ - id : "totalInfoMainDialog" + id : dialogId , title : "개별총정보" , size : "xxl" , content : resp - , init : () => { } + , init : () => { + $("#"+dialogId).attr("name", dialogName); + $("#"+dialogId).attr("data-ref-doctx","${pageName}"); + } , onClose : () => { } }); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01140-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01140-info.jsp index 59226246..b661877c 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01140-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01140-info.jsp @@ -218,31 +218,36 @@ $(document).ready(function(){ } var url = wctx.url("/stng/stng01/010/main.do"); - var dialogId = "otptStngDialog"; ajax.post({ url : url, data : {}, success : (resp) => { + let dialogName = "otptStngDialog"; + let dialogId = dialogName+"-"+uuid(); + dialog.open({ id : dialogId, title : "출력설정", size : "xxl", content : resp, init : () => { + setDialogZindex(); + $("#"+dialogId).attr("name", dialogName); + $("#"+dialogId).attr("data-ref-doctx","${pageName}"); + let refDlgId = $P.refDlgId(dialogName); - $("#"+dialogId).find("form[name='frmSearch']").find("[name='sggCd']").val(MY_INFO.info.sggCd); + + $("#"+refDlgId).find("form[name='frmSearch']").find("[name='sggCd']").val(MY_INFO.info.sggCd); if(fix != ""){ - var taskSeSelectbox = $("#"+dialogId).find("form[name='frmSearch']").find("[name='taskSeCd']"); + var taskSeSelectbox = $("#"+refDlgId).find("form[name='frmSearch']").find("[name='taskSeCd']"); taskSeSelectbox.val(fix); taskSeSelectbox.attr("disabled","disabled"); } - $("#"+dialogId).find("form[name='frmSearch']").find("[name='sndngSeCd']").val("02"); - - setDialogZindex(); + $("#"+refDlgId).find("form[name='frmSearch']").find("[name='sndngSeCd']").val("02"); }, onClose : () => { } }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01150-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01150-info.jsp index a9aa6b90..4ec2bdb4 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01150-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01150-info.jsp @@ -213,32 +213,34 @@ $(document).ready(function(){ } var url = wctx.url("/stng/stng01/010/main.do"); - var dialogId = "otptStngDialog"; ajax.post({ url : url, data : {}, success : (resp) => { - + let dialogName = "otptStngDialog"; + let dialogId = dialogName+"-"+uuid(); + dialog.open({ id : dialogId , title : "출력설정" , size : "xxl" , content : resp , init : () => { + setDialogZindex(); + $("#"+dialogId).attr("name", dialogName); + $("#"+dialogId).attr("data-ref-doctx","${pageName}"); + let refDlgId = $P.refDlgId(dialogName); - - $("#"+dialogId).find("form[name='frmSearch']").find("[name='sggCd']").val(MY_INFO.info.sggCd); + $("#"+refDlgId).find("form[name='frmSearch']").find("[name='sggCd']").val(MY_INFO.info.sggCd); if(fix != ""){ - var taskSeSelectbox = $("#"+dialogId).find("form[name='frmSearch']").find("[name='taskSeCd']"); + var taskSeSelectbox = $("#"+refDlgId).find("form[name='frmSearch']").find("[name='taskSeCd']"); taskSeSelectbox.val(fix); taskSeSelectbox.attr("disabled","disabled"); } - $("#"+dialogId).find("form[name='frmSearch']").find("[name='sndngSeCd']").val("03"); - - setDialogZindex(); + $("#"+refDlgId).find("form[name='frmSearch']").find("[name='sndngSeCd']").val("03"); } , onClose : () => { } }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/stng01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/stng01010-main.jsp index 4e159948..b20f568e 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/stng01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/stng01010-main.jsp @@ -2,263 +2,263 @@ <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> 출력설정 - -
-
-
-
-
-
- - 업무 - - 출력물 - - 용지 - - -
-
-
- - - + +
+
+
+
+
+
+ + 업무 + + 출력물 + + 용지 + + +
+
+
+ + + +
-
- -
- - -
- - - - - - +
+ - -
- -
-
-
- 단일 출력 항목 - -
    -
- +
+ + + + + + + + +
+
+ +
+
+
+ 단일 출력 항목 + +
    +
+ +
-
-
-
-
- - - - - -
+
+
+
+ + + + + +
+
-
- -
-
-
- 복수 출력 가능 항목 - - + +
+
+
+ 복수 출력 가능 항목 + + +
-
-
-
-
- - - - - -
+
+
+
+ + + + + +
+
+
-
-
- - - - - - - - - - + + + + +