From b74b5ecfadedc54d8cfc4ab0f67e535608dbcb99 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 18 Aug 2020 11:46:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=B8=B8=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E4=B8=8E=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyStatementPoolController.class.php | 53 ++-- .../View/CompanyStatementPool/viewPuPool.html | 196 +++++++------ .../CompanyStatementPool/viewPuPool2.html | 262 ++++++++++++++++++ 3 files changed, 412 insertions(+), 99 deletions(-) create mode 100644 Application/Admin/View/CompanyStatementPool/viewPuPool2.html diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index b4d3a5fe9..355f43a60 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -248,33 +248,50 @@ class CompanyStatementPoolController extends ThinkController } $cline = $line+1; if($is_export){ - $v['sum_money_exp'] = "="; + $v['statement_money'] = "="; } + + $row = 0; foreach($v['statement_info'] as $ke=>&$va){ - $line ++; - if(isset($va['ratio'])){ - $va['increment_ratio'] = 0; - }else{ - $va['ratio'] = 0; - } - - if($is_export){ - //J3*(K3+L3)+M3-N3 - if($va['statement_type'] > 0){ //罚款服务器费用 - $va['sum_money'] = "=J{$line}"; + $va['row'] = count($va['game_list']); + $row += count($va['game_list']); + + foreach($va['game_list'] as $key=>&$val){ + $line ++; + if(isset($val['ratio'])){ + $val['increment_ratio'] = 0; }else{ - $va['sum_money'] = "=J{$line}*(K{$line}+L{$line})+M{$line}-N{$line}"; + $val['ratio'] = 0; + } + + if($is_export){ + $val['sum_money'] = "=J{$line}*(K{$line}+L{$line})"; + $v['statement_money'] .= "M{$line}+"; + }else{ + $count['platform_amount'] += $val['pay_amount']; + $count['sum_money'] += $val['sum_money']; } - }else{ - $count['platform_amount'] += $va['pay_amount']; - $count['sum_money'] += $va['sum_money']; } + // if($is_export){ + // //J3*(K3+L3)+M3-N3 + // if($va['statement_type'] > 0){ //罚款服务器费用 + // $va['sum_money'] = "=J{$line}"; + // }else{ + // $va['sum_money'] = "=J{$line}*(K{$line}+L{$line})+M{$line}-N{$line}"; + // } + // }else{ + // $count['platform_amount'] += $va['pay_amount']; + // $count['sum_money'] += $va['sum_money']; + // } + } + $v['row'] = $row; + if($is_export){ + $v['statement_money'] .="N{$cline}-O{$cline}"; } - $v['statement_count'] = count($v['statement_info']); } if($is_export){ $count["platform_amount"] = "=SUM(J2:J".$line.")"; - $count["sum_money"] = "=SUM(O2:O".$line.")"; + $count["sum_money"] = "=SUM(P2:P".$line.")"; } $this->assign("data",$infolist); $this->assign("count",$count); diff --git a/Application/Admin/View/CompanyStatementPool/viewPuPool.html b/Application/Admin/View/CompanyStatementPool/viewPuPool.html index 80e02d5d5..7c947cdd5 100644 --- a/Application/Admin/View/CompanyStatementPool/viewPuPool.html +++ b/Application/Admin/View/CompanyStatementPool/viewPuPool.html @@ -83,7 +83,10 @@ float: left; margin: 0; } - + #statementShow td{ + line-height: 1.5; + padding: 8px 0; + } - {$com['statement_info'][0]['game_name']} - {$com['statement_info'][0]['game_type_name']} - {$com['statement_info'][0]['statement_begin_time']}-{$com['statement_info'][0]['statement_end_time']} - {$com['statement_info'][0]['pay_amount']} - - - + + {$com['statement_info'][0]['account']} - {$com['statement_info'][0]['ratio']|default=0}% - {$com['statement_info'][0]['increment_ratio']|default=0}% - + - + + + {$com.company_info.company_relation_str} + {$com.company_info.nickname} + {$com.company_info.company_type_str} - {$com['statement_info'][0]['reward']} - {$com['statement_info'][0]['fine']} - {$com['statement_info'][0]['sum_money']} + + {$com['statement_info'][0]['game_list'][0]['game_name']} + {$com['statement_info'][0]['game_list'][0]['game_type_name']} + {$com['statement_info'][0]['game_list'][0]['statement_begin_time']}-{$com['statement_info'][0]['game_list'][0]['statement_end_time']} + {$com['statement_info'][0]['game_list'][0]['pay_amount']} + {$com['statement_info'][0]['game_list'][0]['ratio']|default=0}% + {$com['statement_info'][0]['game_list'][0]['increment_ratio']|default=0}% + {$com['statement_info'][0]['game_list'][0]['sum_money']} + {$com['reward']} + {$com['fine']} + {$com['statement_money']} + + + - + - + - + - + - + - + - + - + - + - + + - {$com.company_info.payee_name} -  {$com.company_info.bank_account} - {$com.company_info.opening_bank} + {$com.company_info.payee_name} +  {$com.company_info.bank_account} + {$com.company_info.opening_bank} - {$com.company_info.ali_user} - {$com.company_info.ali_account} - + {$com.company_info.ali_user} + {$com.company_info.ali_account} + + 是 否 + 否 是 + {$com.remark} - - - 是 否 - 否 是 - {$com.remark} - + 不结算 - - - - - - {$it['game_name']} - {$it['game_type_name']} - {$it['statement_begin_time']}-{$it['statement_end_time']} - {$it['pay_amount']} + + + + + {$game['game_name']} + {$game['game_type_name']} + {$game['statement_begin_time']}-{$game['statement_end_time']} + {$game['pay_amount']} + {$game['ratio']|default=0}% + {$game['increment_ratio']|default=0}% + {$game['sum_money']} + + + + + + + + + + + + {$account['account']} + + + {$account['game_list'][0]['game_name']} + {$account['game_list'][0]['game_type_name']} + {$account['game_list'][0]['statement_begin_time']}-{$account['game_list'][0]['statement_end_time']} + {$account['game_list'][0]['pay_amount']} + {$account['game_list'][0]['ratio']|default=0}% + {$account['game_list'][0]['increment_ratio']|default=0}% + {$account['game_list'][0]['sum_money']} + + - + - + - + - + - + - + - + + - - - - - {$it['ratio']|default=0}% - {$it['increment_ratio']|default=0}% + + + + + {$game['game_name']} + {$game['game_type_name']} + {$game['statement_begin_time']}-{$game['statement_end_time']} + {$game['pay_amount']} + {$game['ratio']|default=0}% + {$game['increment_ratio']|default=0}% + {$game['sum_money']} + + + - {$it['reward']} - {$it['fine']} - {$it['sum_money']} + + - - - + 合计: - {$count.platform_amount|default=0} + {$count.platform_amount} - {$count.sum_money|default=0} + + {$count.sum_money} - - - @@ -237,26 +292,5 @@ }); }); - $(".no_statement").on("click",function(){ - var id = $(this).data('id'); - $.ajax({ - type: "POST", - url: "{:U('cancelStatement')}", - dataType: 'json', - async: false, - data: {id:id}, - success:function(data){ - if(data.status==1){ - layer.msg("" + data.info + ""); - setTimeout(function(){ - window.location.reload(); - },1500); - }else{ - layer.msg("" + data.info + ""); - return false; - } - } - }); - }) diff --git a/Application/Admin/View/CompanyStatementPool/viewPuPool2.html b/Application/Admin/View/CompanyStatementPool/viewPuPool2.html new file mode 100644 index 000000000..80e02d5d5 --- /dev/null +++ b/Application/Admin/View/CompanyStatementPool/viewPuPool2.html @@ -0,0 +1,262 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
序号下游名称会长账号下游类型市场员下游性质产品产品类型结算时间推广流水分成比例补点奖励罚款结算金额户名帐号开户行是否支付宝打款是否结算备注操作
{$key-0+1}{$com.company_name}{$com.company_info.account}{$com.company_info.company_relation_str}{$com.company_info.nickname}{$com.company_info.company_type_str}{$com['statement_info'][0]['game_name']}{$com['statement_info'][0]['game_type_name']}{$com['statement_info'][0]['statement_begin_time']}-{$com['statement_info'][0]['statement_end_time']}{$com['statement_info'][0]['pay_amount']}{$com['statement_info'][0]['ratio']|default=0}%{$com['statement_info'][0]['increment_ratio']|default=0}%{$com['statement_info'][0]['reward']}{$com['statement_info'][0]['fine']}{$com['statement_info'][0]['sum_money']}{$com.company_info.payee_name} {$com.company_info.bank_account}{$com.company_info.opening_bank}{$com.company_info.ali_user}{$com.company_info.ali_account}是 否 否 是 {$com.remark} + + 不结算 + +
{$it['game_name']}{$it['game_type_name']}{$it['statement_begin_time']}-{$it['statement_end_time']}{$it['pay_amount']}{$it['ratio']|default=0}%{$it['increment_ratio']|default=0}%{$it['reward']}{$it['fine']}{$it['sum_money']}
合计:{$count.platform_amount|default=0}{$count.sum_money|default=0}
+
+
+ + +