ส่ง code แก้ไข OP Change Request 18 ข้อ

This commit is contained in:
Nakorn Rientrakrunchai
2020-05-24 00:33:22 +07:00
parent 017a29c136
commit eea05beb69
81 changed files with 1047 additions and 312 deletions

View File

@@ -15,6 +15,8 @@ $("#eva_adjust_postponement_normal_limit_quota").val(data.limit_quota);
$("#eva_adjust_postponement_normal_percentage").val(data.percentage);
DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_managed_by"), data, "id", "fullname", "item_managed_by", getCookie("emp_id"));
//DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_org_id"), data, "id", "external_name", "item_org_id", data.org_id);
Oneva_adjust_postponement_normal_limit_frameChange();
Oneva_adjust_postponement_normal_percentageChange();
}
@@ -126,7 +128,7 @@ function Oneva_adjust_postponement_normal_limit_frameChange(){
var limit_frame = $("#eva_adjust_postponement_normal_limit_frame").val();
limit_frame = Math.round(limit_frame*100)/100;
$("#eva_adjust_postponement_normal_limit_frame").val(limit_frame);
$("#eva_adjust_postponement_normal_limit_quota").val(Math.round((limit*limit_frame/100)*100)/100);
$("#eva_adjust_postponement_normal_limit_quota").val(Math.round( Math.ceil(limit*limit_frame)/1000)*10 );
}
function Oneva_adjust_postponement_normal_percentageChange(){
@@ -148,26 +150,26 @@ function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged()
$('#eva_adjust_postponement_detail_normal_02Body tr').each(function () {
var i = $(this).find("#rowCount").text();
var percentage = $("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val();
percentage = Math.round(percentage*100)/100;
$("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val(percentage);
if(i){
var percentage = $("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val();
percentage = Math.round(percentage*100)/100;
$("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val(percentage);
var middle = parseFloat($(this).find("#eva_adjust_postponement_detail_normal_02_middle_" + i).text());
var old_salary = parseFloat($(this).find("#eva_adjust_postponement_detail_normal_02_sarary_" + i).text());
var new_added = Math.ceil(((percentage * middle)/100)/10)*10;
var new_salary = parseFloat(old_salary + new_added);
var middle = parseFloat($(this).find("#eva_adjust_postponement_detail_normal_02_middle_" + i).text());
var old_salary = parseFloat($(this).find("#eva_adjust_postponement_detail_normal_02_sarary_" + i).text());
var new_added = Math.ceil(((percentage * middle)/100)/10)*10;
var new_salary = parseFloat(old_salary + new_added);
$("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val(new_added);
$("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text(formatNumber(new_salary));
$("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val(new_added);
$("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text(new_salary);
if(new_salary < 13285){
$("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(formatNumber(1000));
}else{
$("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(0);
if(new_salary < 13285){
$("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(1000);
}else{
$("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(0);
}
sum_postpone += new_added;
}
sum_postpone += new_added;
});
$("#remain_cost").val(Math.round((current_quota - sum_postpone)*100)/100);