From 38913028d7fb0e3b72e0a1e79c01a7f30e4cb9f1 Mon Sep 17 00:00:00 2001 From: "LAPTOP-KB8JC2K2\\acer" Date: Thu, 22 Apr 2021 10:25:21 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=9B?= =?UTF-8?q?=E0=B8=A3=E0=B8=B8=E0=B8=87=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=84?= =?UTF-8?q?=E0=B8=B3=E0=B8=99=E0=B8=A7=E0=B8=93=20=E0=B8=84=E0=B9=88?= =?UTF-8?q?=E0=B8=B2=E0=B8=84=E0=B8=A3=E0=B8=AD=E0=B8=87=E0=B8=8A=E0=B8=B5?= =?UTF-8?q?=E0=B8=9E=E0=B9=83=E0=B8=AB=E0=B8=A1=E0=B9=88=20=E0=B8=95?= =?UTF-8?q?=E0=B8=B2=E0=B8=A1=E0=B9=80=E0=B8=AB=E0=B8=93=E0=B8=91=E0=B9=8C?= =?UTF-8?q?=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94=E0=B8=B7?= =?UTF-8?q?=E0=B8=AD=E0=B8=99=2013285?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eva_adjust_postponement_normal_d.cshtml | 7 +++++++ ...st_postponement_detail_normal_02_inline.js | 18 ++++++++++++------ .../eva_adjust_postponement_normal_d.js | 19 +++++++++++-------- 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal_d.cshtml b/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal_d.cshtml index bd3a7db..7575b02 100644 --- a/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal_d.cshtml +++ b/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal_d.cshtml @@ -100,6 +100,13 @@
รายชื่อบุคคลากร
+
+
+
+ +
+
+
diff --git a/wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js b/wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js index 392e764..38a0d8b 100644 --- a/wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js +++ b/wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js @@ -9,7 +9,7 @@ $("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val(""); $("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val(""); $("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text(""); - $("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(""); + $("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).val(""); $("#eva_adjust_postponement_detail_normal_02_remark_" + i).text(""); $("#eva_adjust_postponement_detail_normal_02_emp_code_" + i).text(""); $("#eva_adjust_postponement_detail_normal_02_emp_fullname_" + i).text(""); @@ -30,6 +30,8 @@ function eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, i, blankI data.competency = Number(data.competency).toFixed(digits_position); data.total_score = Number(data.total_score).toFixed(digits_position); + //console.log(data); + $("#eva_adjust_postponement_detail_normal_02_id_" + i).val(data.id); $("#eva_adjust_postponement_detail_normal_02_adjust_postponement_id_" + i).val(data.adjust_postponement_id); $("#eva_adjust_postponement_detail_normal_02_employee_id_" + i).val(data.employee_id); @@ -39,7 +41,7 @@ function eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, i, blankI $("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val(data.promoted_percentage); $("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val(data.total_promote); $("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text(formatNumber(data.new_sarary)); - $("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(formatNumber(data.new_cost_living)); + $("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).val(data.new_cost_living); $("#eva_adjust_postponement_detail_normal_02_remark_" + i).text(data.remark); $("#eva_adjust_postponement_detail_normal_02_emp_code_" + i).text(data.emp_code); $("#eva_adjust_postponement_detail_normal_02_emp_fullname_" + i).text(data.emp_fullname); @@ -65,7 +67,7 @@ function eva_adjust_postponement_detail_normal_02_GetFromForm(obj, i) { eva_adjust_postponement_detail_normal_02Object.promoted_percentage = obj.find("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val(); eva_adjust_postponement_detail_normal_02Object.total_promote = obj.find("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val(); eva_adjust_postponement_detail_normal_02Object.new_sarary = obj.find("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text().replace(/[,-]/g, ''); - eva_adjust_postponement_detail_normal_02Object.new_cost_living = obj.find("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(); + eva_adjust_postponement_detail_normal_02Object.new_cost_living = obj.find("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).val(); eva_adjust_postponement_detail_normal_02Object.remark = obj.find("#eva_adjust_postponement_detail_normal_02_remark_" + i).text(); eva_adjust_postponement_detail_normal_02Object.emp_code = obj.find("#eva_adjust_postponement_detail_normal_02_emp_code_" + i).text(); eva_adjust_postponement_detail_normal_02Object.emp_fullname = obj.find("#eva_adjust_postponement_detail_normal_02_emp_fullname_" + i).text(); @@ -129,10 +131,10 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) { tag += ''; tag += ''; tag += ''; - tag += ''; + tag += ''; tag += ''; tag += ''; - tag += ''; + tag += ''; tag += ''; tag += ''; @@ -145,6 +147,8 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) { tag += ''; tag += ''; tag += ''; + tag += ''; + tag += ''; tag += ''; tag += ''; tag += ''; @@ -165,6 +169,8 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) { tag += ''; tag += ''; tag += ''; + tag += ''; + tag += ''; tag += ''; tag += ''; tag += ''; @@ -180,7 +186,7 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) { eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, (i + 1), blankItem); }); //eva_adjust_postponement_detail_normal_02_Summary(); - Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(); + //Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(false); endLoad(); }; startLoad(); diff --git a/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js b/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js index a9ab6d4..b0d70ed 100644 --- a/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js +++ b/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js @@ -64,7 +64,7 @@ function eva_adjust_postponement_normal_SetEditForm(a) { eva_adjust_postponement_normal_FeedDataToForm(result); //Oneva_adjust_postponement_normal_limit_frameChange(); //Oneva_adjust_postponement_normal_percentageChange(); - Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(); + Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(false); endLoad(); }; startLoad(); @@ -143,10 +143,10 @@ function Oneva_adjust_postponement_normal_percentageChange() { var i = $(this).find("#rowCount").text(); $("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val(percentage); }); - Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(); + Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(false); } -function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged() { +function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(m) { var current_quota = $("#eva_adjust_postponement_normal_limit_quota").val().replace(/[,-]/g, ''); var sum_postpone = 0; var sum_before = 0; @@ -169,11 +169,14 @@ function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged() $("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val(format_new_added); $("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text(formatNumber(new_salary)); - if (new_salary < 13285) { - $("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(13285 - new_salary); - } else { - $("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(0); - } + if (m) { + if (new_salary < 13285) { + $("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).val(13285 - new_salary); + } else { + $("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).val(0); + } + } + sum_postpone += new_added; sum_before += old_salary; sum_after += new_salary;

' + formatNumber(data.position_allowance) + '' + formatNumber(data.other_money) + '