Merge pull request '2.28号功能提交' (#178) from feature/add_item into release

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/178

Application/Admin/Controller/CompanyStatementController.class.php

@@ -715,6 +715,10 @@ class CompanyStatementController extends ThinkController
         $begin_time = strtotime(str_replace(".","-",$_REQUEST["begin_time"]));
         $end_time = strtotime(str_replace(".","-",$_REQUEST["end_time"]))+86399;
 
+        $check_list = array_column(json_decode($_POST["list"],true),"game_name");
+
+//        dump($check_list);die();
+
         if (!$company_id) {
             $data = [];
         } else {
@@ -736,9 +740,11 @@ class CompanyStatementController extends ThinkController
 
 
             if ($value['company_type'] == 1) {
-                $list = array_merge($list, $statement_info);
+//                $list = array_merge(, $statement_info);
                 foreach ($statement_info as $k => $v) {
-
+                    if (!in_array($v["game_name"],$check_list)) {
+                        array_push($list,$v);
+                    }
                     $statement_begin_time = strtotime(str_replace(".", "-", $v['statement_begin_time']));
                     $statement_end_time = strtotime(str_replace(".", "-", $v['statement_end_time'])) + 86399;
 
@@ -765,8 +771,13 @@ class CompanyStatementController extends ThinkController
             } elseif($value['company_type'] == 2) {
                 foreach ($statement_info as $k => $v) {
                     $game_list = $v["game_list"];
-                    $list = array_merge($list, $game_list);
+//                    $list = array_merge($list, $game_list);
                     foreach ($game_list as $gk=>$gv) {
+
+                        if (!in_array($gv["game_name"],$check_list)) {
+                            array_push($list,$gv);
+                        }
+
                         $statement_begin_time = strtotime(str_replace(".", "-", $gv['statement_begin_time']));
                         $statement_end_time = strtotime(str_replace(".", "-", $gv['statement_end_time'])) + 86399;
 

Application/Admin/View/CompanyStatement/poolWmStatement.html

@@ -213,11 +213,12 @@
             $(".user_newcount").attr("rowspan",parseInt($(".user_newcount").attr('rowspan'))-row);
             $(".parent_fax_ratio").attr("rowspan",parseInt($(".parent_fax_ratio").attr('rowspan'))-row);
             $(".sum_money").attr("rowspan",parseInt($(".sum_money").attr('rowspan'))-row);
+            layer.load(2);
 
             $.ajax({
                 type: 'post',
                 url: "{:U('checkCompanyData')}",
-                data:{begin_time:begin,end_time:end,company_id:company_id,statement_id:id,amount_data:amount_data},
+                data:{begin_time:begin,end_time:end,company_id:company_id,statement_id:id,amount_data:amount_data,list:list},
                 success: function(data) {
                     if (data.status==1) {
                         for (var key in data.list) {
@@ -247,9 +248,11 @@
                         other_list = JSON.stringify(data.list);
                         other_id = data.other_id;
                     }
+                    layer.closeAll("loading");
                 },
                 error:function(){
                     layer.alert("网络错误或超时");
+                    layer.closeAll("loading");
                     return false;
                 }
             });