Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three

Application/Admin/Controller/CompanyStatementController.class.php

@@ -1293,7 +1293,7 @@ class CompanyStatementController extends ThinkController
 
                 foreach ($statement_info as $k => $v) {
                     $statement_begin_time = strtotime($v['statement_begin_time']);
-                    $statement_end_time = strtotime($v['statement_end_time']);
+                    $statement_end_time = strtotime($v['statement_end_time'])+86399;
                     $amount_time['_string'] = "payed_time between {$statement_begin_time} and {$statement_end_time} and relation_game_id={$v['relation_game_id']}";
 
                     $dataAmount = M("spend","tab_")

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/viewPuComplementStatement.html

@@ -178,9 +178,9 @@
                     <tr>
                         <td colspan="4">合计</td>
                         <td></td>
-                        <td></td>
                         <td>{$data.statement_count.pay_amount}</td>
                         <td></td>
+                        <td></td>
                         <td>{$data.statement_count.statement_money}</td>
                     </tr>
                     <tr>

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>
@@ -355,10 +354,7 @@
             var is_add = 1;
             //添加公司比例操作
             $('#add_company').click(function (e) {
-                if (!is_add) {
-                    layer.msg('正在执行中请勿重复点击...');
-                    return;
-                }
+
                 layer.load(2);
                 is_add = 0;
                 var company_id = $("#company_id").find("option:selected").val();
@@ -380,6 +376,18 @@
                     return false;
                 }
 
+                var s_start = time_start.split('-');
+                var s_month = s_start[1]; //获取当前日期的月份
+
+                var s_end = time_end.split('-');
+                var e_month = s_end[1]; //获取当前日期的月份
+
+                if (s_month != e_month) {
+                    layer.closeAll("loading");
+                    layer.msg('只能选择同一个月的补点结算');
+                    return false;
+                }
+
                 if (!company_type) {
                     layer.closeAll("loading");
                     layer.msg('请选择公司类型');
@@ -628,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>"