Merge branch 'feature/add_item' of wmtx/platform into release

聚合汇总导出bug修改

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;

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();

Application/Admin/View/CpJuheCompany/export.html

@@ -103,7 +103,7 @@
           <th >聚合包名</th>
           <th >产品类型</th>
           <th >结算周期</th>
-          <th colspan="2">游戏分成比例</th>
+          <th colspan="2">我方分成比例</th>
           <th >户名</th>
           <th >账号</th>
           <th >开户行</th>