From 9774fb0a9caa90877d8853cd7c62ab7cd4b9f42d Mon Sep 17 00:00:00 2001 From: nakorn Date: Sat, 19 Mar 2022 12:48:21 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=88=E0=B9=89=E0=B8=87=E0=B8=9E?= =?UTF-8?q?=E0=B8=99=E0=B8=B1=E0=B8=81=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B9=81?= =?UTF-8?q?=E0=B8=8B=E0=B8=94=E0=B8=94=E0=B8=B5=E0=B8=97=E0=B8=A3=E0=B8=B2?= =?UTF-8?q?=E0=B8=9A=20=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=9B=E0=B8=A3?= =?UTF-8?q?=E0=B8=B0=E0=B8=8A=E0=B8=B8=E0=B8=A1=E0=B8=97=E0=B8=A3=E0=B8=B1?= =?UTF-8?q?=E0=B8=9E=E0=B8=A2=E0=B9=8C=E0=B9=80=E0=B8=A1=E0=B8=B7=E0=B9=88?= =?UTF-8?q?=E0=B8=AD=E0=B8=A7=E0=B8=B1=E0=B8=99=E0=B8=A8=E0=B8=B8=E0=B8=81?= =?UTF-8?q?=E0=B8=A3=E0=B9=8C=E0=B8=97=E0=B8=B5=E0=B9=88=204=20=E0=B8=A1?= =?UTF-8?q?=E0=B8=B5.=E0=B8=84.=2065=20=E0=B9=84=E0=B8=94=E0=B9=89?= =?UTF-8?q?=E0=B8=A1=E0=B8=B5=E0=B8=A1=E0=B8=95=E0=B8=B4=E0=B9=83=E0=B8=AB?= =?UTF-8?q?=E0=B9=89=20=E0=B8=9E=E0=B8=99=E0=B8=B1=E0=B8=81=E0=B8=87?= =?UTF-8?q?=E0=B8=B2=E0=B8=99=E0=B8=97=E0=B8=B1=E0=B9=88=E0=B8=A7=E0=B9=84?= =?UTF-8?q?=E0=B8=9B=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94?= =?UTF-8?q?=E0=B8=B7=E0=B8=AD=E0=B8=99=E0=B8=95=E0=B8=B1=E0=B8=99=E0=B8=97?= =?UTF-8?q?=E0=B8=B5=E0=B9=88=2025020=20=E0=B8=9A=E0=B8=B2=E0=B8=97=20?= =?UTF-8?q?=E0=B8=96=E0=B9=89=E0=B8=B2=E0=B9=80=E0=B8=A5=E0=B8=A2=E0=B8=99?= =?UTF-8?q?=E0=B8=B5=E0=B9=89=E0=B9=83=E0=B8=AB=E0=B9=89=E0=B8=A3=E0=B8=B1?= =?UTF-8?q?=E0=B8=9A=E0=B9=80=E0=B8=9B=E0=B9=87=E0=B8=99=E0=B8=84=E0=B9=88?= =?UTF-8?q?=E0=B8=B2=E0=B8=95=E0=B8=AD=E0=B8=9A=E0=B9=81=E0=B8=97=E0=B8=99?= =?UTF-8?q?=E0=B8=9E=E0=B8=B4=E0=B9=80=E0=B8=A8=E0=B8=A9=20=E0=B9=81?= =?UTF-8?q?=E0=B8=A5=E0=B8=B0=E0=B8=9E=E0=B8=99=E0=B8=B1=E0=B8=81=E0=B8=87?= =?UTF-8?q?=E0=B8=B2=E0=B8=99=E0=B9=83=E0=B8=99=E0=B8=A3=E0=B8=B0=E0=B8=94?= =?UTF-8?q?=E0=B8=B1=E0=B8=9A=E0=B8=8A=E0=B8=B3=E0=B8=99=E0=B8=B2=E0=B8=8D?= =?UTF-8?q?=E0=B8=87=E0=B8=B2=E0=B8=99=20=E0=B9=83=E0=B8=AB=E0=B9=89?= =?UTF-8?q?=E0=B8=95=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B5=E0=B9=88=2049480?= =?UTF-8?q?=20=E0=B8=9A=E0=B8=B2=E0=B8=97=20=E0=B8=96=E0=B9=89=E0=B8=B2?= =?UTF-8?q?=E0=B9=80=E0=B8=A5=E0=B8=A2=E0=B8=99=E0=B8=B5=E0=B9=89=E0=B9=83?= =?UTF-8?q?=E0=B8=AB=E0=B9=89=E0=B9=84=E0=B8=94=E0=B9=89=E0=B8=84=E0=B9=88?= =?UTF-8?q?=E0=B8=B2=E0=B8=95=E0=B8=AD=E0=B8=9A=E0=B9=81=E0=B8=97=E0=B8=99?= =?UTF-8?q?=E0=B8=9E=E0=B8=B4=E0=B9=80=E0=B8=A8=E0=B8=A9=20=E0=B8=88?= =?UTF-8?q?=E0=B8=B6=E0=B8=87=E0=B8=82=E0=B8=AD=E0=B9=83=E0=B8=AB=E0=B9=89?= =?UTF-8?q?=E0=B8=97=E0=B8=B2=E0=B8=87=20=E0=B8=9A.=20=E0=B9=84=E0=B8=9B?= =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B9=81=E0=B8=81=E0=B9=89?= =?UTF-8?q?=E0=B9=83=E0=B8=99=20text=20box=20=E0=B9=80=E0=B8=94=E0=B8=B4?= =?UTF-8?q?=E0=B8=A1=E0=B9=83=E0=B8=99=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A?= =?UTF-8?q?=20=E0=B9=81=E0=B8=A5=E0=B8=B0=E0=B9=80=E0=B8=9E=E0=B8=B4?= =?UTF-8?q?=E0=B9=88=E0=B8=A1=E0=B8=8A=E0=B9=88=E0=B8=AD=E0=B8=87=E0=B8=84?= =?UTF-8?q?=E0=B9=88=E0=B8=B2=E0=B8=95=E0=B8=AD=E0=B8=9A=E0=B9=81=E0=B8=97?= =?UTF-8?q?=E0=B8=99=E0=B8=9E=E0=B8=B4=E0=B9=80=E0=B8=A8=E0=B8=A9=E0=B9=83?= =?UTF-8?q?=E0=B8=99=E0=B9=80=E0=B8=A1=E0=B8=99=E0=B8=B9=E0=B8=97=E0=B8=B5?= =?UTF-8?q?=E0=B9=88=20=E0=B8=9C=E0=B8=AD.=20=E0=B9=83=E0=B8=8A=E0=B9=89?= =?UTF-8?q?=E0=B8=AB=E0=B8=A2=E0=B8=AD=E0=B8=94=E0=B9=80=E0=B8=87=E0=B8=B4?= =?UTF-8?q?=E0=B8=99=E0=B9=83=E0=B8=99=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A?= =?UTF-8?q?=E0=B8=94=E0=B9=89=E0=B8=A7=E0=B8=A2=E0=B8=84=E0=B9=88=E0=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eva_adjust_postponement_normal_d.cshtml | 12 +++--- .../eva_adjust_postponement_quota_d.cshtml | 4 +- ...st_postponement_detail_normal_02_inline.js | 33 +++++++------- ...ust_postponement_detail_quota_02_inline.js | 16 +++---- .../eva_adjust_postponement_normal_d.js | 43 +++++++++++++------ .../eva_adjust_postponement_quota_d.js | 27 +++++++++--- 6 files changed, 84 insertions(+), 51 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 5e247d4..8989082 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 @@ -123,16 +123,16 @@ - - - + + - + + @@ -149,13 +149,13 @@ รวม

