Merge branch 'hotfix/market_percentage' of wmtx/platform into release

特殊补点汇总功能修改

Application/Admin/Controller/CompanyStatementLackController.class.php

@@ -113,6 +113,9 @@ class CompanyStatementLackController extends ThinkController
         }
         //获取基本信息
         $dbres = $this->DBModel->where("id='{$id}'")->select();
+
+        $withdraw_type = $dbres[0]['withdraw_type'];
+
         $title = $dbres[0]['company_name'];
         $this->assign("title",$title);
 
@@ -121,9 +124,9 @@ class CompanyStatementLackController extends ThinkController
             A("CompanyStatementPool")->viewCpPool($dbres,$is_export);
         }elseif($dbres[0]['company_type'] == 1){
             //下游公司
-            A("CompanyStatementPool")->viewPcPool($dbres,$is_export);
+            A("CompanyStatementPool")->viewPcPool($dbres,$is_export,$withdraw_type);
         }else{
-            A("CompanyStatementPool")->viewPuPool($dbres,$is_export);
+            A("CompanyStatementPool")->viewPuPool($dbres,$is_export,$withdraw_type);
         }
     }
  

Application/Admin/View/CompanyStatement/viewSpecialComplement.html

@@ -174,7 +174,6 @@
             </div>
             <div class="input-list input-list-game search_label_rehab">
                 <select id="relation_game_id" name="relation_game_id[]" class="select_gallery" multiple="multiple">
-                    <option value="">请选择游戏产品</option>
                     <volist name="gameList" id="vo">
                         <option value="{$vo.relation_game_id}" <if condition="$vo.relation_game_id eq I('relation_game_id')">selected</if> >{$vo.relation_game_name}</option>
                     </volist>
@@ -637,7 +636,7 @@
                 var url = "{:U('Ajax/getPromoteGameList')}"+"&game_ids="+data;
                 $.get(url,function(data){
                     var game = data;
-                    var gamestr = '<option value="">请选择游戏商品</option>';
+                    var gamestr = '';
                     for (var i in game) {
                         if(game[i].id == game_id){
                             gamestr += "<option value='" + game[i].relation_game_id + "' selected='selected'>" + game[i].relation_game_name + "</option>"