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

Merge branch 'feature/finance_statement_three' of wmtx/platform into release

Browse Source 
优化导出
master
陈志 4 years ago committed by Gogs
parent a78188632f 9234919180
commit b80d36395a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

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

@ -261,12 +261,12 @@ class CompanyStatementPoolController extends ThinkController
if($is_export){ if($is_export){
if($withdraw != 3) { if($withdraw != 3) {
$val['sum_money'] = "=J{$line}*(K{$line}+L{$line})"; $val['sum_money'] = "=K{$line}*(L{$line}+M{$line})";
} else { } else {
$val['sum_money'] = "=J{$line}*(L{$line})"; $val['sum_money'] = "=K{$line}*(M{$line})";
} }
// $val['sum_money'] = "=J{$line}*(K{$line}+L{$line})"; // $val['sum_money'] = "=J{$line}*(K{$line}+L{$line})";
$v['statement_money'] .= "M{$line}+"; $v['statement_money'] .= "N{$line}+";
}else{ }else{
$count['platform_amount'] += $val['pay_amount']; $count['platform_amount'] += $val['pay_amount'];
$count['sum_money'] += $val['sum_money']; $count['sum_money'] += $val['sum_money'];
@ -291,8 +291,8 @@ class CompanyStatementPoolController extends ThinkController
} }
if($is_export){ if($is_export){
$count["platform_amount"] = "=SUM(J2:J".$line.")"; $count["platform_amount"] = "=SUM(K2:K".$line.")";
$count["sum_money"] = "=SUM(P2:P".$line.")"; $count["sum_money"] = "=SUM(Q2:Q".$line.")";
} }
$this->assign("data",$infolist); $this->assign("data",$infolist);
$this->assign("count",$count); $this->assign("count",$count);

2
Application/Admin/View/CompanyStatementPool/viewPuPool.html
Unescape Escape View File

@ -268,7 +268,7 @@
</notempty> </notempty>
</foreach> </foreach>
<tr> <tr>
<td colspan=9 >合计:</td> <td colspan=10 >合计:</td>
<td>{$count.platform_amount}</td> <td>{$count.platform_amount}</td>
<td></td> <td></td>
<td></td> <td></td>

Write Preview
Loading…
Cancel
Save