- +

- + diff --git a/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota_d.cshtml b/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota_d.cshtml index e913d2d..7bb880e 100644 --- a/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota_d.cshtml +++ b/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota_d.cshtml @@ -141,8 +141,8 @@ - + @@ -153,8 +153,8 @@ - + 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 dd16ce3..0eb9058 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 @@ -64,16 +64,15 @@ function eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, i, blankI $("#eva_adjust_postponement_detail_normal_02_salary_max_" + i).text(data.salary_max); $("#eva_adjust_postponement_detail_normal_02_themax_" + i).text(data.themax); - $("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).val(data.reward_old); - $("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).val(data.reward_new); + //if (data.new_sarary > data.themax) { + // $("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).text(formatNumber2(data.new_sarary - data.themax, 0)); + //} else { + // $("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).text(formatNumber2(0, 0)); + //} - if (data.new_sarary > data.themax) { - $("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).text(formatNumber2(data.new_sarary - data.themax, 3)); - } else { - $("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).text(formatNumber2(0, 3)); - } + $("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).text(formatNumber2(data.reward_old, 0)); - $("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(data.reward_new, 3)); + $("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(data.reward_new, 0)); $("#themax_" + i).val(data.themax); $("#min_percentage_" + i).val(data.min_percentage); $("#max_percentage_" + i).val(data.max_percentage); @@ -156,16 +155,16 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) { tag += '

'; tag += '

'; - - tag += '

'; - tag += '

'; + tag += '

'; + tag += '

'; tag += ''; tag += ''; - tag += '

'; - tag += '

'; + + tag += '

'; tag += ''; + tag += '

'; tag += '

'; tag += '

'; - tag += '

'; - tag += '

'; + tag += '

'; tag += '

'; + tag += '

'; tag += '

'; tag += '

'; @@ -144,9 +144,9 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) { tag += '

'; - tag += '

'; + tag += '

'; tag += ''; + tag += '

'; tag += '

