From 07a85cc4b385f46c0848890489a4b7147df78866 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Thu, 21 Dec 2023 09:51:24 +0900 Subject: [PATCH] =?UTF-8?q?=EC=97=91=EC=85=80=EB=8B=A4=EC=9A=B4=EB=A1=9C?= =?UTF-8?q?=EB=93=9C=20=EC=9A=94=EC=B2=AD=20=EC=BF=BC=EB=A6=AC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/fims/crdn/crdn02010-main.jsp | 17 ++++++++++++++++- .../WEB-INF/jsp/fims/crdn/crdn03010-main.jsp | 5 +++++ .../WEB-INF/jsp/fims/crdn/crdn06010-main.jsp | 5 +++++ .../WEB-INF/jsp/fims/crdn/crdn08010-main.jsp | 5 +++++ .../WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp | 5 +++++ .../WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp | 5 +++++ .../WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp | 5 +++++ .../WEB-INF/jsp/fims/sprt/sprt01010-main.jsp | 12 ++++++++++++ .../WEB-INF/jsp/fims/sprt/sprt01110-info.jsp | 5 +++++ 9 files changed, 63 insertions(+), 1 deletion(-) 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 e4f27986..ee27de49 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 @@ -981,6 +981,11 @@ $(document).ready(function(){ var headerInfo = $("#photoInspection_Table_0--${pageName} thead th").not(".dummy-th").not(":eq(0)").getHeaderInfo(); $P.photoInspectionControl.query.excelTitle = headerInfo.excelTitle; $P.photoInspectionControl.query.excelTitleWidth = headerInfo.excelTitleWidth; + + var colDefs = getColDefs($("#photoInspection_Table_0--${pageName} thead th").not(".dummy-th").not(":eq(0)"), + $($("#photoInspectionRow--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)")); + $P.photoInspectionControl.query.colDefs = colDefs; + $P.photoInspectionControl.download(); } else { @@ -994,12 +999,22 @@ $(document).ready(function(){ var headerInfo = $("#sameVehicleInspectionMain_Table_0--${pageName} thead th").not(".dummy-th").getHeaderInfo(); $P.sameVehicleControl.main.query.excelTitle = headerInfo.excelTitle; $P.sameVehicleControl.main.query.excelTitleWidth = headerInfo.excelTitleWidth; + + var colDefs = getColDefs($("#sameVehicleInspectionMain_Table_0--${pageName} thead th").not(".dummy-th"), + $($("#sameVehicleInspectionMainRow--${pageName}")[0].content).find("td").not(".dummy-td")); + $P.sameVehicleControl.main.query.colDefs = colDefs; + $P.sameVehicleControl.main.download(); } else { var headerInfo = $("#sameVehicleInspectionSub_Table_0--${pageName} thead th").not(".dummy-th").not(":hidden").getHeaderInfo(); $P.sameVehicleControl.sub.query.excelTitle = headerInfo.excelTitle; $P.sameVehicleControl.sub.query.excelTitleWidth = headerInfo.excelTitleWidth; - $P.sameVehicleControl.sub.download(); + + var colDefs = getColDefs($("#sameVehicleInspectionSub_Table_0--${pageName} thead th").not(".dummy-th").not(":hidden"), + $($("#sameVehicleInspectionSubRow--${pageName}")[0].content).find("td").not(".dummy-td").not(".privacy-mask")); + $P.sameVehicleControl.sub.query.colDefs = colDefs; + + $P.sameVehicleControl.sub.download(); } } 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 eb3b91f3..c9ed7372 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 @@ -310,6 +310,11 @@ $(document).ready(function(){ var headerInfo = $("#crdnTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)").getHeaderInfo(); $P.crdnControl.query.excelTitle = headerInfo.excelTitle; $P.crdnControl.query.excelTitleWidth = headerInfo.excelTitleWidth; + + var colDefs = getColDefs($("#crdnTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)"), + $($("#crdnRow--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)")); + $P.crdnControl.query.colDefs = colDefs; + $P.crdnControl.download(); }); 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 65f2a7a1..dbfec129 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 @@ -479,6 +479,11 @@ $(document).ready(function(){ var headerInfo = $("#crdnThead--${pageName} th").not(".dummy-th").not(":eq(0)").getHeaderInfo(); $P.crdnControl.query.excelTitle = headerInfo.excelTitle; $P.crdnControl.query.excelTitleWidth = headerInfo.excelTitleWidth; + + var colDefs = getColDefs($("#crdnThead--${pageName} th").not(".dummy-th").not(":eq(0)"), + $($("#crdnRow--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)")); + $P.crdnControl.query.colDefs = colDefs; + $P.crdnControl.download(); }); 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 88a99f05..9bb3b835 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 @@ -448,6 +448,11 @@ $(document).ready(function(){ var headerInfo = $("#exmptnVhclTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)").getHeaderInfo(); $P.exmptnVhclControl.query.excelTitle = headerInfo.excelTitle; $P.exmptnVhclControl.query.excelTitleWidth = headerInfo.excelTitleWidth; + + var colDefs = getColDefs($("#exmptnVhclTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)"), + $($("#exmptnVhclRow--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)")); + $P.exmptnVhclControl.query.colDefs = colDefs; + $P.exmptnVhclControl.download(); }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp index 9a783395..5e51d9e5 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp @@ -641,6 +641,11 @@ $(document).ready(function(){ var headerInfo = $("#crdnThead--${pageName} th").not(".dummy-th").not(":eq(0)").getHeaderInfo(); $P.crdnControl.query.excelTitle = headerInfo.excelTitle; $P.crdnControl.query.excelTitleWidth = headerInfo.excelTitleWidth; + + var colDefs = getColDefs($("#crdnThead--${pageName} th").not(".dummy-th").not(":eq(0)"), + $($("#crdnRow--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)")); + $P.crdnControl.query.colDefs = colDefs; + $P.crdnControl.download(); }); 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 a7c4c5e8..a9e642a1 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 @@ -671,6 +671,11 @@ $(document).ready(function(){ var headerInfo = $("#crdnThead--${pageName} th").not(".dummy-th").not(":eq(0)").not(":eq(0)").getHeaderInfo(); $P.crdnControl.query.excelTitle = headerInfo.excelTitle; $P.crdnControl.query.excelTitleWidth = headerInfo.excelTitleWidth; + + var colDefs = getColDefs($("#crdnThead--${pageName} th").not(".dummy-th").not(":eq(0)").not(":eq(0)"), + $($("#crdnRow--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)").not(":eq(0)")); + $P.crdnControl.query.colDefs = colDefs; + $P.crdnControl.download(); }); $("#btnOpenCvlcptOrgnl--${pageName}").on("click", () => $P.fnOpenCvlcptOrgnl()); 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 de28e048..9dcf9483 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 @@ -535,6 +535,11 @@ $(document).ready(function(){ var headerInfo = $("#crdnThead--${pageName} th").not(".dummy-th").not(":eq(0)").getHeaderInfo(); $P.crdnControl.query.excelTitle = headerInfo.excelTitle; $P.crdnControl.query.excelTitleWidth = headerInfo.excelTitleWidth; + + var colDefs = getColDefs($("#crdnThead--${pageName} th").not(".dummy-th").not(":eq(0)"), + $($("#crdnRow--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)")); + $P.crdnControl.query.colDefs = colDefs; + $P.crdnControl.download(); }); $("#btnDelete--${pageName}").on("click", () => $P.fnRemove()); 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 5b99f525..06db5650 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 @@ -341,6 +341,7 @@ integrationSearch.setTotalData = (updown, list) => { // 엑셀 integrationSearch.fnExcel = (updown) => { var headerInfo; + var colDefs; if(updown == "up"){ if(integrationSearchControl.updataset.empty){ @@ -349,6 +350,10 @@ integrationSearch.fnExcel = (updown) => { } headerInfo = $("#upTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)").not(":hidden").getHeaderInfo(); + + colDefs = getColDefs($("#upTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)").not(":hidden"), + $($("#row--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)").not(".privacy-mask")); + integrationSearchControl.query.gridType = "up"; } else { if(integrationSearchControl.downdataset.empty){ @@ -357,11 +362,18 @@ integrationSearch.fnExcel = (updown) => { } headerInfo = $("#downTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)").not(":hidden").getHeaderInfo(); + + colDefs = getColDefs($("#downTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)").not(":hidden"), + $($("#row--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)").not(".privacy-mask")); + integrationSearchControl.query.gridType = "down"; } integrationSearchControl.query.excelTitle = headerInfo.excelTitle; integrationSearchControl.query.excelTitleWidth = headerInfo.excelTitleWidth; + + integrationSearchControl.query.colDefs = colDefs; + integrationSearchControl.download(); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01110-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01110-info.jsp index 67cd1080..1f40dfc6 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01110-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01110-info.jsp @@ -148,6 +148,11 @@ $(document).ready(function(){ var headerInfo = $("#theadTr--${pageName} th").not(".dummy-th").getHeaderInfo(); query.excelTitle = headerInfo.excelTitle; query.excelTitleWidth = headerInfo.excelTitleWidth; + + var colDefs = getColDefs($("#theadTr--${pageName} th").not(".dummy-th"), + $($("#found--${pageName}")[0].content).find("td").not(".dummy-td")); + query.colDefs = colDefs; + query.download = "xls"; query.crdnIDs = $P.crdnIds.join(","); var queryStr = toQuery(query);