diff --git a/Controllers/ApiController.cs b/Controllers/ApiController.cs index 3d46195b..6193fe5a 100644 --- a/Controllers/ApiController.cs +++ b/Controllers/ApiController.cs @@ -1867,7 +1867,7 @@ namespace QuotationMaker.Controllers } } - string sqlString = "select * from projectView where project_isdel = 'N' and project_creative_uid in (" + user_uid_list + ") and project_createdate >= '" + startDateTime.ToString("yyyy/MM/dd") + "' and project_createdate <= '" + endDateTime.ToString("yyyy/MM/dd 23:59:59") + "'"; + string sqlString = "select * from projectView where project_isdel = 'N' and project_creative_uid in (" + user_uid_list + ") and project_createdate >= '" + startDateTime.ToString("yyyy/MM/dd") + "' and project_createdate <= '" + endDateTime.ToString("yyyy/MM/dd 23:59:59") + "' and dept_uid = '" + dept_uid + "'"; ret.projectViews = conn.Query(sqlString).ToList(); ret.ret = "yes"; diff --git a/wwwroot/assets/javascript/custom/projectlist.js b/wwwroot/assets/javascript/custom/projectlist.js index 1ef75492..df1e99d1 100644 --- a/wwwroot/assets/javascript/custom/projectlist.js +++ b/wwwroot/assets/javascript/custom/projectlist.js @@ -179,6 +179,11 @@ $(document).ready(function () { $('#dept_select').on('change', function () { $('#dt-responsive').DataTable().ajax.reload(); }); + + $('#search_btn').on('click', function () { + $('#dt-responsive').DataTable().ajax.reload(); + }); + $('#projectNewBtn').on('click', function () { $('#project_method').val('add'); $('#clientProjectModal').modal("toggle"); @@ -1428,7 +1433,14 @@ function buttonHistoryClick(obj) { var quotation_row = historyDataTable.row(historyRowPos).data(); + if (type == "excel") { + var formData = { + quotation_uid: quotation_uid, + quotation_version: quotation_version + } + $.redirect('/Api/exportXlsx', formData); + } if (type == 'save_in_same') { $('#save_to_same_quotation_uid').val(quotation_uid); @@ -2134,7 +2146,7 @@ function loadHistoryTable() { drowdownHtml += ' '; ret += drowdownHtml; ret += ''; - + ret += ''; return ret; } }, { @@ -2293,7 +2305,7 @@ function loadQuotationTable() { ret += ' '; ret += ' '; ret += ' '; - ret += ''; + ret += ''; return ret; } } diff --git a/wwwroot/logo/bremen_temp.xlsx b/wwwroot/logo/bremen_temp.xlsx index 15ee8eb8..09a67629 100644 Binary files a/wwwroot/logo/bremen_temp.xlsx and b/wwwroot/logo/bremen_temp.xlsx differ diff --git a/wwwroot/logo/journeys_temp.xlsx b/wwwroot/logo/journeys_temp.xlsx index e7c255c0..8b56cdbf 100644 Binary files a/wwwroot/logo/journeys_temp.xlsx and b/wwwroot/logo/journeys_temp.xlsx differ