From 864e8d693a498d93626bb82f429207afc43e4b73 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 10 Jan 2020 10:15:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E6=B5=AE=E7=82=B9=E6=95=B0=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/Statement/createCpStatement.html | 33 ++++++++++++------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/Application/Admin/View/Statement/createCpStatement.html b/Application/Admin/View/Statement/createCpStatement.html index 6dbc23016..5d6634367 100644 --- a/Application/Admin/View/Statement/createCpStatement.html +++ b/Application/Admin/View/Statement/createCpStatement.html @@ -447,6 +447,12 @@ callback(data) } }) + }, + floatAdd(a,b){ + return Math.round(a*100+b*100)/100; + }, + floatCut(a,b){ + return Math.round(a*100-b*100)/100; } } //数据类 @@ -627,28 +633,31 @@ }else{ var ratio = td['second_ratio']/100; } - DATAOBJ.statement_count['sum_money'] -= td['sum_money']; + DATAOBJ.statement_count['sum_money'] = PUBLIC.floatCut(DATAOBJ.statement_count['sum_money'],td['sum_money']); - td['sum_money'] = Math.floor((td['pay_amount']*(100-td['promote_ratio'])/100*ratio*(100-td['fax_ratio'])/100)* 100) / 100 ; - DATAOBJ.statement_count['sum_money']+=(td['sum_money']-0); + td['sum_money'] = Math.round((td['pay_amount']*(100-td['promote_ratio'])/100*ratio*(100-td['fax_ratio'])/100)* 100) / 100 ; + + DATAOBJ.statement_count['sum_money']=PUBLIC.floatAdd(DATAOBJ.statement_count['sum_money'],td['sum_money']); + }else{ - DATAOBJ.fine = Math.floor(DATAOBJ.fine * 100) / 100 ; + DATAOBJ.fine = Math.round(DATAOBJ.fine * 100) / 100 ; + if(!CHECK.money.test(val)){ + layer.msg('罚款金额格式错误'); + $(this).val(DATAOBJ.fine); + return false; + } if(val > DATAOBJ.statement_count['sum_money']){ layer.msg('罚款金额过大，总计不允许为负数'); $(this).val(DATAOBJ.fine); return false; } - DATAOBJ.statement_count['sum_money'] = (DATAOBJ.statement_count['sum_money'] -0+DATAOBJ.fine); - DATAOBJ.statement_count['pay_amount'] = (DATAOBJ.statement_count['pay_amount'] -0+DATAOBJ.fine); + DATAOBJ.statement_count['sum_money'] =PUBLIC.floatAdd(DATAOBJ.statement_count['sum_money'],DATAOBJ.fine); + DATAOBJ.statement_count['pay_amount'] = PUBLIC.floatAdd(DATAOBJ.statement_count['pay_amount'],DATAOBJ.fine); eval(str); - DATAOBJ.statement_count['sum_money'] = DATAOBJ.statement_count['sum_money']-DATAOBJ.fine; - DATAOBJ.statement_count['pay_amount'] = DATAOBJ.statement_count['pay_amount']-DATAOBJ.fine; - + DATAOBJ.statement_count['sum_money'] =PUBLIC.floatCut(DATAOBJ.statement_count['sum_money'],DATAOBJ.fine); + DATAOBJ.statement_count['pay_amount'] = PUBLIC.floatCut(DATAOBJ.statement_count['pay_amount'],DATAOBJ.fine); } - DATAOBJ.statement_count['pay_amount'] = Math.floor(DATAOBJ.statement_count['pay_amount'] * 100) / 100 ; - DATAOBJ.statement_count['sum_money'] = Math.floor(DATAOBJ.statement_count['sum_money'] * 100) / 100; - TPLSHOW.showStatementList(true); }) }, From 73578f1b64c7af7b3e8c8b4a3dd6531cc8302929 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 10 Jan 2020 10:24:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=9F=E6=88=90=E4=B8=8B=E6=B8=B8?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/StatementMangement/createDownstreamOrder.html | 6 +++--- Application/Admin/View/StatementMangement/edit.html | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Application/Admin/View/StatementMangement/createDownstreamOrder.html b/Application/Admin/View/StatementMangement/createDownstreamOrder.html index a47d9ca0b..2c3a66a2f 100644 --- a/Application/Admin/View/StatementMangement/createDownstreamOrder.html +++ b/Application/Admin/View/StatementMangement/createDownstreamOrder.html @@ -285,9 +285,9 @@ function eventnew(){ $(".tax").off("blur"); $(".tax").on("blur", function() { - var lastNum = $(this).parent().next().text(); + var lastNum = (parseFloat($(this).parent().next().text())).toFixed(2); $(this).parent().next().text(($(this).parent().next().attr('data-value')*(1-$(this).val()/100)).toFixed(2)); - var nowNum = $(this).parent().next().text(); + var nowNum = (parseFloat($(this).parent().next().text())).toFixed(2); console.log((nowNum-lastNum)) $(".sumAll").text((parseFloat($(".sumAll").text())+(nowNum-lastNum)).toFixed(2)); }); @@ -296,7 +296,7 @@ $(".forfeit").on("blur", function() { var lastNumber = $(this).parent().next().next().next().text(); - $(this).parent().next().next().next().text($(this).val()); + $(this).parent().next().next().next().text(parseFloat($(this).val()).toFixed(2)); $(".sumAmount").text($(".sumAmount").attr("data-value")-$(this).val()); $(".sumAll").text((parseFloat($(".sumAll").text())+parseFloat(lastNumber)-parseFloat($(this).val())).toFixed(2)); diff --git a/Application/Admin/View/StatementMangement/edit.html b/Application/Admin/View/StatementMangement/edit.html index 8c0dd5723..02ceb35c8 100644 --- a/Application/Admin/View/StatementMangement/edit.html +++ b/Application/Admin/View/StatementMangement/edit.html @@ -286,9 +286,9 @@ function eventnew(){ $(".tax").off("blur"); $(".tax").on("blur", function() { - var lastNum = $(this).parent().next().text(); + var lastNum = (parseFloat($(this).parent().next().text())).toFixed(2); $(this).parent().next().text(($(this).parent().next().attr('data-value')*(1-$(this).val()/100)).toFixed(2)); - var nowNum = $(this).parent().next().text(); + var nowNum = (parseFloat($(this).parent().next().text())).toFixed(2); console.log((nowNum-lastNum)) $(".sumAll").text((parseFloat($(".sumAll").text())+(nowNum-lastNum)).toFixed(2)); }); @@ -297,8 +297,8 @@ $(".forfeit").on("blur", function() { var lastNumber = $(this).parent().next().next().next().text(); - $(this).parent().next().next().next().text($(this).val()); - $(".sumAmount").text($(".sumAmount").attr("data-value")-$(this).val()); + $(this).parent().next().next().next().text(parseFloat($(this).val()).toFixed(2)); + $(".sumAmount").text(($(".sumAmount").attr("data-value")-$(this).val()).toFixed(2)); $(".sumAll").text((parseFloat($(".sumAll").text())+parseFloat(lastNumber)-parseFloat($(this).val())).toFixed(2));