diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index 08214598f..7e28dd660 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -118,10 +118,10 @@ class CompanyStatementPoolController extends ThinkController $v['company_type_str'] = $this->CompanyType[$v['company_type']]; $v['is_payment_str'] = $this->IsPayment[$v['is_payment']]; - $v['can_export'] = $v['statement_money'] == 0 ? "0" : '1'; - if($v['company_type'] == 2){ + // $v['can_export'] = $v['platform_amount'] == 0 ? "0" : '1'; + // if($v['company_type'] == 2){ $v['can_export'] = 1; - } + // } $v['op_time'] = date('Y.m.d H:i:s',$v['op_time']); $v["valid"] = "{$v['statement_begin_time']}-{$v['statement_end_time']}"; @@ -285,7 +285,6 @@ class CompanyStatementPoolController extends ThinkController $count["platform_amount"] = "=SUM(J2:J".$line.")"; $count["sum_money"] = "=SUM(P2:P".$line.")"; } - // dd($infolist); $this->assign("data",$infolist); $this->assign("count",$count); $this->assign("is_export",$is_export); @@ -317,9 +316,6 @@ class CompanyStatementPoolController extends ThinkController } } $cline = $line+1; - if($is_export){ - $v['statement_money_exp'] = "="; - } foreach($v['statement_info'] as $ke=>&$va){ $line ++; if(isset($va['ratio'])){ @@ -329,8 +325,6 @@ class CompanyStatementPoolController extends ThinkController } if($is_export){ - $v['statement_money_exp'] .= "H{$line}+"; - $va['d_statement_money'] = "=D{$line}*(1-G{$line})*(E{$line}+F{$line})"; }else{ $va['d_statement_money'] = round($va['pay_amount']*($va['ratio']+$va['increment_ratio'])*(100-$va['fax_ratio'])/100/100,2); @@ -343,8 +337,7 @@ class CompanyStatementPoolController extends ThinkController $v['settlement_contact'] = $Partner[$v['company_id']]; if($is_export){ - $v['statement_money_exp'] .= "J{$cline}-I{$cline}"; - $v['statement_money'] = $v['statement_money_exp']; + $v['statement_money'] = "=SUM(H{$cline}:H{$line})+J{$cline}-I{$cline}"; }else{ $count['fine'] += $v['fine']; $count['reward'] += $v['reward']; @@ -398,14 +391,10 @@ class CompanyStatementPoolController extends ThinkController } $cline = $line+1; - if($is_export){ - $v['statement_money_exp'] = "="; - } foreach($v['statement_info'] as $ke=>&$va){ $line ++; $va['company_ratio'] = 100-$va['ratio']; if($is_export){ - $v['statement_money_exp'] .= "K{$line}+"; $va['d_statement_money'] = "=F{$line}*G{$line}"; }else{ $va['d_statement_money'] = round($va['pay_amount']*$va['ratio']/100,2); @@ -416,8 +405,7 @@ class CompanyStatementPoolController extends ThinkController } $v['matche_platform'] = $Partner[$v['company_id']]; if($is_export){ - $v['statement_money_exp'] .= "M{$cline}-L{$cline}"; - $v['statement_money'] = $v['statement_money_exp']; + $v['statement_money'] = "=SUM(K{$cline}:K{$line})+M{$cline}-L{$cline}"; }else{ $count['fine'] += $v['fine']; $count['reward'] += $v['reward']; diff --git a/Application/Admin/View/CompanyStatementPool/viewCpPool.html b/Application/Admin/View/CompanyStatementPool/viewCpPool.html index 26a4c941b..0ce64f331 100644 --- a/Application/Admin/View/CompanyStatementPool/viewCpPool.html +++ b/Application/Admin/View/CompanyStatementPool/viewCpPool.html @@ -119,8 +119,10 @@ <th colspan=3 style="border-right: solid 1px #b6cad2;">账户信息</th> <th rowspan="2" style="border-right: solid 1px #b6cad2;">备注</th> - <th rowspan="2" style="border-right: solid 1px #b6cad2;">操作</th> + <if condition="!$is_export"> + <th rowspan="2" style="border-right: solid 1px #b6cad2;">操作</th> + </if> </tr> <tr> <th style="border-right: solid 1px #b6cad2;min-width: 50px;">合作方</th> @@ -150,7 +152,7 @@ <td rowspan="{$com.statement_count}">{$com['fine']-0}</td> <td rowspan="{$com.statement_count}">{$com['reward']-0}</td> - <td rowspan="{$com.statement_count}">{$com['statement_money']-0}</td> + <td rowspan="{$com.statement_count}">{$com['statement_money']}</td> <td rowspan="{$com.statement_count}"><if condition="$com['st'] eq 0">否 <else /> 是 </if></td> <td rowspan="{$com.statement_count}"><if condition="$com['is_payment'] eq 1">是 <else /> 否 </if></td> diff --git a/Application/Admin/View/CompanyStatementPool/viewPcPool.html b/Application/Admin/View/CompanyStatementPool/viewPcPool.html index 10e3aee4a..62c6f57db 100644 --- a/Application/Admin/View/CompanyStatementPool/viewPcPool.html +++ b/Application/Admin/View/CompanyStatementPool/viewPcPool.html @@ -136,7 +136,7 @@ <td>{$com['statement_info'][0]['d_statement_money']}</td> <td rowspan="{$com.statement_count}">{$com['fine']-0}</td> <td rowspan="{$com.statement_count}">{$com['reward']-0}</td> - <td rowspan="{$com.statement_count}">{$com['statement_money']-0}</td> + <td rowspan="{$com.statement_count}">{$com['statement_money']}</td> <td rowspan="{$com.statement_count}">{$com.settlement_contact}</td> <td>{$com['statement_info'][0]['statement_begin_time']}-{$com['statement_info'][0]['statement_end_time']}</td>