优化比例显示

master
chenzhi 4 years ago
parent 4143a67238
commit 5db1f7ce24

@ -1925,12 +1925,12 @@ function excelUpStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_all_
if($value['first_ratio'] == 0){ if($value['first_ratio'] == 0){
$value['first_ratio'] = 0; $value['first_ratio'] = 0;
}else{ }else{
$value['first_ratio'] = number_format($value['first_ratio'], 2); $value['first_ratio'] = number_format($value['first_ratio']);
} }
if($value['second_ratio'] == 0) { if($value['second_ratio'] == 0) {
$value['second_ratio'] = 0; $value['second_ratio'] = 0;
}else{ }else{
$value['second_ratio'] = number_format($value['second_ratio'], 2); $value['second_ratio'] = number_format($value['second_ratio']);
} }
if($value['promote_ratio'] == 0) $value['promote_ratio'] = 0; if($value['promote_ratio'] == 0) $value['promote_ratio'] = 0;
if($value['fax_ratio'] == 0) $value['fax_ratio'] = 0; if($value['fax_ratio'] == 0) $value['fax_ratio'] = 0;
@ -2041,12 +2041,12 @@ function excelDownStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_al
if($value['increment_ratio'] == 0){ if($value['increment_ratio'] == 0){
$value['increment_ratio'] = 0; $value['increment_ratio'] = 0;
}else{ }else{
$value['increment_ratio'] = number_format($value['first_ratio'], 2); $value['increment_ratio'] = number_format($value['first_ratio']);
} }
if($value['ratio'] == 0) { if($value['ratio'] == 0) {
$value['ratio'] = 0; $value['ratio'] = 0;
}else{ }else{
$value['ratio'] = number_format($value['ratio'], 2); $value['ratio'] = number_format($value['ratio']);
} }
if($value['fax_ratio'] == 0) $value['fax_ratio'] = 0; if($value['fax_ratio'] == 0) $value['fax_ratio'] = 0;

@ -327,11 +327,11 @@ class CompanyStatementSetController extends Controller {
} }
} }
if($v['first_company_type'] == 1){ if($v['first_company_type'] == 1){
$game['first_ratio']=$tratio; $game['first_ratio']=$tratio-0;
$game['second_ratio']=100-$tratio; $game['second_ratio']=100-$tratio;
}else{ }else{
$game['first_ratio']=100-$tratio; $game['first_ratio']=100-$tratio;
$game['second_ratio']=$tratio; $game['second_ratio']=$tratio-0;
} }
$add_data['pay_amount'] += $va['pay_money']; $add_data['pay_amount'] += $va['pay_money'];
@ -634,7 +634,7 @@ class CompanyStatementSetController extends Controller {
$tratio = $tratio1-$tratio2+$company_ratio; $tratio = $tratio1-$tratio2+$company_ratio;
if($tratio <= 0){ continue;} if($tratio <= 0){ continue;}
} }
$tratio = $tratio-0;
if($v['type'] == 2){ if($v['type'] == 2){
$game['increment_ratio']=$tratio; $game['increment_ratio']=$tratio;
}else{ }else{

Loading…
Cancel
Save