'; @@ -160,7 +160,7 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) { tag += 'เงินประจำตำแหน่ง'; tag += ''; tag += '' + formatNumber(data.position_allowance) + ''; - tag += ''; + tag += ''; tag += ''; tag += ''; tag += ''; @@ -169,7 +169,7 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) { tag += ''; tag += ''; tag += '' + formatNumber(data.position_allowance) + ''; - tag += ''; + tag += ''; tag += ''; tag += ''; tag += ''; @@ -183,7 +183,7 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) { tag += 'ค่าตอบแทนรายเดือน'; tag += ''; tag += '' + formatNumber(data.other_money) + ''; - tag += ''; + tag += ''; tag += ''; tag += ''; tag += ''; @@ -192,7 +192,7 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) { tag += ''; tag += ''; tag += '' + formatNumber(data.other_money) + ''; - tag += ''; + tag += ''; tag += ''; tag += ''; tag += ''; 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 d36ab18..671368d 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 @@ -184,18 +184,17 @@ function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(m //if (new_salary > themax) { // alert("เงินเดือนเกินกรอบวงเงินขั้นสูงของพนักงานคือ " + formatNumber(themax) + " บาท แต่สามารถหยอดได้ถึง " + formatNumber(salary_max) + " บาท กรุณาหยอดร้อยละที่ได้เลื่อนอีกครั้งค่ะ"); //} - if (new_salary > salary_max) { - alert("เงินเดือนใหม่ที่ได้รับ เกินกรอบวงเงินสูงสุด(1 ขั้น) ของพนักงาน คือ " + formatNumber(salary_max) + " บาท"); - percentage = 0.000; - $("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val("0.000"); - new_added = Math.ceil(((percentage * middle) / 100) / 10) * 10; - new_salary = parseFloat(old_salary + new_added); - } + //if (new_salary > salary_max) { + // alert("เงินเดือนใหม่ที่ได้รับ เกินกรอบวงเงินสูงสุด(1 ขั้น) ของพนักงาน คือ " + formatNumber(salary_max) + " บาท"); + // percentage = 0.000; + // $("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val("0.000"); + // new_added = Math.ceil(((percentage * middle) / 100) / 10) * 10; + // new_salary = parseFloat(old_salary + new_added); + //} var format_new_added = coreFormatPrice(new_added, 3); - $("#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 (m) { // if (new_salary < 13285) { @@ -215,12 +214,30 @@ function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(m } } - if (new_salary > $("#themax_" + i).val()) { - $("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(new_salary - $("#themax_" + i).val(), 3)); - } else { - $("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(0, 3)); + //if (new_salary > $("#themax_" + i).val()) { + // $("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(new_salary - $("#themax_" + i).val(), 3)); + //} else { + // $("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(0, 3)); + //} + + var emp_position = $("#eva_adjust_postponement_detail_normal_02_emp_position_" + i).text(); + var emp_level = $("#eva_adjust_postponement_detail_normal_02_emp_position_" + i).text(); + + if (emp_position === "พนักงานทั่วไป") { + if (emp_level === "ชำนาญการ" && new_salary > 49480) { + $("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(new_salary - 49480, 0)); + } + else if (new_salary > 25020){ + $("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(new_salary - 25020, 0)); + } + + var reward_new = parseFloat($(this).find("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text().replace(/[,-]/g, '')); + new_salary = new_salary - reward_new; } + $("#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)); + sum_postpone += new_added; sum_before += old_salary; sum_after += new_salary; diff --git a/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js b/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js index 4739a98..5af3c8f 100644 --- a/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js +++ b/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js @@ -157,6 +157,21 @@ function CalculateRemainQuota(m) { if (receive_quota < 0) receive_quota = 0; $("#eva_adjust_postponement_detail_quota_02_receive_quota_" + i).val(receive_quota); + var emp_position = $("#eva_adjust_postponement_detail_quota_02_emp_position_" + i).text(); + var emp_level = $("#eva_adjust_postponement_detail_quota_02_emp_position_" + i).text(); + + if (emp_position === "พนักงานทั่วไป") { + if (emp_level === "ชำนาญการ" && new_sarary > 49480) { + $("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text(formatNumber2(new_sarary - 49480, 0)); + } + else if (new_sarary > 25020) { + $("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text(formatNumber2(new_sarary - 25020, 0)); + } + + var reward_new2 = parseFloat($(this).find("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text().replace(/[,-]/g, '')); + new_sarary = new_sarary - reward_new2; + } + var new_sarary_with_quota = new_sarary + receive_quota; $("#eva_adjust_postponement_detail_quota_02_new_sarary_with_quota_" + i).text(formatNumber(new_sarary_with_quota)); @@ -178,11 +193,13 @@ function CalculateRemainQuota(m) { } } - if (new_sarary_with_quota > $("#themax_" + i).val()) { - $("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text(formatNumber2(new_sarary_with_quota - $("#themax_" + i).val(), 3)); - } else { - $("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text(formatNumber2(0, 3)); - } + //if (new_sarary_with_quota > $("#themax_" + i).val()) { + // $("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text(formatNumber2(new_sarary_with_quota - $("#themax_" + i).val(), 3)); + //} else { + // $("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text(formatNumber2(0, 3)); + //} + + sum_receive_quota += receive_quota;