diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index 9460d03a3..c0a72e2de 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -119,10 +119,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']}"; @@ -327,9 +327,6 @@ class CompanyStatementPoolController extends ThinkController } } $cline = $line+1; - if($is_export){ - $v['statement_money_exp'] = "="; - } foreach($v['statement_info'] as $ke=>&$va){ $line ++; if($withdraw != 3) { @@ -341,7 +338,6 @@ class CompanyStatementPoolController extends ThinkController } if($is_export){ - $v['statement_money_exp'] .= "H{$line}+"; if($withdraw != 3) { $va['d_statement_money'] = "=D{$line}*(1-G{$line})*(E{$line}+F{$line})"; } else { @@ -359,8 +355,7 @@ class CompanyStatementPoolController extends ThinkController if($is_export){ if ($withdraw != 3) { - $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}"; } @@ -417,14 +412,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); @@ -435,8 +426,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 @@