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

汇总功能还原修正

Browse Source
master
zhengyongxing 4 years ago
parent f450df3265
commit 859f5b58c9
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File

22
Application/Admin/Controller/CompanyStatementPoolController.class.php
Unescape Escape View File

@ -615,10 +615,15 @@ class CompanyStatementPoolController extends ThinkController
} }
if($is_export){ if($is_export){
// if($v['withdraw_type'] != 3) {
// $va['d_statement_money'] = "=ROUND(E{$line}*(1-H{$line})*(F{$line}+G{$line}),2)";
// } else {
// $va['d_statement_money'] = "=ROUND(E{$line}*(G{$line}),2)";
// }
if($v['withdraw_type'] != 3) { if($v['withdraw_type'] != 3) {
$va['d_statement_money'] = "=ROUND(E{$line}*(1-H{$line})*(F{$line}+G{$line}),2)"; $va['d_statement_money'] = "=ROUND(D{$line}*(1-G{$line})*(E{$line}+F{$line}),2)";
} else { } else {
$va['d_statement_money'] = "=ROUND(E{$line}*(G{$line}),2)"; $va['d_statement_money'] = "=ROUND(D{$line}*(F{$line}),2)";
} }
}else{ }else{
if ($v['withdraw_type'] != 3) { if ($v['withdraw_type'] != 3) {
@ -694,7 +699,8 @@ class CompanyStatementPoolController extends ThinkController
if($is_export){ if($is_export){
if ($v['withdraw_type'] != 3) { if ($v['withdraw_type'] != 3) {
$v['statement_money'] = "=ROUND(SUM(I{$cline}:I{$line})+K{$cline}-J{$cline},2)"; // $v['statement_money'] = "=ROUND(SUM(I{$cline}:I{$line})+K{$cline}-J{$cline},2)";
$v['statement_money'] = "=ROUND(SUM(H{$cline}:H{$line})+J{$cline}-I{$cline},2)";
} }
}else{ }else{
@ -709,11 +715,11 @@ class CompanyStatementPoolController extends ThinkController
} }
if($is_export){ if($is_export){
$count["platform_amount"] = "=ROUND(SUM(E2:E".$line."),2)"; $count["platform_amount"] = "=ROUND(SUM(D2:D".$line."),2)";
$count["d_statement_money"] = "=ROUND(SUM(I2:I".$line."),2)"; $count["d_statement_money"] = "=ROUND(SUM(H2:H".$line."),2)";
$count["fine"] = "=ROUND(SUM(J2:J".$line."),2)"; $count["fine"] = "=ROUND(SUM(I2:I".$line."),2)";
$count["reward"] = "=ROUND(SUM(K2:K".$line."),2)"; $count["reward"] = "=ROUND(SUM(J2:J".$line."),2)";
$count["statement_money"] = "=ROUND(SUM(M2:M".$line."),2)"; $count["statement_money"] = "=ROUND(SUM(K2:K".$line."),2)";
} }
// dd($infolist); // dd($infolist);
$this->assign("data",$infolist); $this->assign("data",$infolist);

3
Application/Admin/View/CompanyStatementPool/viewPcPool.html
Unescape Escape View File

@ -190,10 +190,11 @@
</foreach> </foreach>
</foreach> </foreach>
<tr> <tr>
<td colspan=4 >合计:</td> <td colspan=3 >合计:</td>
<td>{$count.platform_amount}</td> <td>{$count.platform_amount}</td>
<td></td> <td></td>
<td></td> <td></td>
<td></td>
<td>{$count.d_statement_money}</td> <td>{$count.d_statement_money}</td>
<td>{$count.fine}</td> <td>{$count.fine}</td>
<td>{$count.reward}</td> <td>{$count.reward}</td>

Write Preview
Loading…
Cancel
Save