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
2022-03-29 18:27:31 +07:00
parent f5ebda01bf
commit 71f1906d79
13 changed files with 180 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,7 +70,11 @@ function eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, i, blankI
// $("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).text(formatNumber2(0, 0));
//}
$("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).text(formatNumber2(data.reward_old, 0));
if (data.reward_old) {
$("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).text(formatNumber2(data.reward_old, 0));
} else {
$("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).text(formatNumber2(0, 0));
}
$("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(data.reward_new, 0));
$("#themax_" + i).val(data.themax);

11
wwwroot/js/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02_inline.js
View File

@@ -46,12 +46,17 @@ function eva_adjust_postponement_detail_quota_02_FeedDataToForm(data, i, blankIt
$("#eva_adjust_postponement_detail_quota_02_total_score_" + i).text(formatNumber2(data.total_score,3));
$("#eva_adjust_postponement_detail_quota_02_eva_result_" + i).text(data.eva_result);
if (data.new_sarary > data.themax) {
$("#eva_adjust_postponement_detail_quota_02_reward_old_" + i).text(formatNumber2(data.new_sarary - data.themax, 3));
//if (data.new_sarary > data.themax) {
// $("#eva_adjust_postponement_detail_quota_02_reward_old_" + i).text(formatNumber2(data.new_sarary - data.themax, 3));
//} else {
// $("#eva_adjust_postponement_detail_quota_02_reward_old_" + i).text(formatNumber2(0, 3));
//}
if (data.reward_old) {
$("#eva_adjust_postponement_detail_quota_02_reward_old_" + i).text(formatNumber2(data.reward_old, 3));
} else {
$("#eva_adjust_postponement_detail_quota_02_reward_old_" + i).text(formatNumber2(0, 3));
}
$("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text(formatNumber2(data.reward_new2, 3));
$("#themax_" + i).val(data.themax);
}

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

@@ -227,12 +227,17 @@ function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(m
if (emp_level === "ชำนาญการ" && new_salary > 49480) {
$("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(new_salary - 49480, 0));
}
else if (new_salary > 25020){
else if (new_salary > 25020) {
$("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(new_salary - 25020, 0));
}
else {
$("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(0, 0));
}
var reward_new = parseFloat($(this).find("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text().replace(/[,-]/g, ''));
new_salary = new_salary - reward_new;
} else {
$("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(0, 0));
}
$("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val(format_new_added);

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

@@ -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) {

2
wwwroot/js/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreement.js
View File

@@ -216,7 +216,7 @@ var eva_create_evaluation_detail_agreement_setupTable = function (result) {
"data": "id",
"render": function (data, type, row, meta) {
if (row.status_chief === "Y") {
return "<button type='button' class='btn btn-warning btn-sm' onclick='javascript:eva_create_evaluation_detail_agreement_GoSelfReview(" + tmp + data + tmp + ")'><i class='fa fa-pencil'></i></button> ";
return "<button style='display:none;' type='button' class='btn btn-warning btn-sm' onclick='javascript:eva_create_evaluation_detail_agreement_GoSelfReview(" + tmp + data + tmp + ")'><i class='fa fa-pencil'></i></button> ";
} else {
return "";
}