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

fix comma

Browse Source
This commit is contained in:
Prathan B
2020-07-15 19:20:30 +07:00
parent 3f8e466e4e
commit c1b244c4ff
2 changed files with 109 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota.js
View File

@@ -24,8 +24,10 @@ $("#eva_adjust_postponement_quota_id").val(data.id);
$("#eva_adjust_postponement_quota_fiscal_year").val(data.fiscal_year);
$("#eva_adjust_postponement_quota_theDate").val(formatDate(data.theDate));
$("#eva_adjust_postponement_quota_theRound").val(data.theRound);
$("#eva_adjust_postponement_quota_limit_quota").val(data.limit_quota);
$("#eva_adjust_postponement_quota_limit_frame_quota").val(data.limit_frame_quota);
// $("#eva_adjust_postponement_quota_limit_quota").val(data.limit_quota);
$("#eva_adjust_postponement_quota_limit_quota").maskMoney('mask', data.limit_quota);
// $("#eva_adjust_postponement_quota_limit_frame_quota").val(data.limit_frame_quota);
$("#eva_adjust_postponement_quota_limit_frame_quota").maskMoney('mask', data.limit_frame_quota);
$("#eva_adjust_postponement_quota_command_no").val(data.command_no);
DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_quota_managed_by"), data, "id", "fullname", "item_managed_by", getCookie("emp_id"));
@@ -37,8 +39,8 @@ eva_adjust_postponement_quotaObject.id = $("#eva_adjust_postponement_quota_id").
eva_adjust_postponement_quotaObject.fiscal_year = $("#eva_adjust_postponement_quota_fiscal_year").val();
eva_adjust_postponement_quotaObject.theDate = getDate($("#eva_adjust_postponement_quota_theDate").val());
eva_adjust_postponement_quotaObject.theRound = $("#eva_adjust_postponement_quota_theRound").val();
eva_adjust_postponement_quotaObject.limit_quota = $("#eva_adjust_postponement_quota_limit_quota").val();
eva_adjust_postponement_quotaObject.limit_frame_quota = $("#eva_adjust_postponement_quota_limit_frame_quota").val();
eva_adjust_postponement_quotaObject.limit_quota = $("#eva_adjust_postponement_quota_limit_quota").val().replace(/[,-]/g,'');
eva_adjust_postponement_quotaObject.limit_frame_quota = $("#eva_adjust_postponement_quota_limit_frame_quota").val().replace(/[,-]/g,'');
eva_adjust_postponement_quotaObject.command_no = $("#eva_adjust_postponement_quota_command_no").val();
eva_adjust_postponement_quotaObject.managed_by = $("#eva_adjust_postponement_quota_managed_by").val();
@@ -109,8 +111,7 @@ var eva_adjust_postponement_quota_customValidation = function (group) {
};
function eva_adjust_postponement_quota_PutUpdate() {
if (!ValidateForm('eva_adjust_postponement_quota', eva_adjust_postponement_quota_customValidation))
{
if (!ValidateForm('eva_adjust_postponement_quota', eva_adjust_postponement_quota_customValidation)) {
return;
}

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

@@ -8,8 +8,11 @@ $("#eva_adjust_postponement_quota_id").val(data.id);
$("#eva_adjust_postponement_quota_fiscal_year").val(data.fiscal_year);
$("#eva_adjust_postponement_quota_theDate").val(formatDate(data.theDate));
$("#eva_adjust_postponement_quota_theRound").val(data.theRound);
$("#eva_adjust_postponement_quota_limit_quota").val(data.limit_quota);
$("#eva_adjust_postponement_quota_limit_frame_quota").val(data.limit_frame_quota);
// $("#eva_adjust_postponement_quota_limit_quota").val(data.limit_quota);
$("#eva_adjust_postponement_quota_limit_quota").maskMoney('mask', data.limit_quota);
// $("#eva_adjust_postponement_quota_limit_frame_quota").val(data.limit_frame_quota);
$("#eva_adjust_postponement_quota_limit_frame_quota").maskMoney('mask', data.limit_frame_quota);
$("#eva_adjust_postponement_quota_command_no").val(data.command_no);
$("#eva_adjust_postponement_quota_limit").val(data.limit);
DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_quota_managed_by"), data, "id", "fullname", "item_managed_by", getCookie("emp_id"));
@@ -22,11 +25,11 @@ function eva_adjust_postponement_quota_GetFromForm() {
eva_adjust_postponement_quotaObject.fiscal_year = $("#eva_adjust_postponement_quota_fiscal_year").val();
eva_adjust_postponement_quotaObject.theDate = getDate($("#eva_adjust_postponement_quota_theDate").val());
eva_adjust_postponement_quotaObject.theRound = $("#eva_adjust_postponement_quota_theRound").val();
eva_adjust_postponement_quotaObject.limit_quota = $("#eva_adjust_postponement_quota_limit_quota").val();
eva_adjust_postponement_quotaObject.limit_frame_quota = $("#eva_adjust_postponement_quota_limit_frame_quota").val();
eva_adjust_postponement_quotaObject.limit_quota = $("#eva_adjust_postponement_quota_limit_quota").val().replace(/[,-]/g,'');
eva_adjust_postponement_quotaObject.limit_frame_quota = $("#eva_adjust_postponement_quota_limit_frame_quota").val().replace(/[,-]/g,'');
eva_adjust_postponement_quotaObject.command_no = $("#eva_adjust_postponement_quota_command_no").val();
eva_adjust_postponement_quotaObject.managed_by = $("#eva_adjust_postponement_quota_managed_by").val();
eva_adjust_postponement_quotaObject.limit = $("#eva_adjust_postponement_quota_limit").val();
eva_adjust_postponement_quotaObject.limit = $("#eva_adjust_postponement_quota_limit").val().replace(/[,-]/g,'');
var eva_adjust_postponement_detail_quota_02 = [];
$('#eva_adjust_postponement_detail_quota_02Body tr').each(function () {
@@ -74,8 +77,7 @@ var eva_adjust_postponement_quota_customValidation = function (group) {
};
function eva_adjust_postponement_quota_PutUpdate() {
if (!ValidateForm('eva_adjust_postponement_quota', eva_adjust_postponement_quota_customValidation))
{
if (!ValidateForm('eva_adjust_postponement_quota', eva_adjust_postponement_quota_customValidation)) {
return;
}
var data = eva_adjust_postponement_quota_GetFromForm();
@@ -118,25 +120,27 @@ function eva_adjust_postponement_quota_GoDelete(a) {
//================= Control Function =========================================
function Oneva_adjust_postponement_quota_limit_frame_quotaChange()
{
function Oneva_adjust_postponement_quota_limit_frame_quotaChange() {
var limit_frame_quota = parseFloat($("#eva_adjust_postponement_quota_limit_frame_quota").val());
limit_frame_quota = Math.round(limit_frame_quota * 100) / 100;
if (limit_frame_quota < 0) limit_frame_quota = 0;
$("#eva_adjust_postponement_quota_limit_frame_quota").val(limit_frame_quota);
// $("#eva_adjust_postponement_quota_limit_frame_quota").val(limit_frame_quota);
$("#eva_adjust_postponement_quota_limit_frame_quota").maskMoney('mask', limit_frame_quota);
var limit = parseFloat($("#eva_adjust_postponement_quota_limit").val());
limit = Math.round(limit * 100) / 100;
$("#eva_adjust_postponement_quota_limit").val(limit);
// $("#eva_adjust_postponement_quota_limit").val(limit);
$("#eva_adjust_postponement_quota_limit").maskMoney('mask', limit);
limit_quota = limit_frame_quota * limit / 100;
$("#eva_adjust_postponement_quota_limit_quota").val(limit_quota);
// $("#eva_adjust_postponement_quota_limit_quota").val(limit_quota);
$("#eva_adjust_postponement_quota_limit_quota").maskMoney('mask', limit_quota);
CalculateRemainQuota();
}
function CalculateRemainQuota() {
var sum_receive_quota = 0;
var limit_quota = parseFloat($("#eva_adjust_postponement_quota_limit_quota").val());
var limit_quota = parseFloat($("#eva_adjust_postponement_quota_limit_quota").val().replace(/[,-]/g,''));
var eva_adjust_postponement_detail_quota_02 = [];
$('#eva_adjust_postponement_detail_quota_02Body tr').each(function () {