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

fix bug op 2785

Browse Source
This commit is contained in:
Prathan B
2020-07-12 15:43:23 +07:00
parent a127cad52f
commit 28f771979c
6 changed files with 226 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal_d.cshtml
View File

@@ -61,7 +61,7 @@
<div class="form-group col-md-6">
<label id="lab_eva_adjust_postponement_normal_limit" for="eva_adjust_postponement_normal_limit">บริหารวงเงิน</label>
<input disabled class="form-control" type="number" id="eva_adjust_postponement_normal_limit" iLabel="บริหารวงเงิน" iRequire="true" iGroup="eva_adjust_postponement_normal" />
<input disabled class="form-control money" type="text" id="eva_adjust_postponement_normal_limit" iLabel="บริหารวงเงิน" iRequire="true" iGroup="eva_adjust_postponement_normal" />
</div>
</div>
<div class='row'>
@@ -72,7 +72,7 @@
<div class="form-group col-md-6">
<label id="lab_eva_adjust_postponement_normal_limit_quota" for="eva_adjust_postponement_normal_limit_quota">จำนวนเงินที่สามารถบริหารวงเงิน</label>
<input disabled class="form-control" type="number" id="eva_adjust_postponement_normal_limit_quota" iLabel="จำนวนเงินที่สามารถบริหารวงเงิน" iRequire="true" iGroup="eva_adjust_postponement_normal" />
<input disabled placeholder="0.00" class="form-control money mask_plugin" id="eva_adjust_postponement_normal_limit_quota" iLabel="จำนวนเงินที่สามารถบริหารวงเงิน" iRequire="true" iGroup="eva_adjust_postponement_normal" />
</div>
</div>
<div class='row'>
@@ -82,7 +82,7 @@
</div>
<div class="form-group col-md-6">
<label for="eva_adjust_postponement_normal_percentage">จำนวนเงินที่ใช้เลื่อนคงเหลือ</label>
<input disabled class="form-control" type="number" id="remain_cost" iLabel="จำนวนเงินที่ใช้เลื่อนคงเหลือ" iRequire="true" iGroup="" />
<input disabled placeholder="0.00" class="form-control money mask_plugin" id="remain_cost" iLabel="จำนวนเงินที่ใช้เลื่อนคงเหลือ" iRequire="true" iGroup="" />
</div>
</div>

