diff --git a/Application/Admin/Controller/AggregateFinanceStatementController.class.php b/Application/Admin/Controller/AggregateFinanceStatementController.class.php index 6b4e1d496..287c971f2 100644 --- a/Application/Admin/Controller/AggregateFinanceStatementController.class.php +++ b/Application/Admin/Controller/AggregateFinanceStatementController.class.php @@ -655,7 +655,7 @@ class AggregateFinanceStatementController extends ThinkController $company_info = json_decode($relation['second_company_info'],true); } - if ($company_info['invoice_type']) { + if ($company_info['invoice_type']&&$company_info['invoice_type']!='0') { $company_type = 1; } else { $company_type = 2; diff --git a/Application/Admin/View/AggregateRelation/edit.html b/Application/Admin/View/AggregateRelation/edit.html index eddd8017f..b04a410da 100644 --- a/Application/Admin/View/AggregateRelation/edit.html +++ b/Application/Admin/View/AggregateRelation/edit.html @@ -305,6 +305,7 @@ $(function(){ } else if (get_collection == 2) { companyinfo = second_company; } + console.log(companyinfo) setAggregateInfo(companyinfo.invoice_item,companyinfo.withdraw_type,companyinfo.invoice_type,get_collection); }); function setAggregateInfo(invoice_content,settlement_type,invoice_type,collection) { @@ -333,7 +334,7 @@ $(function(){ // $('#invoice_type').prop("disabled",true); // } $("#settlement_type").find("option[value="+settlement_type+"]").prop("selected",true); - + console.log(invoice_type); $("#invoice_type").find("option[value="+invoice_type+"]").prop("selected",true); $("#settlement_type").change(); $("#invoice_type").change(); diff --git a/Application/Admin/View/CpJuheCompany/export.html b/Application/Admin/View/CpJuheCompany/export.html index 79fcfce76..9623b174c 100644 --- a/Application/Admin/View/CpJuheCompany/export.html +++ b/Application/Admin/View/CpJuheCompany/export.html @@ -103,7 +103,7 @@ 聚合包名 产品类型 结算周期 - 游戏分成比例 + 我方分成比例 户名 账号 开户行 diff --git a/Public/Admin/excel/aggregate_person_stream.xls b/Public/Admin/excel/aggregate_person_stream.xls index b56405e21..bd3dedc9a 100644 Binary files a/Public/Admin/excel/aggregate_person_stream.xls and b/Public/Admin/excel/aggregate_person_stream.xls differ