แก้บักโปรแกรม

This commit is contained in:
Nakorn Rientrakrunchai
2020-04-26 23:21:31 +07:00
parent 60dd022bea
commit 69b0b48bc4
20 changed files with 40 additions and 33 deletions

View File

@@ -1,7 +1,12 @@

function formatNumber(num) {
if(num === "" || num === null) return "";
return num.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,')
return num.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,');
}
function formatNumberTemp(num) {
if(num === "" || num === null) return "";
return num.toString();
}
function getUrlParameter(sParam) {

View File

@@ -24,13 +24,13 @@ function eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, i, blankI
$("#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);
$("#eva_adjust_postponement_detail_normal_02_sarary_" + i).text(formatNumber(data.sarary));
$("#eva_adjust_postponement_detail_normal_02_cost_living_" + i).text(formatNumber(data.cost_living));
$("#eva_adjust_postponement_detail_normal_02_middle_" + i).text(formatNumber(data.middle));
$("#eva_adjust_postponement_detail_normal_02_sarary_" + i).text(formatNumberTemp(data.sarary));
$("#eva_adjust_postponement_detail_normal_02_cost_living_" + i).text(formatNumberTemp(data.cost_living));
$("#eva_adjust_postponement_detail_normal_02_middle_" + i).text(formatNumberTemp(data.middle));
$("#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_sarary_" + i).text(formatNumberTemp(data.new_sarary));
$("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(formatNumberTemp(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);

View File

@@ -26,16 +26,16 @@ function eva_adjust_postponement_detail_quota_02_FeedDataToForm(data, i, blankIt
$("#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);
$("#eva_adjust_postponement_detail_quota_02_sarary_" + i).text(formatNumber(data.sarary));
$("#eva_adjust_postponement_detail_quota_02_cost_living_" + i).text(formatNumber(data.cost_living));
$("#eva_adjust_postponement_detail_quota_02_middle_" + i).text(formatNumber(data.middle));
$("#eva_adjust_postponement_detail_quota_02_promoted_percentage_" + i).text(formatNumber(data.promoted_percentage));
$("#eva_adjust_postponement_detail_quota_02_total_promote_" + i).text(formatNumber(data.total_promote));
$("#eva_adjust_postponement_detail_quota_02_new_sarary_" + i).text(formatNumber(data.new_sarary));
$("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text(formatNumber(data.new_cost_living));
$("#eva_adjust_postponement_detail_quota_02_sarary_" + i).text(formatNumberTemp(data.sarary));
$("#eva_adjust_postponement_detail_quota_02_cost_living_" + i).text(formatNumberTemp(data.cost_living));
$("#eva_adjust_postponement_detail_quota_02_middle_" + i).text(formatNumberTemp(data.middle));
$("#eva_adjust_postponement_detail_quota_02_promoted_percentage_" + i).text(formatNumberTemp(data.promoted_percentage));
$("#eva_adjust_postponement_detail_quota_02_total_promote_" + i).text(formatNumberTemp(data.total_promote));
$("#eva_adjust_postponement_detail_quota_02_new_sarary_" + i).text(formatNumberTemp(data.new_sarary));
$("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text(formatNumberTemp(data.new_cost_living));
$("#eva_adjust_postponement_detail_quota_02_remark_" + i).text(data.remark);
$("#eva_adjust_postponement_detail_quota_02_receive_quota_" + i).val(data.receive_quota);
$("#eva_adjust_postponement_detail_quota_02_new_sarary_with_quota_" + i).text(formatNumber(data.new_sarary_with_quota));
$("#eva_adjust_postponement_detail_quota_02_new_sarary_with_quota_" + i).text(formatNumberTemp(data.new_sarary_with_quota));
$("#eva_adjust_postponement_detail_quota_02_emp_code_" + i).text(data.emp_code);
$("#eva_adjust_postponement_detail_quota_02_emp_fullname_" + i).text(data.emp_fullname);
$("#eva_adjust_postponement_detail_quota_02_emp_position_" + i).text(data.emp_position);
@@ -102,6 +102,7 @@ var cur_dep = "";
var tag = "";
if(cur_dep !== data.emp_department_name){
tag += '<tr><td colspan="16">'+data.emp_department_name+'</td></tr>';
cur_dep = data.emp_department_name;
}
tag += '<tr>';