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

ปรับปรุงสูตรและซ่อนปุ่ม

Browse Source
This commit is contained in:
LAPTOP-KB8JC2K2\acer
2021-09-02 18:50:32 +07:00
parent c86841c480
commit ccacb814a3
4 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal_d.cshtml
View File

@@ -103,7 +103,7 @@
<div class="tools">
<div class="row">
<div class="col-md-12">
<button class="btn btn-info" type="button" onclick="javascript:Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(true)">คำนวณค่าครองชีพใหม่ ตามเกณฑ์เงินเดือน 13,285</button>
<button style="display:none;" class="btn btn-info" type="button" onclick="javascript:Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(true)">คำนวณค่าครองชีพใหม่ ตามเกณฑ์เงินเดือน 13,285</button>
</div>
</div>
</div>

6
wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js
View File

@@ -133,10 +133,10 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) {
tag += '<td><p id="eva_adjust_postponement_detail_normal_02_sarary_' + (i + 1) + '" /></td>';
tag += '<td><p id="eva_adjust_postponement_detail_normal_02_cost_living_' + (i + 1) + '" /></td>';
tag += '<td><p id="eva_adjust_postponement_detail_normal_02_middle_' + (i + 1) + '" /></td>';
tag += '<td><input class="form-control" onchange="Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(false)" type="number" id="eva_adjust_postponement_detail_normal_02_promoted_percentage_' + (i + 1) + '" /></td>';
tag += '<td><input class="form-control" onchange="Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(true)" type="number" id="eva_adjust_postponement_detail_normal_02_promoted_percentage_' + (i + 1) + '" /></td>';
tag += '<td><input disabled class="form-control" id="eva_adjust_postponement_detail_normal_02_total_promote_' + (i + 1) + '" /></td>';
tag += '<td><p id="eva_adjust_postponement_detail_normal_02_new_sarary_' + (i + 1) + '" /></td>';
tag += '<td><input class="form-control" id="eva_adjust_postponement_detail_normal_02_new_cost_living_' + (i + 1) + '" /></td>';
tag += '<td><input disabled class="form-control" id="eva_adjust_postponement_detail_normal_02_new_cost_living_' + (i + 1) + '" /></td>';
tag += '<td><p id="eva_adjust_postponement_detail_normal_02_remark_' + (i + 1) + '" /><p style="display:none;" id="eva_adjust_postponement_detail_normal_02_salary_max_' + (i + 1) + '" /><p style="display:none;" id="eva_adjust_postponement_detail_normal_02_themax_' + (i + 1) + '" /></td>';
tag += '</tr>';
@@ -188,7 +188,7 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) {
eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, (i + 1), blankItem);
});
//eva_adjust_postponement_detail_normal_02_Summary();
Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(false);
Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(true);
endLoad();
};
startLoad();

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

@@ -176,13 +176,23 @@ function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(m
$("#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) {
// $("#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);
// }
//}
if (m) {
if (new_salary < 13285) {
if (new_salary <= 11285) {
$("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).val(2000);
} else 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;

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

@@ -160,9 +160,19 @@ function CalculateRemainQuota(m) {
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));
//if (m) {
// if (new_sarary_with_quota < 13285) {
// $("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).val(formatNumber(13285 - new_sarary_with_quota));
// } else {
// $("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).val(0);
// }
//}
if (m) {
if (new_sarary_with_quota < 13285) {
$("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).val(formatNumber(13285 - new_sarary_with_quota));
if (new_salary <= 11285) {
$("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).val(2000);
} else if (new_salary <= 13285) {
$("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).val(13285 - new_sarary_with_quota);
} else {
$("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).val(0);
}