diff --git a/Controllers/Budget.Controller.cs b/Controllers/Budget.Controller.cs index afb5551..698c7ac 100644 --- a/Controllers/Budget.Controller.cs +++ b/Controllers/Budget.Controller.cs @@ -2489,9 +2489,8 @@ namespace rmutr_report.Controllers [FromBody] budget_expenditure_report_from_revenue budget) { int no = 1; - + var b = budget.budgets.ToArray(); - var budgets1 = budget.budgets.ToList(); foreach (var bb in b) { bb.personnel_list_s = new List { bb.personnel_lists }; @@ -2504,10 +2503,12 @@ namespace rmutr_report.Controllers detail2.text1 = "อัตรา"; } - if (detail.budget_personnel_lists.Count() == 1) - { - detail.budget_personnel_lists[0].topic = "งบบุคลากร"; - } + // var cperson = detail.budget_personnel_lists.Count(); + // + // if (cperson ==1) + // { + // detail.budget_personnel_lists[0].topic = "งบบุคลากร"; + // } foreach (var detail3 in detail2.budget_personnel_lists_2) { @@ -2552,10 +2553,10 @@ namespace rmutr_report.Controllers no3++; } - if (detail.budget_personnel_lists.Count() == 2) - { - detail.budget_personnel_lists[0].topic = "งบบุคลากร"; - detail.budget_personnel_lists[1].topic = "งบดําเนินงาน"; + // if (cperson == 2) + // { + // detail.budget_personnel_lists[0].topic = "งบบุคลากร"; + // detail.budget_personnel_lists[1].topic = "งบดําเนินงาน"; // detail.budget_personnel_lists[1].text1 = null; // detail.budget_personnel_lists[1].budget_personnel_lists_2[0].text1 = null; // detail.budget_personnel_lists[1].budget_personnel_lists_2[0].row_no = null; @@ -2565,7 +2566,7 @@ namespace rmutr_report.Controllers // .text1 = null; // detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0] // .details[0].text1 = null; - } + //} foreach (var detail6 in detail5.details2) { diff --git a/wwwroot/reports/budget_expenditure_report_from_revenue.frx b/wwwroot/reports/budget_expenditure_report_from_revenue.frx index 244deaa..bd62d08 100644 --- a/wwwroot/reports/budget_expenditure_report_from_revenue.frx +++ b/wwwroot/reports/budget_expenditure_report_from_revenue.frx @@ -1,5 +1,5 @@  - + @@ -73,13 +73,13 @@ - + - +