diff --git a/Views/vw_limit_frame_planView/vw_limit_frame_plan_d.cshtml b/Views/vw_limit_frame_planView/vw_limit_frame_plan_d.cshtml
index 98be1f9..0fecf13 100644
--- a/Views/vw_limit_frame_planView/vw_limit_frame_plan_d.cshtml
+++ b/Views/vw_limit_frame_planView/vw_limit_frame_plan_d.cshtml
@@ -75,23 +75,24 @@
                     <div class='row'>
                         <div class="form-group col-md-4">
                             <label id="lab_vw_limit_frame_plan_total_salary" for="vw_limit_frame_plan_total_salary">รวมอัตราเงินเดือน</label>
-                            <input disabled class="form-control" type="number" id="vw_limit_frame_plan_total_salary" iLabel="รวมอัตราเงินเดือน" iRequire="false" iGroup="vw_limit_frame_plan" />
+                            <input disabled class="form-control" type="text" id="vw_limit_frame_plan_total_salary" iLabel="รวมอัตราเงินเดือน" iRequire="false" iGroup="vw_limit_frame_plan" />
                         </div>
 
                         <div class="form-group col-md-4">
                             <label id="lab_vw_limit_frame_plan_limit_frame_005" for="vw_limit_frame_plan_limit_frame_005">กรอบวงเงินที่กันไว้</label>
-                            <input class="form-control" type="number" id="vw_limit_frame_plan_limit_frame_005" iLabel="กรอบวงเงินที่กันไว้" iRequire="false" iGroup="vw_limit_frame_plan" />
+                            <input class="form-control" type="number" id="vw_limit_frame_plan_limit_frame_005" iLabel="กรอบวงเงินที่กันไว้" iRequire="false" iGroup="vw_limit_frame_plan" 
+                                   onchange="changeDigitsLimitFrame(), funcCalculateCeilTotalRoundedLimitFramePlan(event)" />
                         </div>
                     </div>
                     <div class='row'>
                         <div class="form-group col-md-4">
                             <label id="lab_vw_limit_frame_plan_limit_frame_005_total" for="vw_limit_frame_plan_limit_frame_005_total">กันวงเงินไว้</label>
-                            <input disabled class="form-control" type="number" id="vw_limit_frame_plan_limit_frame_005_total" iLabel="กันวงเงินไว้" iRequire="false" iGroup="vw_limit_frame_plan" />
+                            <input disabled class="form-control" type="text" id="vw_limit_frame_plan_limit_frame_005_total" iLabel="กันวงเงินไว้" iRequire="false" iGroup="vw_limit_frame_plan" />
                         </div>
 
                         <div class="form-group col-md-4">
                             <label id="lab_vw_limit_frame_plan_limit_frame_005_total_rounded" for="vw_limit_frame_plan_limit_frame_005_total_rounded">กันวงเงินใช้จริง</label>
-                            <input disabled class="form-control" type="number" id="vw_limit_frame_plan_limit_frame_005_total_rounded" iLabel="กันวงเงินใช้จริง" iRequire="false" iGroup="vw_limit_frame_plan" />
+                            <input disabled class="form-control" type="text" id="vw_limit_frame_plan_limit_frame_005_total_rounded" iLabel="กันวงเงินใช้จริง" iRequire="false" iGroup="vw_limit_frame_plan" />
                         </div>
                     </div>
 
diff --git a/wwwroot/js/eva_limit_frame_group/eva_limit_frame_group.js b/wwwroot/js/eva_limit_frame_group/eva_limit_frame_group.js
index 7936bf8..094f27c 100644
--- a/wwwroot/js/eva_limit_frame_group/eva_limit_frame_group.js
+++ b/wwwroot/js/eva_limit_frame_group/eva_limit_frame_group.js
@@ -1,5 +1,6 @@
 var eva_limit_frame_group_editMode = "CREATE";
 var eva_limit_frame_group_API = "/api/eva_limit_frame_group/";
+var limit_frame_group_digits = 3;
 
 //================= Search Customizaiton =========================================
 
