diff --git a/src/main/webapp/WEB-INF/jsp/fims/rent/rent04010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/rent/rent04010-main.jsp index 20944d72..8ba8942c 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/rent/rent04010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/rent/rent04010-main.jsp @@ -36,7 +36,7 @@ - + @@ -49,8 +49,8 @@ - - + + @@ -72,8 +72,8 @@ - - + + @@ -170,14 +170,27 @@ $(document).ready(function() { $P.$findn("btnExcel").on("click",function(){ let params = {}; - - params.cellDataDef = JSON.stringify($P.ctrl.dataset.getDataset()); - + let array = $P.ctrl.dataset.getDataset(); + + //tbodyList + for(var i=0;i < array.length;i++){ + let dataRow = array[i]; + let tr = $P.$findn("tbodyList").find("tr").eq(i); + + dataRow["K"] = tr.find("td").eq(10).find("input").val(); + dataRow["L"] = tr.find("td").eq(11).find("input").val(); + dataRow["M"] = tr.find("td").eq(12).find("input").val(); + dataRow["N"] = tr.find("td").eq(13).find("input").val(); + dataRow["O"] = tr.find("td").eq(14).find("input").val(); + dataRow["P"] = tr.find("td").eq(15).find("input").val(); + } + params.cellDataDef = JSON.stringify(array); + download.get({ url: wctx.url("/rent/rent04/010/download.do"), data: params }); - + }); });