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 f1df736..7934343 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 @@ -766,37 +766,13 @@ $(document).ready(function(){ } } - $P.dblclickInspectionDataList = (dataKey) => { - - var taskSeCd = $P.$findn("frmSearch").find("input[name='taskSeCd']:checked").val(); - - var dialogUrl = wctx.url("/sprt/sprt02/010/main.do"); - - let params = { + $P.dblclickInspectionDataList = (dataKey) => crdnTotalInfo( + { callPageName : "${pageName}", crdnId : dataKey - } - - ajax.get({ - url : dialogUrl, - data : params, - success : (resp) => { - - let dialogName = "totalInfoMainDialog"; - let dialogId = dialogName+"-"+uuid(); - - dialog.open({ - id : dialogId, - title : "개별총정보", size : "xxl", content : resp, - init : () => { - $("#"+dialogId).attr("name", dialogName); - $("#"+dialogId).attr("data-ref-doctx","${pageName}"); - } - }); - - } - }); - } + }, + () => $P.refreshInspectionList() + ); $P.showPhoto = (crdnId, nextCrndId, curDataVhrno, nextDataVhrno) => { 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 5053081..9acfd1a 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 @@ -269,31 +269,10 @@ $(document).ready(function(){ } $P.dblclickCrdnList = (dataKey) => { - let params = { + crdnTotalInfo({ callPageName : "${pageName}", crdnId : dataKey - } - - ajax.get({ - url : ctrl.urls.getInfo, - data : params, - success : (resp) => { - - let dialogName = "totalInfoMainDialog"; - let dialogId = dialogName+"-"+uuid(); - - dialog.open({ - id : dialogId, - title : "개별총정보", size : "xxl", content : resp, - init : () => { - $("#"+dialogId).attr("name", dialogName); - $("#"+dialogId).attr("data-ref-doctx","${pageName}"); - } - }); - - } }); - } $P.save = () => { 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 395874e..068ff0a 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 @@ -180,6 +180,17 @@
+
+ + + + + +
+<%--
+--%>
+--%>
@@ -96,6 +103,14 @@
+
+ + + + + +
+<%--
@@ -108,6 +123,7 @@
+--%>
~ @@ -222,14 +238,14 @@
-
- - -
+
+ + +
@@ -575,6 +591,9 @@ // 단속, 납부자 정보 if (resp.crdnPayerInfo) { $P.ctrlCrdn.setData([resp.crdnPayerInfo]); } + + let hide = pageObject["${pageNameMain}"].ctrlMain.dataset.getDataset()[0].CRDN_STTS_CD != "21"; + $P.$findn("excludeBtns").prop("hidden", hide); } }); } diff --git a/src/main/webapp/WEB-INF/jsp/index.jsp b/src/main/webapp/WEB-INF/jsp/index.jsp index e0abf50..92bb542 100644 --- a/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/src/main/webapp/WEB-INF/jsp/index.jsp @@ -330,6 +330,33 @@ //대시보드 로드 ${dashboardLoadScript} } + + function crdnTotalInfo(params = {}, onClose = () => {}) { + if (!params.crdnId) return; + + ajax.get({ + url: wctx.url("/sprt/sprt02/010/main.do") + , data: params + , success: (resp) => { + let dialogName = "totalInfoMainDialog"; + let dialogId = dialogName + "-" + uuid(); + + dialog.open({ + id: dialogId + , title: "개별총정보" + , size: "xxl" + , content: resp + , init: () => { + $("#" + dialogId).attr("name", dialogName); + $("#" + dialogId).attr("data-ref-doctx", "${pageName}"); + + AppSupport.setDialogZindex(); + } + , onClose: onClose + }); + } + }); + } ${functions} diff --git a/src/main/webapp/WEB-INF/report/img/warning-1.jpg b/src/main/webapp/WEB-INF/report/img/warning-1.jpg new file mode 100644 index 0000000..2f7a6f7 Binary files /dev/null and b/src/main/webapp/WEB-INF/report/img/warning-1.jpg differ diff --git a/src/main/webapp/WEB-INF/report/img/warning-2.jpg b/src/main/webapp/WEB-INF/report/img/warning-2.jpg new file mode 100644 index 0000000..490d76a Binary files /dev/null and b/src/main/webapp/WEB-INF/report/img/warning-2.jpg differ diff --git a/src/main/webapp/WEB-INF/report/img/warning.jpg b/src/main/webapp/WEB-INF/report/img/warning.jpg deleted file mode 100644 index fe31432..0000000 Binary files a/src/main/webapp/WEB-INF/report/img/warning.jpg and /dev/null differ diff --git a/src/main/webapp/WEB-INF/report/warning.jrxml b/src/main/webapp/WEB-INF/report/warning.jrxml index 759fc49..e6ea1ed 100644 --- a/src/main/webapp/WEB-INF/report/warning.jrxml +++ b/src/main/webapp/WEB-INF/report/warning.jrxml @@ -107,7 +107,7 @@ - + @@ -143,79 +143,50 @@ - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - - - - - - - + + + + + + + + + +