diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index 3d6c712ab..198518648 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -296,8 +296,16 @@ class CompanyStatementPoolController extends ThinkController unset($pl); foreach($infolist as $k=>&$v){ $v['statement_info'] = json_decode($v['statement_info'],true); + $v['company_info'] = json_decode($v['company_info'],true); $v['statement_begin_time'] = date('Y.m.d',$v['statement_begin_time']); $v['statement_end_time'] = date('Y.m.d',$v['statement_end_time']); + if( isset($v['verify_status'])){ + if( $v['verify_status'] ==2 ){ + $v['is_payment'] = 2; //不打款 + }else{ + $v['is_payment'] = 1; + } + } $cline = $line+1; if($is_export){ $v['statement_money_exp'] = "="; @@ -351,7 +359,7 @@ class CompanyStatementPoolController extends ThinkController $count["reward"] = "=".trim($count["reward_exp"],"+"); $count["statement_money"] = "=".trim($count["statement_money_exp"],"+"); } - + // dd($infolist); $this->assign("data",$infolist); $this->assign("count",$count); $this->assign("is_export",$is_export); diff --git a/Application/Admin/View/CompanyStatementPool/viewPcPool.html b/Application/Admin/View/CompanyStatementPool/viewPcPool.html index 1821046e7..10e3aee4a 100644 --- a/Application/Admin/View/CompanyStatementPool/viewPcPool.html +++ b/Application/Admin/View/CompanyStatementPool/viewPcPool.html @@ -109,7 +109,18 @@ 合计/元 对账人 结算日期 + + + 户名 + 帐号 + 开户行 + 是否支付宝打款 + 是否结算 + 备注 + + 操作 + @@ -119,16 +130,40 @@ {$com.company_name} {$com['statement_info'][0]['game_name']} {$com['statement_info'][0]['pay_amount']} - {$com['statement_info'][0]['ratio']}% - {$com['statement_info'][0]['increment_ratio']}% - {$com['statement_info'][0]['fax_ratio']}% + {$com['statement_info'][0]['ratio']|showNumPercent} + {$com['statement_info'][0]['increment_ratio']|showNumPercent} + {$com['statement_info'][0]['fax_ratio']|showNumPercent} {$com['statement_info'][0]['d_statement_money']} - {$com.fine} - {$com.reward} - {$com.statement_money} + {$com['fine']-0} + {$com['reward']-0} + {$com['statement_money']-0} {$com.settlement_contact} - {$com['statement_info'][0]['statement_begin_time']} - {$com['statement_info'][0]['statement_end_time']} + {$com['statement_info'][0]['statement_begin_time']}-{$com['statement_info'][0]['statement_end_time']} + + + + {$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.renark} + + + + + 不结算 + + + @@ -136,11 +171,11 @@ {$it['game_name']} {$it['pay_amount']} - {$it['ratio']}% - {$it['increment_ratio']}% - {$it['fax_ratio']}% + {$it['ratio']|showNumPercent} + {$it['increment_ratio']|showNumPercent} + {$it['fax_ratio']|showNumPercent} {$it['d_statement_money']} - {$it['statement_begin_time']} - {$it['statement_end_time']} + {$it['statement_begin_time']}-{$it['statement_end_time']} @@ -158,6 +193,14 @@ + + + + + + + + @@ -173,5 +216,26 @@ }); }); + $(".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; + } + } + }); + })