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

แก้ไข https://app.clickup.com/t/cqx9eg

Browse Source
This commit is contained in:
LAPTOP-KB8JC2K2\acer
2021-09-01 16:32:23 +07:00
parent f1dad78f66
commit 095d8b1a60
6 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
function eva_adjust_postponement_detail_normal_02_ClearForm(i, blankItem) {
var data = blankItem;
$("#eva_adjust_postponement_detail_normal_02_id_" + i).val("");
$("#eva_adjust_postponement_detail_normal_02_adjust_postponement_id_" + i).val("");
$("#eva_adjust_postponement_detail_normal_02_employee_id_" + i).val("");
@@ -21,7 +21,8 @@
$("#eva_adjust_postponement_detail_normal_02_total_score_" + i).text("");
$("#eva_adjust_postponement_detail_normal_02_eva_result_" + i).text("");
$("#eva_adjust_postponement_detail_normal_02_salary_max_" + i).text("");
$("#eva_adjust_postponement_detail_normal_02_themax_" + i).text("");
}
function eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, i, blankItem) {
@@ -53,7 +54,8 @@ function eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, i, blankI
$("#eva_adjust_postponement_detail_normal_02_total_score_" + i).text(data.total_score);
$("#eva_adjust_postponement_detail_normal_02_eva_result_" + i).text(data.eva_result);
$("#eva_adjust_postponement_detail_normal_02_salary_max_" + i).text(data.salary_max);
$("#eva_adjust_postponement_detail_normal_02_themax_" + i).text(data.themax);
}
function eva_adjust_postponement_detail_normal_02_GetFromForm(obj, i) {
@@ -135,7 +137,7 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) {
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><p id="eva_adjust_postponement_detail_normal_02_remark_' + (i + 1) + '" /></td>';
tag += '<td><p id="eva_adjust_postponement_detail_normal_02_remark_' + (i + 1) + '" /><p id="eva_adjust_postponement_detail_normal_02_salary_max_' + (i + 1) + '" /><p id="eva_adjust_postponement_detail_normal_02_themax_' + (i + 1) + '" /></td>';
tag += '</tr>';
if (data.position_allowance > 0) {

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

@@ -159,11 +159,18 @@ function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(m
percentage = Math.round(percentage * 1000) / 1000;
$("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val(percentage.toFixed(3));
var salary_max = parseFloat($(this).find("#eva_adjust_postponement_detail_normal_02_salary_max_" + i).text().replace(/[,-]/g, ''));
var themax = parseFloat($(this).find("#eva_adjust_postponement_detail_normal_02_themax_" + i).text().replace(/[,-]/g, ''));
var middle = parseFloat($(this).find("#eva_adjust_postponement_detail_normal_02_middle_" + i).text().replace(/[,-]/g, ''));
var old_salary = parseFloat($(this).find("#eva_adjust_postponement_detail_normal_02_sarary_" + i).text().replace(/[,-]/g, ''));
var new_added = Math.ceil(((percentage * middle) / 100) / 10) * 10;
var new_salary = parseFloat(old_salary + new_added);
if (new_salary > salary_max) {
alert("เงินเดือนเกินกรอบวงเงินขั้นสูงของพนักงานคือ " + formatNumber(themax) + " บาท แต่สามารถหยอดได้ถึง " + formatNumber(salary_max) + " บาท กรุณาหยอดร้อยละที่ได้เลื่อนอีกครั้งค่ะ");
}
var format_new_added = coreFormatPrice(new_added, 3);
$("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val(format_new_added);