ปรับปรุง https://app.clickup.com/t/1me7cdm
This commit is contained in:
@@ -23,10 +23,15 @@
|
||||
//=====================================================
|
||||
|
||||
function formatNumber(num) {
|
||||
if(num === "" || num === null) return "";
|
||||
if (num === "" || num === null || isNaN(num)) return "";
|
||||
return num.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,');
|
||||
}
|
||||
|
||||
function formatNumber2(num, d) {
|
||||
if (num === "" || num === null || isNaN(num)) return "";
|
||||
return num.toFixed(d).replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,')
|
||||
}
|
||||
|
||||
function formatNumberTemp(num) {
|
||||
if(num === "" || num === null) return "";
|
||||
return num.toString();
|
||||
|
||||
@@ -23,6 +23,9 @@
|
||||
$("#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("");
|
||||
|
||||
$("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).text("");
|
||||
$("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text("");
|
||||
}
|
||||
|
||||
function eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, i, blankItem) {
|
||||
@@ -42,6 +45,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).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);
|
||||
@@ -56,6 +60,18 @@ function eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, i, blankI
|
||||
$("#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);
|
||||
|
||||
$("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).val(data.reward_old);
|
||||
$("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).val(data.reward_new);
|
||||
|
||||
if (data.new_sarary > data.themax) {
|
||||
$("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).text(formatNumber2(data.new_sarary - data.themax, 3));
|
||||
} else {
|
||||
$("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).text(formatNumber2(0, 3));
|
||||
}
|
||||
|
||||
$("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(data.reward_new, 3));
|
||||
$("#themax_" + i).val(data.themax);
|
||||
}
|
||||
|
||||
function eva_adjust_postponement_detail_normal_02_GetFromForm(obj, i) {
|
||||
@@ -79,6 +95,10 @@ function eva_adjust_postponement_detail_normal_02_GetFromForm(obj, i) {
|
||||
eva_adjust_postponement_detail_normal_02Object.eva_result = obj.find("#eva_adjust_postponement_detail_normal_02_eva_result_" + i).text();
|
||||
|
||||
eva_adjust_postponement_detail_normal_02Object.active_mode = obj.find("#isActive_" + i + "_eva_adjust_postponement_detail_normal_02").val();
|
||||
|
||||
eva_adjust_postponement_detail_normal_02Object.reward_old = obj.find("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).text();
|
||||
eva_adjust_postponement_detail_normal_02Object.reward_new = obj.find("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text();
|
||||
|
||||
return eva_adjust_postponement_detail_normal_02Object;
|
||||
}
|
||||
|
||||
@@ -115,11 +135,11 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) {
|
||||
|
||||
if (cur_dep !== data.emp_department_name) {
|
||||
cur_dep = data.emp_department_name;
|
||||
tag = "<tr><td colspan='17'><span>" + cur_dep + "</span></td></tr>";
|
||||
tag = "<tr><td colspan='19'><span>" + cur_dep + "</span></td></tr>";
|
||||
}
|
||||
|
||||
tag += '<tr>';
|
||||
tag += '<td><label id="rowCount">' + (i + 1) + '</label><input type="hidden" id="isActive_' + (i + 1) + '_eva_adjust_postponement_detail_normal_02" value="1" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_normal_02_id_' + (i + 1) + '" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_normal_02_adjust_postponement_id_' + (i + 1) + '" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_normal_02_employee_id_' + (i + 1) + '" /></td>';
|
||||
tag += '<td><label id="rowCount">' + (i + 1) + '</label><input type="hidden" id="isActive_' + (i + 1) + '_eva_adjust_postponement_detail_normal_02" value="1" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_normal_02_id_' + (i + 1) + '" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_normal_02_adjust_postponement_id_' + (i + 1) + '" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_normal_02_employee_id_' + (i + 1) + '" /><input class="form-control" type="hidden" id="themax_' + (i + 1) + '" /></td>';
|
||||
tag += '<td><p id="eva_adjust_postponement_detail_normal_02_emp_code_' + (i + 1) + '" /></td>';
|
||||
tag += '<td><p id="eva_adjust_postponement_detail_normal_02_emp_fullname_' + (i + 1) + '" /></td>';
|
||||
tag += '<td><p id="eva_adjust_postponement_detail_normal_02_emp_position_' + (i + 1) + '" /></td>';
|
||||
@@ -131,11 +151,15 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) {
|
||||
|
||||
tag += '<td><p id="eva_adjust_postponement_detail_normal_02_eva_result_' + (i + 1) + '" /></td>';
|
||||
tag += '<td><p id="eva_adjust_postponement_detail_normal_02_sarary_' + (i + 1) + '" /></td>';
|
||||
|
||||
tag += '<td><p id="eva_adjust_postponement_detail_normal_02_reward_old_' + (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(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><p id="eva_adjust_postponement_detail_normal_02_reward_new_' + (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>';
|
||||
@@ -156,9 +180,11 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) {
|
||||
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>';
|
||||
tag += '<td></td>';
|
||||
tag += '</tr>';
|
||||
}
|
||||
|
||||
@@ -178,9 +204,11 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) {
|
||||
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>';
|
||||
tag += '<td></td>';
|
||||
tag += '</tr>';
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
function eva_adjust_postponement_detail_quota_02_ClearForm(i, blankItem) {
|
||||
var data = blankItem;
|
||||
|
||||
$("#eva_adjust_postponement_detail_quota_02_id_" + i).val("");
|
||||
$("#eva_adjust_postponement_detail_quota_02_adjust_postponement_quota_id_" + i).val("");
|
||||
$("#eva_adjust_postponement_detail_quota_02_employee_id_" + i).val("");
|
||||
@@ -19,10 +19,13 @@
|
||||
$("#eva_adjust_postponement_detail_quota_02_emp_level_" + i).text("");
|
||||
$("#eva_adjust_postponement_detail_quota_02_total_score_" + i).text("");
|
||||
$("#eva_adjust_postponement_detail_quota_02_eva_result_" + i).text("");
|
||||
|
||||
$("#eva_adjust_postponement_detail_quota_02_reward_old_" + i).text("");
|
||||
$("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text("");
|
||||
$("#themax_" + i).val("");
|
||||
}
|
||||
|
||||
function eva_adjust_postponement_detail_quota_02_FeedDataToForm(data, i, blankItem) {
|
||||
|
||||
$("#eva_adjust_postponement_detail_quota_02_id_" + i).val(data.id);
|
||||
$("#eva_adjust_postponement_detail_quota_02_adjust_postponement_quota_id_" + i).val(data.adjust_postponement_quota_id);
|
||||
$("#eva_adjust_postponement_detail_quota_02_employee_id_" + i).val(data.employee_id);
|
||||
@@ -43,6 +46,14 @@ function eva_adjust_postponement_detail_quota_02_FeedDataToForm(data, i, blankIt
|
||||
$("#eva_adjust_postponement_detail_quota_02_total_score_" + i).text(data.total_score);
|
||||
$("#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));
|
||||
} 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);
|
||||
}
|
||||
|
||||
function eva_adjust_postponement_detail_quota_02_GetFromForm(obj, i) {
|
||||
@@ -66,6 +77,8 @@ function eva_adjust_postponement_detail_quota_02_GetFromForm(obj, i) {
|
||||
eva_adjust_postponement_detail_quota_02Object.emp_level = obj.find("#eva_adjust_postponement_detail_quota_02_emp_level_" + i).text();
|
||||
eva_adjust_postponement_detail_quota_02Object.total_score = obj.find("#eva_adjust_postponement_detail_quota_02_total_score_" + i).text();
|
||||
eva_adjust_postponement_detail_quota_02Object.eva_result = obj.find("#eva_adjust_postponement_detail_quota_02_eva_result_" + i).text();
|
||||
eva_adjust_postponement_detail_quota_02Object.reward_old = obj.find("#eva_adjust_postponement_detail_quota_02_reward_old_" + i).text();
|
||||
eva_adjust_postponement_detail_quota_02Object.reward_new2 = obj.find("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text();
|
||||
|
||||
eva_adjust_postponement_detail_quota_02Object.active_mode = obj.find("#isActive_" + i + "_eva_adjust_postponement_detail_quota_02").val();
|
||||
return eva_adjust_postponement_detail_quota_02Object;
|
||||
@@ -107,12 +120,12 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) {
|
||||
|
||||
var tag = "";
|
||||
if (cur_dep !== data.emp_department_name) {
|
||||
tag += '<tr><td colspan="16">' + data.emp_department_name + '</td></tr>';
|
||||
tag += '<tr><td colspan="18">' + data.emp_department_name + '</td></tr>';
|
||||
cur_dep = data.emp_department_name;
|
||||
}
|
||||
|
||||
tag += '<tr>';
|
||||
tag += '<td><label id="rowCount">' + (i + 1) + '</label><input type="hidden" id="isActive_' + (i + 1) + '_eva_adjust_postponement_detail_quota_02" value="1" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_quota_02_id_' + (i + 1) + '" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_quota_02_adjust_postponement_quota_id_' + (i + 1) + '" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_quota_02_employee_id_' + (i + 1) + '" /></td>';
|
||||
tag += '<td><label id="rowCount">' + (i + 1) + '</label><input type="hidden" id="isActive_' + (i + 1) + '_eva_adjust_postponement_detail_quota_02" value="1" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_quota_02_id_' + (i + 1) + '" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_quota_02_adjust_postponement_quota_id_' + (i + 1) + '" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_quota_02_employee_id_' + (i + 1) + '" /><input class="form-control" type="hidden" id="themax_' + (i + 1) + '" /></td>';
|
||||
|
||||
tag += '<td><p id="eva_adjust_postponement_detail_quota_02_emp_code_' + (i + 1) + '" /></td>';
|
||||
tag += '<td><p id="eva_adjust_postponement_detail_quota_02_emp_fullname_' + (i + 1) + '" /></td>';
|
||||
@@ -120,6 +133,7 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) {
|
||||
tag += '<td><p id="eva_adjust_postponement_detail_quota_02_emp_level_' + (i + 1) + '" /></td>';
|
||||
|
||||
tag += '<td><p id="eva_adjust_postponement_detail_quota_02_sarary_' + (i + 1) + '" /></td>';
|
||||
tag += '<td><p id="eva_adjust_postponement_detail_quota_02_reward_old_' + (i + 1) + '" /></td>';
|
||||
tag += '<td><p id="eva_adjust_postponement_detail_quota_02_cost_living_' + (i + 1) + '" /></td>';
|
||||
|
||||
tag += '<td><p id="eva_adjust_postponement_detail_quota_02_total_score_' + (i + 1) + '" /></td>';
|
||||
@@ -131,6 +145,7 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) {
|
||||
|
||||
tag += '<td><input onchange="CalculateRemainQuota(false);" class="form-control" type="number" id="eva_adjust_postponement_detail_quota_02_receive_quota_' + (i + 1) + '" /></td>';
|
||||
tag += '<td><p id="eva_adjust_postponement_detail_quota_02_new_sarary_with_quota_' + (i + 1) + '" /></td>';
|
||||
tag += '<td><p id="eva_adjust_postponement_detail_quota_02_reward_new2_' + (i + 1) + '" /></td>';
|
||||
tag += '<td><input class="form-control" type="number" id="eva_adjust_postponement_detail_quota_02_new_cost_living_' + (i + 1) + '" /></td>';
|
||||
tag += '<td><p id="eva_adjust_postponement_detail_quota_02_remark_' + (i + 1) + '" /></td>';
|
||||
|
||||
@@ -152,9 +167,11 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) {
|
||||
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>';
|
||||
tag += '<td></td>';
|
||||
tag += '</tr>';
|
||||
}
|
||||
|
||||
@@ -173,9 +190,11 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) {
|
||||
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>';
|
||||
tag += '<td></td>';
|
||||
tag += '</tr>';
|
||||
}
|
||||
|
||||
|
||||
@@ -192,7 +192,13 @@ function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(m
|
||||
} else {
|
||||
$("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).val(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (new_salary > $("#themax_" + i).val()) {
|
||||
$("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(new_salary - $("#themax_" + i).val(), 3));
|
||||
} else {
|
||||
$("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(0, 3));
|
||||
}
|
||||
|
||||
sum_postpone += new_added;
|
||||
sum_before += old_salary;
|
||||
|
||||
@@ -178,6 +178,12 @@ function CalculateRemainQuota(m) {
|
||||
}
|
||||
}
|
||||
|
||||
if (new_sarary_with_quota > $("#themax_" + i).val()) {
|
||||
$("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text(formatNumber2(new_sarary_with_quota - $("#themax_" + i).val(), 3));
|
||||
} else {
|
||||
$("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text(formatNumber2(0, 3));
|
||||
}
|
||||
|
||||
sum_receive_quota += receive_quota;
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user