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

Merge branch 'master' of https://gitlab.com/zd-team/tb/tb320eva_zd

Browse Source
This commit is contained in:
LAPTOP-KB8JC2K2\acer
2021-04-09 09:06:09 +07:00
parent 4848843fc1 bdc7560b9e
commit cfa5c53c53
2 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,7 +111,7 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) {
if (cur_dep !== data.emp_department_name) { if (cur_dep !== data.emp_department_name) {
cur_dep = data.emp_department_name; cur_dep = data.emp_department_name;
tag = "<tr><td colspan='15'><span>" + cur_dep + "</span></td></tr>"; tag = "<tr><td colspan='17'><span>" + cur_dep + "</span></td></tr>";
} }
tag += '<tr>'; tag += '<tr>';
@@ -130,7 +130,7 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) {
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_cost_living_' + (i + 1) + '" /></td>';
tag += '<td><p id="eva_adjust_postponement_detail_normal_02_middle_' + (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()" type="number" id="eva_adjust_postponement_detail_normal_02_promoted_percentage_' + (i + 1) + '" /></td>'; tag += '<td><input class="form-control" onchange="Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged()" type="number" id="eva_adjust_postponement_detail_normal_02_promoted_percentage_' + (i + 1) + '" /></td>';
tag += '<td><input disabled class="form-control" type="number" id="eva_adjust_postponement_detail_normal_02_total_promote_' + (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_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_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) + '" /></td>';

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

@@ -9,8 +9,8 @@ function eva_adjust_postponement_normal_FeedDataToForm(data) {
$("#eva_adjust_postponement_normal_theDate").val(formatDate(data.theDate)); $("#eva_adjust_postponement_normal_theDate").val(formatDate(data.theDate));
$("#eva_adjust_postponement_normal_theRound").val(data.theRound); $("#eva_adjust_postponement_normal_theRound").val(data.theRound);
DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_create_evaluation_id"), data, "id", "description", "item_create_evaluation_id", data.create_evaluation_id); DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_create_evaluation_id"), data, "id", "description", "item_create_evaluation_id", data.create_evaluation_id);
$("#eva_adjust_postponement_normal_limit").maskMoney('mask',data.limit); $("#eva_adjust_postponement_normal_limit").val(coreFormatPrice(data.limit, 3));
$("#eva_adjust_postponement_normal_limit_quota").maskMoney('mask',data.limit_quota); $("#eva_adjust_postponement_normal_limit_quota").maskMoney('mask', data.limit_quota);
$("#eva_adjust_postponement_normal_limit_frame").val(data.limit_frame); $("#eva_adjust_postponement_normal_limit_frame").val(data.limit_frame);
$("#eva_adjust_postponement_normal_percentage").val(data.percentage); $("#eva_adjust_postponement_normal_percentage").val(data.percentage);
@@ -28,9 +28,9 @@ function eva_adjust_postponement_normal_GetFromForm() {
eva_adjust_postponement_normalObject.theDate = getDate($("#eva_adjust_postponement_normal_theDate").val()); eva_adjust_postponement_normalObject.theDate = getDate($("#eva_adjust_postponement_normal_theDate").val());
eva_adjust_postponement_normalObject.theRound = $("#eva_adjust_postponement_normal_theRound").val(); eva_adjust_postponement_normalObject.theRound = $("#eva_adjust_postponement_normal_theRound").val();
eva_adjust_postponement_normalObject.create_evaluation_id = $("#eva_adjust_postponement_normal_create_evaluation_id").val(); eva_adjust_postponement_normalObject.create_evaluation_id = $("#eva_adjust_postponement_normal_create_evaluation_id").val();
eva_adjust_postponement_normalObject.limit = $("#eva_adjust_postponement_normal_limit").val().replace(/[,-]/g,''); eva_adjust_postponement_normalObject.limit = $("#eva_adjust_postponement_normal_limit").val().replace(/[,-]/g, '');
eva_adjust_postponement_normalObject.limit_frame = $("#eva_adjust_postponement_normal_limit_frame").val(); eva_adjust_postponement_normalObject.limit_frame = $("#eva_adjust_postponement_normal_limit_frame").val();
eva_adjust_postponement_normalObject.limit_quota = $("#eva_adjust_postponement_normal_limit_quota").val().replace(/[,-]/g,''); eva_adjust_postponement_normalObject.limit_quota = $("#eva_adjust_postponement_normal_limit_quota").val().replace(/[,-]/g, '');
eva_adjust_postponement_normalObject.percentage = $("#eva_adjust_postponement_normal_percentage").val(); eva_adjust_postponement_normalObject.percentage = $("#eva_adjust_postponement_normal_percentage").val();
eva_adjust_postponement_normalObject.managed_by = $("#eva_adjust_postponement_normal_managed_by").val(); eva_adjust_postponement_normalObject.managed_by = $("#eva_adjust_postponement_normal_managed_by").val();
//eva_adjust_postponement_normalObject.org_id = $("#eva_adjust_postponement_normal_org_id").val(); //eva_adjust_postponement_normalObject.org_id = $("#eva_adjust_postponement_normal_org_id").val();
@@ -38,9 +38,9 @@ function eva_adjust_postponement_normal_GetFromForm() {
var eva_adjust_postponement_detail_normal_02 = []; var eva_adjust_postponement_detail_normal_02 = [];
$('#eva_adjust_postponement_detail_normal_02Body tr').each(function () { $('#eva_adjust_postponement_detail_normal_02Body tr').each(function () {
var i = $(this).find("#rowCount").text(); var i = $(this).find("#rowCount").text();
var eacheva_adjust_postponement_detail_normal_02 = eva_adjust_postponement_detail_normal_02_GetFromForm($(this), i); var eacheva_adjust_postponement_detail_normal_02 = eva_adjust_postponement_detail_normal_02_GetFromForm($(this), i);
eva_adjust_postponement_detail_normal_02.push(eacheva_adjust_postponement_detail_normal_02); eva_adjust_postponement_detail_normal_02.push(eacheva_adjust_postponement_detail_normal_02);
}); });
eva_adjust_postponement_normalObject.eva_adjust_postponement_detail_normal_02_model = eva_adjust_postponement_detail_normal_02; eva_adjust_postponement_normalObject.eva_adjust_postponement_detail_normal_02_model = eva_adjust_postponement_detail_normal_02;
@@ -50,9 +50,9 @@ function eva_adjust_postponement_normal_GetFromForm() {
function eva_adjust_postponement_normal_InitialForm() { function eva_adjust_postponement_normal_InitialForm() {
var successFunc = function (result) { var successFunc = function (result) {
eva_adjust_postponement_normal_FeedDataToForm(result); eva_adjust_postponement_normal_FeedDataToForm(result);
endLoad(); endLoad();
}; };
startLoad(); startLoad();
AjaxGetRequest(apisite + eva_adjust_postponement_normal_API + "GetBlankItem", successFunc, AlertDanger); AjaxGetRequest(apisite + eva_adjust_postponement_normal_API + "GetBlankItem", successFunc, AlertDanger);
} }
@@ -65,15 +65,15 @@ function eva_adjust_postponement_normal_SetEditForm(a) {
//Oneva_adjust_postponement_normal_limit_frameChange(); //Oneva_adjust_postponement_normal_limit_frameChange();
//Oneva_adjust_postponement_normal_percentageChange(); //Oneva_adjust_postponement_normal_percentageChange();
Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(); Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged();
endLoad(); endLoad();
}; };
startLoad(); startLoad();
AjaxGetRequest(apisite + eva_adjust_postponement_normal_API + a, successFunc, AlertDanger); AjaxGetRequest(apisite + eva_adjust_postponement_normal_API + a, successFunc, AlertDanger);
} }
function eva_adjust_postponement_normal_SetCreateForm() { function eva_adjust_postponement_normal_SetCreateForm() {
eva_adjust_postponement_normal_editMode = "CREATE"; eva_adjust_postponement_normal_editMode = "CREATE";
eva_adjust_postponement_normal_InitialForm(); eva_adjust_postponement_normal_InitialForm();
} }
//================= Update and Delete ========================================= //================= Update and Delete =========================================
@@ -83,8 +83,7 @@ var eva_adjust_postponement_normal_customValidation = function (group) {
}; };
function eva_adjust_postponement_normal_PutUpdate() { function eva_adjust_postponement_normal_PutUpdate() {
if (!ValidateForm('eva_adjust_postponement_normal', eva_adjust_postponement_normal_customValidation)) if (!ValidateForm('eva_adjust_postponement_normal', eva_adjust_postponement_normal_customValidation)) {
{
return; return;
} }
var data = eva_adjust_postponement_normal_GetFromForm(); var data = eva_adjust_postponement_normal_GetFromForm();
@@ -95,18 +94,18 @@ function eva_adjust_postponement_normal_PutUpdate() {
eva_adjust_postponement_detail_normal_02_Save(getUrlParameter("id")); eva_adjust_postponement_detail_normal_02_Save(getUrlParameter("id"));
//AlertSuccess(result.message); //AlertSuccess(result.message);
//setTimeout(window.location.reload(), 3000); //setTimeout(window.location.reload(), 3000);
endLoad(); endLoad();
}; };
startLoad(); startLoad();
AjaxPutRequest(apisite + eva_adjust_postponement_normal_API + data.id, data, successFunc1, AlertDanger); AjaxPutRequest(apisite + eva_adjust_postponement_normal_API + data.id, data, successFunc1, AlertDanger);
} }
// Create mode // Create mode
else { else {
var successFunc2 = function (result) { var successFunc2 = function (result) {
AlertSuccess(result.message); AlertSuccess(result.message);
endLoad(); endLoad();
}; };
startLoad(); startLoad();
AjaxPostRequest(apisite + eva_adjust_postponement_normal_API, data, successFunc2, AlertDanger); AjaxPostRequest(apisite + eva_adjust_postponement_normal_API, data, successFunc2, AlertDanger);
} }
} }
@@ -116,72 +115,73 @@ function eva_adjust_postponement_normal_GoDelete(a) {
var successFunc = function (result) { var successFunc = function (result) {
AlertSuccess(result.message); AlertSuccess(result.message);
eva_adjust_postponement_normal_RefreshTable(); eva_adjust_postponement_normal_RefreshTable();
endLoad(); endLoad();
}; };
startLoad(); startLoad();
AjaxDeleteRequest(apisite + eva_adjust_postponement_normal_API + a, null, successFunc, AlertDanger); AjaxDeleteRequest(apisite + eva_adjust_postponement_normal_API + a, null, successFunc, AlertDanger);
} }
} }
//================= Control Function ========================================= //================= Control Function =========================================
function Oneva_adjust_postponement_normal_limit_frameChange(){ function Oneva_adjust_postponement_normal_limit_frameChange() {
var limit = $("#eva_adjust_postponement_normal_limit").val().replace(/[,-]/g,''); var limit = $("#eva_adjust_postponement_normal_limit").val().replace(/[,-]/g, '');
var limit_frame = $("#eva_adjust_postponement_normal_limit_frame").val(); var limit_frame = $("#eva_adjust_postponement_normal_limit_frame").val();
limit_frame = Math.round(limit_frame*100)/100; limit_frame = (Math.round(limit_frame * 1000) / 1000).toFixed(3);
$("#eva_adjust_postponement_normal_limit_frame").val(limit_frame); $("#eva_adjust_postponement_normal_limit_frame").val(limit_frame);
//$("#eva_adjust_postponement_normal_limit_quota").val(Math.ceil((limit*limit_frame/1000))*10); //$("#eva_adjust_postponement_normal_limit_quota").val(Math.ceil((limit*limit_frame/1000))*10);
$("#eva_adjust_postponement_normal_limit_quota").maskMoney('mask',Math.ceil((limit*limit_frame/1000))*10); $("#eva_adjust_postponement_normal_limit_quota").maskMoney('mask', Math.ceil((limit * limit_frame / 1000)) * 10);
} }
function Oneva_adjust_postponement_normal_percentageChange(){ function Oneva_adjust_postponement_normal_percentageChange() {
var percentage = $("#eva_adjust_postponement_normal_percentage").val(); var percentage = $("#eva_adjust_postponement_normal_percentage").val();
percentage = Math.round(percentage*100)/100; percentage = Math.round(percentage * 100) / 100;
$("#eva_adjust_postponement_normal_percentage").val(percentage) $("#eva_adjust_postponement_normal_percentage").val(percentage)
$('#eva_adjust_postponement_detail_normal_02Body tr').each(function () { $('#eva_adjust_postponement_detail_normal_02Body tr').each(function () {
var i = $(this).find("#rowCount").text(); var i = $(this).find("#rowCount").text();
$("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val(percentage); $("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val(percentage);
}); });
Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(); Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged();
} }
function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(){ function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged() {
var current_quota = $("#eva_adjust_postponement_normal_limit_quota").val().replace(/[,-]/g,''); var current_quota = $("#eva_adjust_postponement_normal_limit_quota").val().replace(/[,-]/g, '');
var sum_postpone = 0; var sum_postpone = 0;
var sum_before = 0; var sum_before = 0;
var sum_after = 0; var sum_after = 0;
$('#eva_adjust_postponement_detail_normal_02Body tr').each(function () { $('#eva_adjust_postponement_detail_normal_02Body tr').each(function () {
var i = $(this).find("#rowCount").text(); var i = $(this).find("#rowCount").text();
if(i){ if (i) {
var percentage = $("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val().replace(/[,-]/g,''); var percentage = $("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val().replace(/[,-]/g, '');
percentage = Math.round(percentage*100)/100; percentage = Math.round(percentage * 1000) / 1000;
$("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val(percentage); $("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val(percentage.toFixed(3));
var middle = parseFloat($(this).find("#eva_adjust_postponement_detail_normal_02_middle_" + 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 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_added = Math.ceil(((percentage * middle) / 100) / 10) * 10;
var new_salary = parseFloat(old_salary + new_added); var new_salary = parseFloat(old_salary + new_added);
$("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val(new_added); var format_new_added = coreFormatPrice(new_added, 3);
$("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val(format_new_added);
$("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text(formatNumber(new_salary)); $("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text(formatNumber(new_salary));
if(new_salary < 13285){ if (new_salary < 13285) {
$("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(13285-new_salary); $("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(13285 - new_salary);
}else{ } else {
$("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(0); $("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(0);
} }
sum_postpone += new_added; sum_postpone += new_added;
sum_before += old_salary; sum_before += old_salary;
sum_after += new_salary; sum_after += new_salary;
} }
}); });
// $("#remain_cost").val(Math.round((current_quota - sum_postpone)*100)/100); // $("#remain_cost").val(Math.round((current_quota - sum_postpone)*100)/100);
$("#remain_cost").maskMoney('mask', Math.round((current_quota - sum_postpone) * 100) / 100); $("#remain_cost").maskMoney('mask', Math.round((current_quota - sum_postpone) * 100) / 100);
$("#sum_before").text(formatNumber(sum_before)); $("#sum_before").text(formatNumber(sum_before));
$("#sum_after").text(formatNumber(sum_after)); $("#sum_after").text(formatNumber(sum_after));
} }