ปิดให้ ผอ และ แผนกบุคคล เห็นคะแนน และ เรื่องอื่นๆ
This commit is contained in:
@@ -150,7 +150,8 @@ function CalculateRemainQuota(m) {
|
||||
var i = $(this).find("#rowCount").text();
|
||||
if (i) {
|
||||
var current_salary = parseFloat($("#eva_adjust_postponement_detail_quota_02_sarary_" + i).text().replace(/[,-]/g, ''));
|
||||
var new_sarary = parseFloat($("#eva_adjust_postponement_detail_quota_02_new_sarary_" + i).text());
|
||||
var new_sarary = parseFloat($("#eva_adjust_postponement_detail_quota_02_new_sarary_" + i).text().replace(/[,-]/g, ''));
|
||||
if (!new_sarary) new_sarary = parseFloat($("#eva_adjust_postponement_detail_quota_02_sarary_" + i).text().replace(/[,-]/g, ''));
|
||||
var receive_quota = parseFloat($("#eva_adjust_postponement_detail_quota_02_receive_quota_" + i).val());
|
||||
|
||||
receive_quota = Math.round(receive_quota * 100) / 100;
|
||||
@@ -167,12 +168,20 @@ function CalculateRemainQuota(m) {
|
||||
else if (new_sarary > 25020) {
|
||||
$("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text(formatNumber2(new_sarary - 25020, 0));
|
||||
}
|
||||
else {
|
||||
$("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text(formatNumber2(0, 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;
|
||||
} else {
|
||||
$("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text(formatNumber2(0, 0));
|
||||
}
|
||||
|
||||
var new_sarary_with_quota = new_sarary + receive_quota;
|
||||
|
||||
|
||||
console.log(new_sarary);
|
||||
$("#eva_adjust_postponement_detail_quota_02_new_sarary_with_quota_" + i).text(formatNumber(new_sarary_with_quota));
|
||||
|
||||
//if (m) {
|
||||
|
||||
Reference in New Issue
Block a user