@@ -157,6 +158,21 @@ function eva_limit_frame_group_GoDelete(a) {
 var eva_limit_frame_groupTableV;
 
 var eva_limit_frame_group_setupTable = function (result) {
+
+    $.each(result, function (index_result, obj_result) {
+        /*console.log("index_result", index_result);
+        console.log("obj_result", obj_result);*/
+
+        var currency_total_salary = coreFormatPrice(obj_result.total_salary, limit_frame_group_digits);
+        var currency_total_salary_limit = coreFormatPrice(obj_result.total_salary_limit, limit_frame_group_digits);
+        var currency_total_salary_limit_rounded = coreFormatPrice(obj_result.total_salary_limit_rounded, limit_frame_group_digits);
+
+        obj_result.total_salary = currency_total_salary;
+        obj_result.total_salary_limit = currency_total_salary_limit;
+        obj_result.total_salary_limit_rounded = currency_total_salary_limit_rounded;
+
+    });
+
     tmp = '"';
     eva_limit_frame_groupTableV = $('#eva_limit_frame_groupTable').DataTable({
         "processing": true,
diff --git a/wwwroot/js/vw_limit_frame_plan/vw_limit_frame_plan_d.js b/wwwroot/js/vw_limit_frame_plan/vw_limit_frame_plan_d.js
index 24eec32..29e0ff6 100644
--- a/wwwroot/js/vw_limit_frame_plan/vw_limit_frame_plan_d.js
+++ b/wwwroot/js/vw_limit_frame_plan/vw_limit_frame_plan_d.js
@@ -1,5 +1,6 @@
 var vw_limit_frame_plan_editMode = "CREATE";
 var vw_limit_frame_plan_API = "/api/vw_limit_frame_plan/";
+var limit_frame_digits = 3;
 
 //================= Form Data Customizaiton =========================================
 
@@ -7,11 +8,11 @@ function vw_limit_frame_plan_FeedDataToForm(data) {
     $("#vw_limit_frame_plan_id").val(data.id);
     DropDownClearFormAndFeedWithData($("#vw_limit_frame_plan_plan_guid"), data, "id", "display_text", "item_plan_guid", data.plan_guid);
     $("#vw_limit_frame_plan_executed_date").val(formatDate(data.executed_date));
-    $("#vw_limit_frame_plan_limit_frame_005").val(data.limit_frame_005);
+    $("#vw_limit_frame_plan_limit_frame_005").val(data.limit_frame_005.toFixed(limit_frame_digits));
     $("#vw_limit_frame_plan_salary_adjustment_date").val(formatDate(data.salary_adjustment_date));
-    $("#vw_limit_frame_plan_total_salary").val(data.total_salary);
-    $("#vw_limit_frame_plan_limit_frame_005_total").val(data.limit_frame_005_total);
-    $("#vw_limit_frame_plan_limit_frame_005_total_rounded").val(data.limit_frame_005_total_rounded);
+    $("#vw_limit_frame_plan_total_salary").val(coreFormatPrice(data.total_salary, limit_frame_digits));
+    $("#vw_limit_frame_plan_limit_frame_005_total").val(coreFormatPrice(data.limit_frame_005_total, limit_frame_digits));
+    $("#vw_limit_frame_plan_limit_frame_005_total_rounded").val(coreFormatPrice(data.limit_frame_005_total_rounded, limit_frame_digits));
 
 }
 
@@ -107,3 +108,34 @@ function vw_limit_frame_plan_GoDelete(a) {
 //================= Multi-Selection Function =========================================
 
 
+function changeDigitsLimitFrame() {
+    var val_limit_frame_005 = $("#vw_limit_frame_plan_limit_frame_005").val();
+    if (val_limit_frame_005) {
+        var round_value = Math.round(val_limit_frame_005 * 1000) / 1000;
+        $("#vw_limit_frame_plan_limit_frame_005").val(round_value.toFixed(3));
+    }
+}
+
+
+function funcCalculateCeilTotalRoundedLimitFramePlan(params) {
+    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 = parseFloat(val_input);
+    }
+    var val_salary = coreCurrencyToDecimal($("#vw_limit_frame_plan_total_salary").val());
+    var cal_divine_salary = Number(((val_salary * val_decimal) / val_divine).toFixed(limit_frame_digits));
+    $("#vw_limit_frame_plan_limit_frame_005_total").val(coreFormatPrice(cal_divine_salary, limit_frame_digits));
+    var cal_ceil = Math.ceil(cal_divine_salary);
+    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;
+    $("#vw_limit_frame_plan_limit_frame_005_total_rounded").val(coreFormatPrice(set_salary_limit_rounded, limit_frame_digits));
+}
\ No newline at end of file