diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php index 236a4639d..3d3099e07 100644 --- a/Application/Admin/Controller/PromoteCompanyController.class.php +++ b/Application/Admin/Controller/PromoteCompanyController.class.php @@ -70,9 +70,26 @@ class PromoteCompanyController extends ThinkController foreach($companyres as $k=>&$v){ $tmpr = D("CompanyRelation")->getCompanyRelation(2,$v['id']); $v["settlement_type"] = $tmpr['settlement_type']; + $v["collection"] = $tmpr['collection']; + $v["invoice_type"] = $tmpr['invoice_type']; + $v["invoice_content"] = $tmpr['invoice_content']; + $v["company_belong"] = getCompanyBlong($v["company_belong"]); $v["develop_type"] = getCompanyRelation($v["develop_type"]); $v['company_type'] = $v['company_type'] == 2 ? '个人' : '公司'; + $v['is_sign_contract'] = $v['is_sign_contract'] ? '是' : '否'; + + $contract_start_time = $v['company_info']['contact_begin'] ? + time_format($v['company_info']['contact_begin'], 'Y/m/d') : '-'; + $contract_end_time = $v['company_info']['contact_end'] ? + time_format($v['company_info']['contact_end'], 'Y/m/d') : '-'; + $v['contract_time'] = $contract_start_time . '-' . $contract_end_time; + + $validity_start_time = $v['company_info']['validity_start_time'] ? + time_format($v['company_info']['validity_start_time'], 'Y/m/d') : '-'; + $validity_end_time = $v['company_info']['validity_end_time'] ? + time_format($v['company_info']['validity_end_time'], 'Y/m/d') : '-'; + $v['validity_time'] = $validity_start_time . '-' . $validity_end_time; //遍历获取游戏信息 if(empty($v["game_ids"])){ $game = $this->getPromoteGameRadio($v["id"],false); @@ -88,6 +105,7 @@ class PromoteCompanyController extends ThinkController $count = count($companycount); $companyallids = implode(',', array_column($companycount, 'id')); $promotemap['company_id']=["in",$companyallids]; + $promotemap['level']=1; $promotecount = M("Promote","tab_")->where($promotemap)->count(); // dd($companyres); $this->assign('listData', $companyres); diff --git a/Application/Admin/View/PromoteCompany/export.html b/Application/Admin/View/PromoteCompany/export.html index f63a5a59b..a5eab072b 100644 --- a/Application/Admin/View/PromoteCompany/export.html +++ b/Application/Admin/View/PromoteCompany/export.html @@ -25,11 +25,11 @@ - - + +
@@ -43,11 +43,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -68,10 +93,12 @@ - + + + + @@ -110,7 +137,30 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -176,10 +226,12 @@ - + + + + @@ -215,7 +267,7 @@ - @@ -229,7 +281,6 @@ filename: "推广公司.xls", // do include extension preserveColors: false // set to true if you want background colors and font colors preserved }); - //搜索功能 $("#search").click(function () { console.log(222); diff --git a/Application/Admin/View/PromoteCompany/lists.html b/Application/Admin/View/PromoteCompany/lists.html index fb0ff8ae3..2b0a8797f 100644 --- a/Application/Admin/View/PromoteCompany/lists.html +++ b/Application/Admin/View/PromoteCompany/lists.html @@ -205,7 +205,7 @@ - + @@ -237,7 +237,7 @@ - + @@ -392,14 +392,18 @@ }); $("#downloadexcel").on("click",function(){ var url = $(this).attr("url"); - var title = '推广公司导出'; + var title = '推广公司导出,请耐心等待数据处理....'; + var index = layer.load(2); layer.open({ type: 2, title: title, shadeClose: true, shade: 0.8, - area: ['40%', '60%'], - content: url + area: ['40%', '30%'], + content: url, + success:function(){ + layer.close(index); + } }); })
市场专员 押金押金金额押金状态原包名 现包名 产品类型 推广分成比例 CP分成比例户名银行账号开户行是否收款方支付宝真实姓名支付宝账号是否签署合同合同期限生效时间开票税点发票类型税费费率渠道费率注册地址注册电话联系人联系电话联系地址
{$data.settlement_type} {$data['list'][0]['account']|default="--"} - {$data['list'][0]['market_admin_username']|default="--"}{$data['list'][0]['market_admin_username']|default="--"} {$data['list'][0]['pay_type']|default="--"}{$data['list'][0]['amount']|default="--"}{$data['list'][0]['status']|default="--"} {$data['list'][0]['list'][0]['original_package_name']|default="--"}-- -- ------ {$data.bank_address|default="--"} {$data.bank_card|default="--"}{$data.bank_name|default="--"}{$data.collection|default="--"}{$data.ali_user|default="--"}{$data.ali_account|default="--"}{$data.is_sign_contract|default="--"}{$data.contract_time|default="--"}{$data.validity_time|default="--"}{$data.fax_ratio|showPercent}{$data.invoice_type|default="--"}{$data.taxation_rate|showPercent}{$data.channel_rate|showPercent}{$data.reg_address|default="--"}{$data.reg_phon|default="--"}{$data.settlement_contact|default="--"}{$data.contact_phone|default="--"}{$data.address|default="--"}
{$promote['account']|default="--"}{$promote['market_admin_username']|default="--"} - {$promote['market_admin_username']|default="--"} {$promote['pay_type']|default="--"}{$promote['amount']|default="--"}{$promote['status']|default="--"} {$promote['list']['original_package_name']|default="--"}
汇总: + 累计推广公司数量：{$count}　　会长数量:{$promotecount}
{$game_ratio['name']|default="--"}{$game_ratio['ratio']|default="--"}%{$game_ratio['ratio']|showPercent}
{$game_ratio['name']|default="--"}{$game_ratio['ratio']|default="--"}%{$game_ratio['ratio']|showPercent}