From 10ddadece76172deeb69873f54171bae69bae465 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Wed, 2 Dec 2020 14:10:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?js=E5=AD=97=E7=AC=A6=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E6=95=B0=E5=AD=97=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/CompanyStatementPool/editPuPool.html | 2 +- .../Admin/View/CompanyStatementPool/editSpecialPuPool.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/View/CompanyStatementPool/editPuPool.html b/Application/Admin/View/CompanyStatementPool/editPuPool.html index 778e15be9..a119beed3 100644 --- a/Application/Admin/View/CompanyStatementPool/editPuPool.html +++ b/Application/Admin/View/CompanyStatementPool/editPuPool.html @@ -509,7 +509,7 @@ } } - var D_value = parseFloat(old_amount)-parseFloat(this_amount) + (withhold-oldwithhold); + var D_value = parseFloat(old_amount)-parseFloat(this_amount) + parseFloat(withhold-oldwithhold); week_amount_find.find(".week_amount").text((parseFloat(week_amount) - D_value).toFixed(2)); diff --git a/Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html b/Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html index bcc213f90..3c944abd6 100644 --- a/Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html +++ b/Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html @@ -514,7 +514,7 @@ var this_amount = week_amount_find.find(".sum_money_span").text(); - var D_value = parseFloat(old_amount)-parseFloat(this_amount) + (withhold-oldwithhold) ; + var D_value = parseFloat(old_amount)-parseFloat(this_amount) + parseFloat(withhold-oldwithhold) ; week_amount_find.find(".week_amount").text((parseFloat(week_amount)-D_value).toFixed(2)); // week_amount_find.find(".week_amount_input").val((parseFloat(week_amount)-D_value- parseFloat(withhold))); From bb0d37bb5368e639ea5dad02542b484abf870e08 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Wed, 2 Dec 2020 14:18:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=89=A3=E6=AC=BE?= =?UTF-8?q?=E6=97=A7=E7=9A=84=E9=AA=8C=E8=AF=81=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/CompanyStatementPool/editPuPool.html | 5 +++++ .../Admin/View/CompanyStatementPool/editSpecialPuPool.html | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/Application/Admin/View/CompanyStatementPool/editPuPool.html b/Application/Admin/View/CompanyStatementPool/editPuPool.html index a119beed3..d0e7b276e 100644 --- a/Application/Admin/View/CompanyStatementPool/editPuPool.html +++ b/Application/Admin/View/CompanyStatementPool/editPuPool.html @@ -466,6 +466,11 @@ withhold = 0; $(_this).parent().parent().find(".withhold").val(withhold); } + + if (!oldwithhold ) { + oldwithhold = 0; + $(_this).parent().parent().find(".oldwithhold").val(oldwithhold); + } // else if(parseFloat(withhold) > parseFloat(pay_money)) { // withhold = pay_money; // $(_this).parent().parent().find(".withhold").val(withhold); diff --git a/Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html b/Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html index 3c944abd6..02709bf51 100644 --- a/Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html +++ b/Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html @@ -471,6 +471,11 @@ withhold = 0; $(_this).parent().parent().find(".withhold").val(withhold); } + + if (!oldwithhold ) { + oldwithhold = 0; + $(_this).parent().parent().find(".oldwithhold").val(oldwithhold); + } // else if(parseFloat(withhold) > parseFloat(pay_money)) { // withhold = pay_money; // $(_this).parent().parent().find(".withhold").val(withhold);