From 56393561e7dc04d33a9d4a50550c3d70cac4c4f8 Mon Sep 17 00:00:00 2001 From: Nakorn Rientrakrunchai Date: Fri, 28 Feb 2020 18:55:25 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=9A=E0=B8=B1?= =?UTF-8?q?=E0=B8=81=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2=20=E0=B9=82?= =?UTF-8?q?=E0=B8=84=E0=B8=A7=E0=B8=95=E0=B9=89=E0=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eva_adjust_postponement_quota_d.cshtml | 2 +- ...ust_postponement_detail_quota_02_inline.js | 52 +------------------ .../eva_adjust_postponement_quota_d.js | 26 ++++++++-- 3 files changed, 26 insertions(+), 54 deletions(-) diff --git a/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota_d.cshtml b/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota_d.cshtml index e03d41e..3a9f6b9 100644 --- a/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota_d.cshtml +++ b/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota_d.cshtml @@ -73,7 +73,7 @@
- +
diff --git a/wwwroot/js/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02_inline.js b/wwwroot/js/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02_inline.js index 8ef7d33..277c099 100644 --- a/wwwroot/js/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02_inline.js +++ b/wwwroot/js/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02_inline.js @@ -93,7 +93,6 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) { $('#eva_adjust_postponement_detail_quota_02Body').empty(); var successFunc = function (response) { - //console.log(response); $.each(response, function (i, data) { var tag = ''; tag += ''; @@ -112,7 +111,7 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) { tag += '

'; tag += '

'; tag += '

'; - tag += ''; + tag += ''; tag += '

'; tag += ''; @@ -121,7 +120,7 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) { $('#eva_adjust_postponement_detail_quota_02Body').append($(tag)); eva_adjust_postponement_detail_quota_02_FeedDataToForm(data, (i + 1), blankItem); }); - eva_adjust_postponement_detail_quota_02_Summary(); + CalculateRemainQuota(); endLoad(); }; startLoad(); @@ -130,53 +129,6 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) { } -function eva_adjust_postponement_detail_quota_02_Add() { - var successFunc = function (result) { - var i = $("#eva_adjust_postponement_detail_quota_02Body tr").length; - var tag = ''; - tag += ''; - tag += ''; - tag += ''; - tag += ''; - tag += '

'; - tag += '

'; - tag += '

'; - tag += '

'; - tag += '

'; - tag += '

'; - tag += '

'; - tag += ''; - tag += ''; - tag += '

'; - tag += '

'; - tag += '

'; - tag += '

'; - tag += '

'; - tag += '

'; - tag += ''; - - tag += ''; - tag += ''; - - $('#eva_adjust_postponement_detail_quota_02Body').append($(tag)); - eva_adjust_postponement_detail_quota_02_ClearForm(i + 1, result); - endLoad(); - }; - startLoad(); - AjaxGetRequest(apisite + "/api/eva_adjust_postponement_detail_quota_02/" + "GetBlankItem", successFunc, AlertDanger); -} - -function eva_adjust_postponement_detail_quota_02_Removeeva_adjust_postponement_detail_quota_02(e) { - if (confirm('กรุณากดตกลง เพื่อยืนยันการลบ?')) { - $(e).closest('tr').find("input,select,textarea").attr('disabled', true); - $(e).closest('tr').find("input,select,textarea").css({ opacity: '0.5' }); - $(e).hide(); - $(e).closest('tr').find("#restoreBtn").show(); - $(e).closest('tr').find("input").first().val("0"); - console.log($(e).closest('tr').find("input").first().val()); - eva_adjust_postponement_detail_quota_02_Summary(); - } -} function eva_adjust_postponement_detail_quota_02_Restoreeva_adjust_postponement_detail_quota_02(e) { if (confirm('กรุณากดตกลง เพื่อยืนยันการกู้คืน?')) { diff --git a/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js b/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js index 5fb93b3..94a8472 100644 --- a/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js +++ b/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js @@ -55,6 +55,7 @@ function eva_adjust_postponement_quota_SetEditForm(a) { var successFunc = function (result) { eva_adjust_postponement_quota_editMode = "UPDATE"; eva_adjust_postponement_quota_FeedDataToForm(result); + endLoad(); }; startLoad(); @@ -121,8 +122,27 @@ function Oneva_adjust_postponement_quota_limit_frame_quotaChange() { var limit_frame_quota = parseFloat($("#eva_adjust_postponement_quota_limit_frame_quota").val()); var limit = parseFloat($("#eva_adjust_postponement_quota_limit").val()); - limit_quota = limit_frame_quota * limit / 100; - $("#eva_adjust_postponement_quota_limit_quota").val(limit_quota); -} \ No newline at end of file + CalculateRemainQuota(); +} + +function CalculateRemainQuota(){ + var sum_receive_quota = 0; + var limit_quota = parseFloat($("#eva_adjust_postponement_quota_limit_quota").val()); + + var eva_adjust_postponement_detail_quota_02 = []; + $('#eva_adjust_postponement_detail_quota_02Body tr').each(function () { + var i = $(this).find("#rowCount").text(); + var new_sarary = parseFloat($("#eva_adjust_postponement_detail_quota_02_new_sarary_" + i).text()); + var receive_quota = parseFloat($("#eva_adjust_postponement_detail_quota_02_receive_quota_" + i).val()); + var new_sarary_with_quota = new_sarary + receive_quota; + $("#eva_adjust_postponement_detail_quota_02_new_sarary_with_quota_" + i).text(new_sarary_with_quota); + sum_receive_quota += receive_quota; + }); + + var remain_quota = limit_quota - sum_receive_quota; + $("#remain_quota").val(remain_quota); +} + +