รวม code ปรับ layout เงินประจำตำแหน่ง และค่าตอบแทนรายเดือน
This commit is contained in:
@@ -90,12 +90,10 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) {
|
||||
$('#eva_adjust_postponement_detail_normal_02Body').empty();
|
||||
|
||||
var successFunc = function (response) {
|
||||
//console.log(response);
|
||||
console.log(response);
|
||||
var cur_dep = "";
|
||||
|
||||
$.each(response, function (i, data) {
|
||||
|
||||
|
||||
var tag = "";
|
||||
|
||||
if (cur_dep !== data.emp_department_name) {
|
||||
@@ -105,15 +103,12 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) {
|
||||
|
||||
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><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>';
|
||||
tag += '<td><p id="eva_adjust_postponement_detail_normal_02_emp_level_' + (i + 1) + '" /></td>';
|
||||
|
||||
tag += '<td><p id="eva_adjust_postponement_detail_normal_02_total_score_' + (i + 1) + '" /></td>';
|
||||
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_cost_living_' + (i + 1) + '" /></td>';
|
||||
tag += '<td><p id="eva_adjust_postponement_detail_normal_02_middle_' + (i + 1) + '" /></td>';
|
||||
@@ -122,8 +117,48 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) {
|
||||
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><p id="eva_adjust_postponement_detail_normal_02_remark_' + (i + 1) + '" /></td>';
|
||||
|
||||
tag += '</tr>';
|
||||
|
||||
if(data.position_allowance > 0){
|
||||
tag += '<tr>';
|
||||
tag += '<td></td>';
|
||||
tag += '<td></td>';
|
||||
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>';
|
||||
tag += '<td></td>';
|
||||
tag += '<td></td>';
|
||||
tag += '<td>'+formatNumber(data.position_allowance)+'</td>';
|
||||
tag += '<td></td>';
|
||||
tag += '<td></td>';
|
||||
tag += '</tr>';
|
||||
}
|
||||
|
||||
if(data.other_money > 0){
|
||||
tag += '<tr>';
|
||||
tag += '<td></td>';
|
||||
tag += '<td></td>';
|
||||
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>';
|
||||
tag += '<td></td>';
|
||||
tag += '<td></td>';
|
||||
tag += '<td>'+formatNumber(data.other_money)+'</td>';
|
||||
tag += '<td></td>';
|
||||
tag += '<td></td>';
|
||||
tag += '</tr>';
|
||||
}
|
||||
|
||||
$('#eva_adjust_postponement_detail_normal_02Body').append($(tag));
|
||||
eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, (i + 1), blankItem);
|
||||
});
|
||||
|
||||
@@ -98,6 +98,7 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) {
|
||||
var cur_dep = "";
|
||||
|
||||
var successFunc = function (response) {
|
||||
console.log(response);
|
||||
$.each(response, function (i, data) {
|
||||
var tag = "";
|
||||
if(cur_dep !== data.emp_department_name){
|
||||
@@ -130,6 +131,49 @@ if(cur_dep !== data.emp_department_name){
|
||||
|
||||
|
||||
tag += '</tr>';
|
||||
|
||||
if(data.position_allowance > 0){
|
||||
tag += '<tr>';
|
||||
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>';
|
||||
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>';
|
||||
tag += '</tr>';
|
||||
}
|
||||
|
||||
if(data.other_money > 0){
|
||||
tag += '<tr>';
|
||||
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>';
|
||||
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>';
|
||||
tag += '</tr>';
|
||||
}
|
||||
|
||||
$('#eva_adjust_postponement_detail_quota_02Body').append($(tag));
|
||||
eva_adjust_postponement_detail_quota_02_FeedDataToForm(data, (i + 1), blankItem);
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user