diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index 50b4181f6..01cdc814b 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -681,8 +681,9 @@ class CompanyStatementController extends ThinkController $real_statement_amount = number_format($v['platform_money']*(1-$v['promote_ratio']/100)*($v['ratio']/100)*(1-$v["fax_ratio"]/100),2,'.','');; - - $statement_info[$k]['other_amount'] = number_format($v["sum_money"] - $real_statement_amount,2,'.',''); + if (!$statement_info[$k]['other_amount']) { + $statement_info[$k]['other_amount'] = number_format($v["sum_money"] - $real_statement_amount,2,'.',''); + } $sum[$ckey]["ratio"] += $v["ratio"]; $sum[$ckey]["promote_ratio"] += $v["promote_ratio"]; diff --git a/Application/Admin/View/CompanyStatement/editWmCpStatement.html b/Application/Admin/View/CompanyStatement/editWmCpStatement.html index f3f315e64..fde41e5be 100644 --- a/Application/Admin/View/CompanyStatement/editWmCpStatement.html +++ b/Application/Admin/View/CompanyStatement/editWmCpStatement.html @@ -380,7 +380,7 @@ <td>${it.aggregate_money}</td> {@if it.statement_type==0} - <td><input type="text" class="txt statementchange" name="first_ratio" data-index ="${index}" data-change="statement_info[${index}]['first_ratio']" value="${it.first_ratio}" style="width: 40px;">%</td> + <td><input type="text" class="txt statementchange" name="ratio" data-index ="${index}" data-change="statement_info[${index}]['ratio']" value="${it.ratio}" style="width: 40px;">%</td> <td><input type="text" class="txt statementchange" name="promote_ratio" data-index ="${index}" data-change="statement_info[${index}]['promote_ratio']" value="${it.promote_ratio}" style="width: 40px;">%</td> <td><input type="text" class="txt statementchange" name="fax_ratio" data-index ="${index}" data-change="statement_info[${index}]['fax_ratio']" value="${it.fax_ratio}" style="width: 40px;">%</td> <td><input type="text" class="txt statementchange other_amount" name="other_amount" data-index ="${index}" data-change="statement_info[${index}]['other_amount']" value="${it.other_amount?it.other_amount:0}" style="width: 60px;"></td> @@ -546,16 +546,16 @@ var index = $(this).data("index"); var td = DATAOBJ.statement_info[index]; - if( $(this).attr("name") == "first_ratio"){ + if( $(this).attr("name") == "ratio"){ td['second_ratio'] = 100-val; } if( $(this).attr("name") == "second_ratio"){ - td['first_ratio'] = 100-val; + td['ratio'] = 100-val; } if(DATAOBJ.pay_type == 1){ //甲方收款 - var ratio = td['first_ratio']/100; + var ratio = td['ratio']/100; }else{ //乙方 var ratio = td['second_ratio']/100;