diff --git a/Models/eva_salary_cylinder/eva_salary_cylinderService.cs b/Models/eva_salary_cylinder/eva_salary_cylinderService.cs index 5e0c213..68e8634 100644 --- a/Models/eva_salary_cylinder/eva_salary_cylinderService.cs +++ b/Models/eva_salary_cylinder/eva_salary_cylinderService.cs @@ -165,6 +165,7 @@ namespace TodoAPI2.Models return data; } + #endregion #region Manipulation Functions diff --git a/Models/external_linkage/external_linkageService.cs b/Models/external_linkage/external_linkageService.cs index 7af4960..1b44c11 100644 --- a/Models/external_linkage/external_linkageService.cs +++ b/Models/external_linkage/external_linkageService.cs @@ -72,7 +72,7 @@ namespace TodoAPI2.Models var i = new external_linkageViewModel(); i.external_id = Convert.ToInt32(dr["id"]); i.external_code = dr["position_type_id"].ToString(); - i.external_name = dr["position_type_id"].ToString() + " " + dr["position_type_name"].ToString(); + i.external_name = dr["position_type_name"].ToString(); result.Add(i); } return result; @@ -89,7 +89,7 @@ namespace TodoAPI2.Models var i = new external_linkageViewModel(); i.external_id = Convert.ToInt32(dr["id"]); i.external_code = dr["position_level_id"].ToString(); - i.external_name = dr["position_level_id"].ToString() + " " + dr["position_level_name"].ToString(); + i.external_name = dr["position_level_name"].ToString(); result.Add(i); } return result; diff --git a/Views/eva_salary_cylinderView/eva_salary_cylinder.cshtml b/Views/eva_salary_cylinderView/eva_salary_cylinder.cshtml index 78116a0..2ae3b25 100644 --- a/Views/eva_salary_cylinderView/eva_salary_cylinder.cshtml +++ b/Views/eva_salary_cylinderView/eva_salary_cylinder.cshtml @@ -121,13 +121,18 @@ - +

+ หมายเหตุ : ค่าครองชีพ +

+

1.เงินเดือนไม่ถึงเดือนละ 13,285 บาท ได้ค่าครองชีพ 2,000 บาท แต่เมื่อรวมกับเงินเดือนแล้ว ต้องไม่เกินเดือนละ 13,285 บาท

+

2. กรณีได้รับค่าครองชีพ 2,000 บาท เมื่อรวมกับเงินเดือนแล้วไม่ถึง 10,000 บาท ให้ได้รับค่าครองชีพเพิ่มขึ้นอีกจนถึงเดือนละ 10,000 บาท

+ diff --git a/wwwroot/js/eva_salary_cylinder/eva_salary_cylinder.js b/wwwroot/js/eva_salary_cylinder/eva_salary_cylinder.js index 90dde50..3886e56 100644 --- a/wwwroot/js/eva_salary_cylinder/eva_salary_cylinder.js +++ b/wwwroot/js/eva_salary_cylinder/eva_salary_cylinder.js @@ -173,7 +173,6 @@ var eva_salary_cylinder_setupTable = function (result) { { "data": "themin" }, { "data": "themax" }, { "data": "middle" }, - { "data": "cost_living" }, { "data": "position_allowance" }, { "data": "monthly_compensation" }, ], @@ -213,22 +212,22 @@ var eva_salary_cylinder_setupTable = function (result) { return formatNumber(data); } }, + //{ + // "targets": 7, + // "data": "cost_living", + // "render": function (data, type, row, meta) { + // return formatNumber(data); + // } + //}, { "targets": 7, - "data": "cost_living", - "render": function (data, type, row, meta) { - return formatNumber(data); - } - }, - { - "targets": 8, "data": "position_allowance", "render": function (data, type, row, meta) { return formatNumber(data); } }, { - "targets": 9, + "targets": 8, "data": "monthly_compensation", "render": function (data, type, row, meta) { return formatNumber(data);