diff --git a/Views/rpt_payroll_summaryView/rpt_payroll_summary_report.cshtml b/Views/rpt_payroll_summaryView/rpt_payroll_summary_report.cshtml index 448f01b..4cc3582 100644 --- a/Views/rpt_payroll_summaryView/rpt_payroll_summary_report.cshtml +++ b/Views/rpt_payroll_summaryView/rpt_payroll_summary_report.cshtml @@ -14,13 +14,13 @@
-
รายงานเงินเดือน
+
รายงานสรุปยอดเงินรับของพนักงาน
@@ -38,7 +38,7 @@
- +
diff --git a/wwwroot/js/rpt_payroll_summary/rpt_payroll_summary_report.js b/wwwroot/js/rpt_payroll_summary/rpt_payroll_summary_report.js index c6424d3..3c2f474 100644 --- a/wwwroot/js/rpt_payroll_summary/rpt_payroll_summary_report.js +++ b/wwwroot/js/rpt_payroll_summary/rpt_payroll_summary_report.js @@ -19,10 +19,31 @@ rpt_payroll_summarySearchObject.department_id = $("#s_rpt_payroll_summary_depart function rpt_payroll_summary_FeedDataToSearchForm(data) { DropDownClearFormAndFeedWithData($("#s_rpt_payroll_summary_rpt_year"), data, "id", "external_name", "item_rpt_year", data.rpt_year); DropDownClearFormAndFeedWithData($("#s_rpt_payroll_summary_rpt_month"), data, "id", "external_name", "item_rpt_month", data.rpt_month); -DropDownClearFormAndFeedWithData($("#s_rpt_payroll_summary_department_id"), data, "id", "external_name", "item_department_id", data.department_id); +DropDownClearFormAndFeedWithDataOrg($("#s_rpt_payroll_summary_department_id"), data, "id", "external_name", "item_department_id", data.department_id); } +function DropDownClearFormAndFeedWithDataOrg(d, result, x, y, z, i) { + $(d).html(''); + $(d).append($("") + .attr("value", "") + .text("เนติบัณฑิตยสภา ในพระบรมราชูปถัมภ์")); + if (z !== "") { + $.each(result[z], function (key, value) { + $(d).append($("") + .attr("value", value[x]) + .text(value[y])); + }); + } else { + $.each(result, function (key, value) { + $(d).append($("") + .attr("value", value[x]) + .text(value[y])); + }); + } + $(d).val(i); +} + //================= Form Data Customizaiton ========================================= function rpt_payroll_summary_InitialForm(s) {