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

แก้ไขสูตรการคำนวณ ค่าครองชีพใหม่

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2020-08-15 17:39:25 +07:00
parent ba1f2a6993
commit 9ad85c83fa
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,7 +148,7 @@ function Oneva_adjust_postponement_normal_percentageChange(){
function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(){
var current_quota = $("#eva_adjust_postponement_normal_limit_quota").val().replace(/[,-]/g,'');
console.log("yy");
var sum_postpone = 0;
$('#eva_adjust_postponement_detail_normal_02Body tr').each(function () {
@@ -167,7 +167,7 @@ function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged()
$("#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(1000);
$("#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);
}

3
wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js
View File

@@ -139,6 +139,7 @@ function Oneva_adjust_postponement_quota_limit_frame_quotaChange() {
}
function CalculateRemainQuota() {
console.log("xx");
var sum_receive_quota = 0;
var limit_quota = parseFloat($("#eva_adjust_postponement_quota_limit_quota").val().replace(/[,-]/g,''));
@@ -157,7 +158,7 @@ function CalculateRemainQuota() {
$("#eva_adjust_postponement_detail_quota_02_new_sarary_with_quota_" + i).text(formatNumber(new_sarary_with_quota));
if (new_sarary_with_quota < 13285) {
$("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text(formatNumber(1000));
$("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text(formatNumber(13285-new_sarary_with_quota));
} else {
$("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text(0);
}