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>';

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

@@ -9,7 +9,7 @@ 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);
@@ -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();
@@ -128,7 +127,7 @@ function eva_adjust_postponement_normal_GoDelete(a) {
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);
@@ -157,15 +156,17 @@ function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged()
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) {
@@ -184,4 +185,3 @@ function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged()
$("#sum_before").text(formatNumber(sum_before)); $("#sum_before").text(formatNumber(sum_before));
$("#sum_after").text(formatNumber(sum_after)); $("#sum_after").text(formatNumber(sum_after));
} }