18
wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js
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(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_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_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(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_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_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);
@@ -46,12 +46,12 @@ function eva_adjust_postponement_detail_normal_02_GetFromForm(obj, i) {
eva_adjust_postponement_detail_normal_02Object.id = obj.find("#eva_adjust_postponement_detail_normal_02_id_" + i).val();
eva_adjust_postponement_detail_normal_02Object.adjust_postponement_id = obj.find("#eva_adjust_postponement_detail_normal_02_adjust_postponement_id_" + i).val();
eva_adjust_postponement_detail_normal_02Object.employee_id = obj.find("#eva_adjust_postponement_detail_normal_02_employee_id_" + i).val();
eva_adjust_postponement_detail_normal_02Object.sarary = obj.find("#eva_adjust_postponement_detail_normal_02_sarary_" + i).text();
eva_adjust_postponement_detail_normal_02Object.cost_living = obj.find("#eva_adjust_postponement_detail_normal_02_cost_living_" + i).text();
eva_adjust_postponement_detail_normal_02Object.middle = obj.find("#eva_adjust_postponement_detail_normal_02_middle_" + i).text();
eva_adjust_postponement_detail_normal_02Object.sarary = obj.find("#eva_adjust_postponement_detail_normal_02_sarary_" + i).text().replace(/[,-]/g,'');
eva_adjust_postponement_detail_normal_02Object.cost_living = obj.find("#eva_adjust_postponement_detail_normal_02_cost_living_" + i).text().replace(/[,-]/g,'');
eva_adjust_postponement_detail_normal_02Object.middle = obj.find("#eva_adjust_postponement_detail_normal_02_middle_" + i).text().replace(/[,-]/g,'');
eva_adjust_postponement_detail_normal_02Object.promoted_percentage = obj.find("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val();
eva_adjust_postponement_detail_normal_02Object.total_promote = obj.find("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val();
eva_adjust_postponement_detail_normal_02Object.new_sarary = obj.find("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text();
eva_adjust_postponement_detail_normal_02Object.new_sarary = obj.find("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text().replace(/[,-]/g,'');
eva_adjust_postponement_detail_normal_02Object.new_cost_living = obj.find("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text();
eva_adjust_postponement_detail_normal_02Object.remark = obj.find("#eva_adjust_postponement_detail_normal_02_remark_" + i).text();
eva_adjust_postponement_detail_normal_02Object.emp_code = obj.find("#eva_adjust_postponement_detail_normal_02_emp_code_" + i).text();

4
wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal.js
View File

@@ -32,7 +32,9 @@ $("#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);
$("#eva_adjust_postponement_normal_limit").val(data.limit);
$("#eva_adjust_postponement_normal_limit_frame").val(data.limit_frame);
$("#eva_adjust_postponement_normal_limit_quota").val(data.limit_quota);
// $("#eva_adjust_postponement_normal_limit_quota").val(data.limit_quota);
$("#eva_adjust_postponement_normal_limit_quota").maskMoney('mask',data.limit_quota);
$("#eva_adjust_postponement_normal_percentage").val(data.percentage);
DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_managed_by"), data, "id", "fullname", "item_managed_by", getCookie("emp_id"));
//DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_org_id"), data, "id", "external_name", "item_org_id", data.org_id);

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

@@ -9,9 +9,10 @@ $("#eva_adjust_postponement_normal_fiscal_year").val(data.fiscal_year);
$("#eva_adjust_postponement_normal_theDate").val(formatDate(data.theDate));
$("#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);
$("#eva_adjust_postponement_normal_limit").val(data.limit);
$("#eva_adjust_postponement_normal_limit").maskMoney('mask',data.limit);
$("#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_quota").val(data.limit_quota);
$("#eva_adjust_postponement_normal_percentage").val(data.percentage);
DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_managed_by"), data, "id", "fullname", "item_managed_by", getCookie("emp_id"));
//DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_org_id"), data, "id", "external_name", "item_org_id", data.org_id);
@@ -27,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.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.limit = $("#eva_adjust_postponement_normal_limit").val();
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_quota = $("#eva_adjust_postponement_normal_limit_quota").val();
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.managed_by = $("#eva_adjust_postponement_normal_managed_by").val();
//eva_adjust_postponement_normalObject.org_id = $("#eva_adjust_postponement_normal_org_id").val();
@@ -124,11 +125,13 @@ function eva_adjust_postponement_normal_GoDelete(a) {
//================= Control Function =========================================
function Oneva_adjust_postponement_normal_limit_frameChange(){
var limit = $("#eva_adjust_postponement_normal_limit").val();
var limit = $("#eva_adjust_postponement_normal_limit").val().replace(/[,-]/g,'');
var limit_frame = $("#eva_adjust_postponement_normal_limit_frame").val();
limit_frame = Math.round(limit_frame*100)/100;
$("#eva_adjust_postponement_normal_limit_frame").val(limit_frame);
$("#eva_adjust_postponement_normal_limit_quota").val(Math.round( Math.ceil(limit*limit_frame)/1000)*10 );
// $("#eva_adjust_postponement_normal_limit_quota").val(Math.round( Math.ceil(limit*limit_frame)/1000)*10 );
$("#eva_adjust_postponement_normal_limit_quota").maskMoney('mask',Math.round( Math.ceil(limit*limit_frame)/1000)*10 );
}
function Oneva_adjust_postponement_normal_percentageChange(){
@@ -144,24 +147,24 @@ function Oneva_adjust_postponement_normal_percentageChange(){
}
function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(){
var current_quota = $("#eva_adjust_postponement_normal_limit_quota").val();
var current_quota = $("#eva_adjust_postponement_normal_limit_quota").val().replace(/[,-]/g,'');
var sum_postpone = 0;
$('#eva_adjust_postponement_detail_normal_02Body tr').each(function () {
var i = $(this).find("#rowCount").text();
if(i){
var percentage = $("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val();
var percentage = $("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val().replace(/[,-]/g,'');
percentage = Math.round(percentage*100)/100;
$("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val(percentage);
var middle = parseFloat($(this).find("#eva_adjust_postponement_detail_normal_02_middle_" + i).text());
var old_salary = parseFloat($(this).find("#eva_adjust_postponement_detail_normal_02_sarary_" + i).text());
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 new_added = Math.ceil(((percentage * middle)/100)/10)*10;
var new_salary = parseFloat(old_salary + new_added);
$("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val(new_added);
$("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text(new_salary);
$("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text(formatNumber(new_salary));
if(new_salary < 13285){
$("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(1000);
@@ -172,6 +175,7 @@ function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged()
}
});
$("#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);
}

1
wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_inline.js
View File

@@ -22,6 +22,7 @@ $("#eva_adjust_postponement_normal_theRound_" + i).val(data.theRound);
DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_create_evaluation_id_" + i), blankItem, "id", "performance_plan_id", "item_create_evaluation_id", data.create_evaluation_id);
$("#eva_adjust_postponement_normal_limit_" + i).val(data.limit);
$("#eva_adjust_postponement_normal_limit_frame_" + i).val(data.limit_frame);
// $("#eva_adjust_postponement_normal_limit_quota_" + i).val(data.limit_quota);
$("#eva_adjust_postponement_normal_limit_quota_" + i).val(data.limit_quota);
$("#eva_adjust_postponement_normal_percentage_" + i).val(data.percentage);
DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_managed_by_" + i), blankItem, "id", "external_name", "item_managed_by", data.managed_by);

3
wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js
View File

@@ -165,7 +165,8 @@ function CalculateRemainQuota(){
var remain_quota = limit_quota - sum_receive_quota;
$("#remain_quota").val(remain_quota);
//$("#remain_quota").val(remain_quota);
$("#remain_quota").maskMoney('mask', remain_quota);
}