diff --git a/Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml b/Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml
index f58ee7a..6581d44 100644
--- a/Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml
+++ b/Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml
@@ -129,7 +129,8 @@
 
                         <div class="form-group col-md-4">
                             <label id="lab_eva_limit_frame_group_limit_frame_295" for="eva_limit_frame_group_limit_frame_295">กรอบวงเงินที่กันไว้</label>
-                            <input class="form-control" type="number" id="eva_limit_frame_group_limit_frame_295" iLabel="กรอบวงเงินที่กันไว้" iRequire="false" iGroup="eva_limit_frame_group" />
+                            <input class="form-control" type="number" id="eva_limit_frame_group_limit_frame_295" iLabel="กรอบวงเงินที่กันไว้" iRequire="false" iGroup="eva_limit_frame_group" 
+                                   onchange="funcCeilCalculateSalaryLimit(event)" />
                         </div>
                     </div>
                     <div class='row'>
diff --git a/wwwroot/js/coregen.js b/wwwroot/js/coregen.js
index 9fb5bc1..0a4abf5 100644
--- a/wwwroot/js/coregen.js
+++ b/wwwroot/js/coregen.js
@@ -659,3 +659,12 @@ function GetMenu(module, mymenu, menu_url){
 	startLoad();
     AjaxGetRequest(menu_url, refresh_menu, menu_error);
 }
+
+
+function coreFormatPrice(value, digits) {
+    var currency = 0;
+    if (value) {
+        currency = (value / 1).toFixed(digits);
+    }
+    return currency.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+}
diff --git a/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee.js b/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee.js
index 6809648..235f6d9 100644
--- a/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee.js
+++ b/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee.js
@@ -165,6 +165,24 @@ function eva_limit_frame_employee_GoDelete(a) {
 var eva_limit_frame_employeeTableV;
 
 var eva_limit_frame_employee_setupTable = function (result) {
+    console.log("result", result);
+
+    $.each(result, function (index_result, obj_result) {
+        /*console.log("index_result", index_result);
+        console.log("obj_result", obj_result);*/
+        var digits = 2;
+        var currency_salary = coreFormatPrice(obj_result.salary, digits);
+        var currency_position_allowance = coreFormatPrice(obj_result.position_allowance, digits);
+        var currency_monthly_remuneration = coreFormatPrice(obj_result.monthly_remuneration, digits);
+        var currency_cost_of_living = coreFormatPrice(obj_result.cost_of_living, digits);
+
+        obj_result.salary = currency_salary;
+        obj_result.position_allowance = currency_position_allowance;
+        obj_result.monthly_remuneration = currency_monthly_remuneration;
+        obj_result.currency_cost_of_living = currency_cost_of_living
+        /*console.log(obj_result);*/
+    });
+
     tmp = '"';
     var groupColumn = 3;
     eva_limit_frame_employeeTableV = $('#eva_limit_frame_employeeTable').DataTable({
diff --git a/wwwroot/js/eva_limit_frame_group/eva_limit_frame_group_d.js b/wwwroot/js/eva_limit_frame_group/eva_limit_frame_group_d.js
index bbb3884..a8d7cb7 100644
--- a/wwwroot/js/eva_limit_frame_group/eva_limit_frame_group_d.js
+++ b/wwwroot/js/eva_limit_frame_group/eva_limit_frame_group_d.js
@@ -106,4 +106,31 @@ function eva_limit_frame_group_GoDelete(a) {
 
 //================= Multi-Selection Function =========================================
 
+function funcCeilCalculateSalaryLimit(params) {
+    console.log("params", params);
+    var input_id = params.srcElement.id;
+    var val_input = params.srcElement.value;
+    var num_check = 10;
+    var val_divine = 100;
+    var val_decimal = 0;
+    var after_cal = 0;
+    if (val_input) {
+        val_decimal = Number(parseFloat(val_input));
+    }
+    var val_salary = Number($("#eva_limit_frame_group_total_salary").val());
+    var cal_divine_salary = Number(((val_salary * val_decimal) / val_divine).toFixed(3));
+    $("#eva_limit_frame_group_total_salary_limit").val(cal_divine_salary.toFixed(3));
+    var cal_ceil = Math.ceil(cal_divine_salary);
+    console.log("cal_ceil", cal_ceil);
+    var str_ceil = cal_ceil.toString();
+    var split_ceil = str_ceil.split('');
+    var num_last = Number(split_ceil[split_ceil.length - 1]);
+    if (num_last) {
+        after_cal = num_check - num_last;
+    }
+    var set_salary_limit_rounded = cal_ceil + after_cal;
+    /*console.log("set_salary_limit_rounded", set_salary_limit_rounded);*/
+    $("#eva_limit_frame_group_total_salary_limit_rounded").val(set_salary_limit_rounded.toFixed(3));
 
+
+}