thamming_dev01/hrm_eva
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ปรับปรุงการคำนวณ ค่าครองชีพใหม่ ตามเหณฑ์เงินเดือน 13285

Browse Source
This commit is contained in:
LAPTOP-KB8JC2K2\acer
2021-04-22 10:25:21 +07:00
parent 707fcfd278
commit 38913028d7
3 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js
View File

@@ -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;