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

7
Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal_d.cshtml
View File

@@ -100,6 +100,13 @@
<section class="wrapper">
<div class="title"><div class="line"></div>รายชื่อบุคคลากร</div>
<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>
</div>
</div>
</div>
<table id="eva_adjust_postponement_detail_normal_02Table" class="display table table-bordered table-striped">
<thead>

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

@@ -9,7 +9,7 @@
$("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val("");
$("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val("");
$("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text("");
$("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text("");
$("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).val("");
$("#eva_adjust_postponement_detail_normal_02_remark_" + i).text("");
$("#eva_adjust_postponement_detail_normal_02_emp_code_" + i).text("");
$("#eva_adjust_postponement_detail_normal_02_emp_fullname_" + i).text("");
@@ -30,6 +30,8 @@ function eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, i, blankI
data.competency = Number(data.competency).toFixed(digits_position);
data.total_score = Number(data.total_score).toFixed(digits_position);
//console.log(data);
$("#eva_adjust_postponement_detail_normal_02_id_" + i).val(data.id);
$("#eva_adjust_postponement_detail_normal_02_adjust_postponement_id_" + i).val(data.adjust_postponement_id);
$("#eva_adjust_postponement_detail_normal_02_employee_id_" + i).val(data.employee_id);
@@ -39,7 +41,7 @@ function eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, i, blankI
$("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val(data.promoted_percentage);
$("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val(data.total_promote);
$("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text(formatNumber(data.new_sarary));
$("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(formatNumber(data.new_cost_living));
$("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).val(data.new_cost_living);
$("#eva_adjust_postponement_detail_normal_02_remark_" + i).text(data.remark);
$("#eva_adjust_postponement_detail_normal_02_emp_code_" + i).text(data.emp_code);
$("#eva_adjust_postponement_detail_normal_02_emp_fullname_" + i).text(data.emp_fullname);
@@ -65,7 +67,7 @@ function eva_adjust_postponement_detail_normal_02_GetFromForm(obj, i) {
eva_adjust_postponement_detail_normal_02Object.promoted_percentage = obj.find("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val();
eva_adjust_postponement_detail_normal_02Object.total_promote = obj.find("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val();
eva_adjust_postponement_detail_normal_02Object.new_sarary = obj.find("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text().replace(/[,-]/g, '');
eva_adjust_postponement_detail_normal_02Object.new_cost_living = obj.find("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text();
eva_adjust_postponement_detail_normal_02Object.new_cost_living = obj.find("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).val();
eva_adjust_postponement_detail_normal_02Object.remark = obj.find("#eva_adjust_postponement_detail_normal_02_remark_" + i).text();
eva_adjust_postponement_detail_normal_02Object.emp_code = obj.find("#eva_adjust_postponement_detail_normal_02_emp_code_" + i).text();
eva_adjust_postponement_detail_normal_02Object.emp_fullname = obj.find("#eva_adjust_postponement_detail_normal_02_emp_fullname_" + i).text();
@@ -129,10 +131,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()" 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(false)" 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><p id="eva_adjust_postponement_detail_normal_02_new_cost_living_' + (i + 1) + '" /></td>';
tag += '<td><input 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) + '" /></td>';
tag += '</tr>';
@@ -145,6 +147,8 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) {
tag += '<td></td>';
tag += '<td></td>';
tag += '<td></td>';
tag += '<td></td>';
tag += '<td></td>';
tag += '<td>' + formatNumber(data.position_allowance) + '</td>';
tag += '<td></td>';
tag += '<td></td>';
@@ -165,6 +169,8 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) {
tag += '<td></td>';
tag += '<td></td>';
tag += '<td></td>';
tag += '<td></td>';
tag += '<td></td>';
tag += '<td>' + formatNumber(data.other_money) + '</td>';
tag += '<td></td>';
tag += '<td></td>';
@@ -180,7 +186,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();
//Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(false);
endLoad();
};
startLoad();

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;