elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'feature/more_finance_20201211' (#83) from feature/more_finance_20201211 into release

Browse Source 
优化公式
master
陈志 4 years ago
parent 9ed794a56c 174219d9d5
commit 55e29b571c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

10
Application/Admin/Common/extend.php
Unescape Escape View File

@ -1956,9 +1956,9 @@ function excelUpStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_all_
$objPHPExcel->getActiveSheet()->setCellValue('E'.$line, $value['pay_amount']); $objPHPExcel->getActiveSheet()->setCellValue('E'.$line, $value['pay_amount']);
// $objPHPExcel->getActiveSheet()->setCellValue('J'.$line, $value['sum_money']); // $objPHPExcel->getActiveSheet()->setCellValue('J'.$line, $value['sum_money']);
if ($data['pay_type'] == 2) { if ($data['pay_type'] == 2) {
$objPHPExcel->getActiveSheet()->setCellValue('J'.$line, "=E{$line}*(1-H{$line})*G{$line}*(1-I{$line})"); $objPHPExcel->getActiveSheet()->setCellValue('J'.$line, "=ROUND(E{$line}*(1-H{$line})*G{$line}*(1-I{$line}),2)");
}else{ }else{
$objPHPExcel->getActiveSheet()->setCellValue('J'.$line, "=E{$line}*(1-H{$line})*F{$line}*(1-I{$line})"); $objPHPExcel->getActiveSheet()->setCellValue('J'.$line, "=ROUND(E{$line}*(1-H{$line})*F{$line}*(1-I{$line}),2)");
} }
} }
@ -2088,9 +2088,9 @@ function excelSpecialComplementEmplate($data, $all_sum_money, $all_pay_amount, $
// $objPHPExcel->getActiveSheet()->setCellValue('F'.$line, $value['sum_money']); // $objPHPExcel->getActiveSheet()->setCellValue('F'.$line, $value['sum_money']);
if ($data['withdraw_type'] != 3) { if ($data['withdraw_type'] != 3) {
$objPHPExcel->getActiveSheet()->setCellValue('F'.$line,"=C{$line}*D{$line}*(1-E{$line})"); $objPHPExcel->getActiveSheet()->setCellValue('F'.$line,"=ROUND(C{$line}*D{$line}*(1-E{$line}),2)");
} else { } else {
$objPHPExcel->getActiveSheet()->setCellValue('F'.$line,"=C{$line}*E{$line}"); $objPHPExcel->getActiveSheet()->setCellValue('F'.$line,"=ROUND(C{$line}*E{$line}),2)");
} }
} }
$objPHPExcel->getActiveSheet()->setCellValue('B'.$line, $product_name); $objPHPExcel->getActiveSheet()->setCellValue('B'.$line, $product_name);
@ -2207,7 +2207,7 @@ function excelDownStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_al
$objPHPExcel->getActiveSheet()->setCellValue('E'.$line, $value['fax_ratio'] . '%'); $objPHPExcel->getActiveSheet()->setCellValue('E'.$line, $value['fax_ratio'] . '%');
$objPHPExcel->getActiveSheet()->setCellValue('C'.$line, $value['pay_amount']); $objPHPExcel->getActiveSheet()->setCellValue('C'.$line, $value['pay_amount']);
// $objPHPExcel->getActiveSheet()->setCellValue('F'.$line, $value['sum_money']); // $objPHPExcel->getActiveSheet()->setCellValue('F'.$line, $value['sum_money']);
$objPHPExcel->getActiveSheet()->setCellValue('F'.$line,"=C{$line}*D{$line}*(1-E{$line})"); $objPHPExcel->getActiveSheet()->setCellValue('F'.$line,"=ROUND(C{$line}*D{$line}*(1-E{$line}),2)");
} }
$objPHPExcel->getActiveSheet()->setCellValue('B'.$line, $product_name); $objPHPExcel->getActiveSheet()->setCellValue('B'.$line, $product_name);
$line++; $line++;

2
Application/Payment/Common/extend.php
Unescape Escape View File

@ -2022,7 +2022,7 @@ function excelDownStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_al
$objPHPExcel->getActiveSheet()->setCellValue('E'.$line, $value['fax_ratio'] . '%'); $objPHPExcel->getActiveSheet()->setCellValue('E'.$line, $value['fax_ratio'] . '%');
$objPHPExcel->getActiveSheet()->setCellValue('C'.$line, $value['pay_amount']); $objPHPExcel->getActiveSheet()->setCellValue('C'.$line, $value['pay_amount']);
// $objPHPExcel->getActiveSheet()->setCellValue('F'.$line, $value['sum_money']); // $objPHPExcel->getActiveSheet()->setCellValue('F'.$line, $value['sum_money']);
$objPHPExcel->getActiveSheet()->setCellValue('F'.$line,"=C{$line}*D{$line}*(1-E{$line})"); $objPHPExcel->getActiveSheet()->setCellValue('F'.$line,"=ROUND(C{$line}*D{$line}*(1-E{$line}),2)");
} }
$objPHPExcel->getActiveSheet()->setCellValue('B'.$line, $product_name); $objPHPExcel->getActiveSheet()->setCellValue('B'.$line, $product_name);
$pay_amount_str .= "F{$line}+"; $pay_amount_str .= "F{$line}+";

Write Preview
Loading…
Cancel
Save