From ae3ad391fd8a357d159c11882a1a109ab6c0697b Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Wed, 3 Mar 2021 09:20:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=8A=9F=E8=83=BD=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyStatementController.class.php | 32 +++++++++--------- .../CompanyStatement/poolWmStatement.html | 7 ++++ .../CompanyStatement/showCpStatementList.html | 31 +++++++++++++++++ .../CompanyStatement/showCpStatementView.html | 33 ++++++++++--------- 4 files changed, 72 insertions(+), 31 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index 8d134d2ad..d8c967f5e 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -629,21 +629,6 @@ class CompanyStatementController extends ThinkController foreach ($company_id as $ckey => $cvalue) { - $use_data = [ - "01"=>["time"=>"01"], - "02"=>["time"=>"02"], - "03"=>["time"=>"03"], - "04"=>["time"=>"04"], - "05"=>["time"=>"05"], - "06"=>["time"=>"06"], - "07"=>["time"=>"07"], - "08"=>["time"=>"08"], - "09"=>["time"=>"09"], - "10"=>["time"=>"10"], - "11"=>["time"=>"11"], - "12"=>["time"=>"12"], - ]; - $map["company_id"] = $cvalue; $map['company_belong'] = 9; @@ -652,6 +637,21 @@ class CompanyStatementController extends ThinkController ->where($map) ->select(); + $use_data = [ + "01"=>["time"=>"01","show_company_name"=>$data[0]["company_name"]], + "02"=>["time"=>"02","show_company_name"=>$data[0]["company_name"]], + "03"=>["time"=>"03","show_company_name"=>$data[0]["company_name"]], + "04"=>["time"=>"04","show_company_name"=>$data[0]["company_name"]], + "05"=>["time"=>"05","show_company_name"=>$data[0]["company_name"]], + "06"=>["time"=>"06","show_company_name"=>$data[0]["company_name"]], + "07"=>["time"=>"07","show_company_name"=>$data[0]["company_name"]], + "08"=>["time"=>"08","show_company_name"=>$data[0]["company_name"]], + "09"=>["time"=>"09","show_company_name"=>$data[0]["company_name"]], + "10"=>["time"=>"10","show_company_name"=>$data[0]["company_name"]], + "11"=>["time"=>"11","show_company_name"=>$data[0]["company_name"]], + "12"=>["time"=>"12","show_company_name"=>$data[0]["company_name"]], + ]; + $row = 0; foreach($data as $key => $value) { @@ -661,7 +661,7 @@ class CompanyStatementController extends ThinkController $statement_info = $data[$key]['statement_info']; $data[$key]['row'] = count($data[$key]['statement_info']); - + $data[$key]['show_company_name'] = $value["company_name"]; $row += $data[$key]['row']; foreach ($statement_info as $k => $v) { diff --git a/Application/Admin/View/CompanyStatement/poolWmStatement.html b/Application/Admin/View/CompanyStatement/poolWmStatement.html index a16965bf0..e34cde00e 100644 --- a/Application/Admin/View/CompanyStatement/poolWmStatement.html +++ b/Application/Admin/View/CompanyStatement/poolWmStatement.html @@ -160,9 +160,16 @@ var list = '{$js_data}'; var company_id; var other_id; + var submit = 0; $(".submit_btn").click(function () { + if (submit == 0) { + submit++; + } else { + return; + } + var id = "{$_GET['id']}"; if (!company_id) { diff --git a/Application/Admin/View/CompanyStatement/showCpStatementList.html b/Application/Admin/View/CompanyStatement/showCpStatementList.html index 0750ffb93..0f682ca1c 100644 --- a/Application/Admin/View/CompanyStatement/showCpStatementList.html +++ b/Application/Admin/View/CompanyStatement/showCpStatementList.html @@ -122,6 +122,7 @@
批量导出 + 查看
@@ -310,6 +311,36 @@ $("body").append(iframeExcel) }); + $("#view_show").click(function () { + + var time = $("#year").val(); + var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) { + return $(elem).val(); + }).get(); + + if(text.length > 20){ + layer.msg("" + '暂不支持超过20条的批量导出' + ""); + return; + } + if(text.length < 1){ + layer.msg("" + '请先选择要导出的公司' + ""); + return; + } + + var url ="{:U('showCpStatementView')}"+"&company_id="+text.join(",")+"&time="+time; + + layer.open({ + type: 2, + title: "详情", + shadeClose: true, + shade: 0.8, + area: ['100%', '100%'], + content: url + }); + }); + + + $(".view").click(function () { var company_id = $(this).data("company_id"); var time = $("#year").val(); diff --git a/Application/Admin/View/CompanyStatement/showCpStatementView.html b/Application/Admin/View/CompanyStatement/showCpStatementView.html index 32c0701e1..c60a33f16 100644 --- a/Application/Admin/View/CompanyStatement/showCpStatementView.html +++ b/Application/Admin/View/CompanyStatement/showCpStatementView.html @@ -99,6 +99,7 @@ + 公司名称 结算时间 产品 联运流水 @@ -122,11 +123,12 @@ - + - {$time}年{$data["time"]}月 - - {$data['statement_info'][0]['game_name']|default="--"} + {$datas['show_company_name']} + {$time}年{$datas["time"]}月 + + {$datas['statement_info'][0]['game_name']|default="--"} -- -- -- @@ -134,22 +136,22 @@ -- -- -- - -{$data['statement_info'][0]['sum_money']|default="--"} + -{$datas['statement_info'][0]['sum_money']|default="--"} - {$data['statement_info'][0]['game_name']|default="--"} - {$data['statement_info'][0]['platform_money']|default="--"} - {$data['statement_info'][0]['aggregate_money']|default="--"} - {$data['statement_info'][0]['sum_amount']|default="--"} - {$data['statement_info'][0]['ratio']|default="--"} - {$data['statement_info'][0]['promote_ratio']|default="--"} - {$data['statement_info'][0]['fax_ratio']|default="--"} - {$data['statement_info'][0]['other_amount']|default="--"} - {$data['statement_info'][0]['sum_money']|default="--"} + {$datas['statement_info'][0]['game_name']|default="--"} + {$datas['statement_info'][0]['platform_money']|default="--"} + {$datas['statement_info'][0]['aggregate_money']|default="--"} + {$datas['statement_info'][0]['sum_amount']|default="--"} + {$datas['statement_info'][0]['ratio']|default="--"} + {$datas['statement_info'][0]['promote_ratio']|default="--"} + {$datas['statement_info'][0]['fax_ratio']|default="--"} + {$datas['statement_info'][0]['other_amount']|default="--"} + {$datas['statement_info'][0]['sum_money']|default="--"} - + {$statement_info['game_name']|default="--"} @@ -180,6 +182,7 @@ 小计 -- + -- {$sum[$index]['platform_money']} {$sum[$index]['aggregate_money']} {$sum[$index]['sum_amount']} From 3900a4081a88ba067bdcf4623956f2704280c2ed Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Wed, 3 Mar 2021 17:43:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E5=AD=90=E7=B3=BB?= =?UTF-8?q?=E7=BB=9Fbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyStatementController.class.php | 84 ++++++++----------- .../CompanyStatement/poolWmStatement.html | 29 +++++-- 2 files changed, 56 insertions(+), 57 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index d8c967f5e..49cf8900d 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -472,15 +472,24 @@ class CompanyStatementController extends ThinkController $promote_ids = array_column($promote_data,"id"); $statement_info = json_decode($value['statement_info'],true); -// dump($statement_info); + + $statement_begin_time = $value['statement_begin_time']; + $statement_end_time = $value['statement_end_time']; + + $user_data = SM("user", "tab_") + ->field("id") + ->where([ + 'promote_id' => ['in', $promote_ids], + "register_time" => ['between', [$statement_begin_time, $statement_end_time]] + ])->select(); + + $amount_data['user_newcount'] += count($user_data); + if ($value['company_type'] == 1) { $list = array_merge($list,$statement_info); foreach ($statement_info as $k => $v) { - $statement_begin_time = strtotime(str_replace(".", "-", $v['statement_begin_time'])); - $statement_end_time = strtotime(str_replace(".", "-", $v['statement_end_time'])) + 86399; - if (!$amount_data['statement_begin_time'] || $amount_data['statement_begin_time'] > $v['statement_begin_time']) { $amount_data['statement_begin_time'] = $v['statement_begin_time']; } @@ -489,13 +498,7 @@ class CompanyStatementController extends ThinkController $amount_data['statement_end_time'] = $v['statement_end_time']; } - $user_data = SM("user", "tab_") - ->field("id") - ->where([ - 'promote_id' => ['in', $promote_ids], - 'fgame_name' => ['like', "%{$v['game_name']}%"], - "register_time" => ['between', [$statement_begin_time, $statement_end_time]] - ])->select(); + if ($v['game_name'] != '罚款' && $v['game_name'] != '奖励') { $amount_data['pay_amount'] += $v["pay_amount"]; } @@ -504,7 +507,6 @@ class CompanyStatementController extends ThinkController } else { $amount_data['sum_money'] += $v["sum_money"]; } - $amount_data['user_newcount'] += count($user_data); } } elseif($value['company_type'] == 2) { @@ -516,8 +518,6 @@ class CompanyStatementController extends ThinkController $list = array_merge($list,$game_list); foreach ($game_list as $gk=>$gv) { - $statement_begin_time = strtotime(str_replace(".", "-", $gv['statement_begin_time'])); - $statement_end_time = strtotime(str_replace(".", "-", $gv['statement_end_time'])) + 86399; if (!$amount_data['statement_begin_time'] || $amount_data['statement_begin_time'] > $gv['statement_begin_time']) { $amount_data['statement_begin_time'] = $gv['statement_begin_time']; @@ -527,13 +527,6 @@ class CompanyStatementController extends ThinkController $amount_data['statement_end_time'] = $gv['statement_end_time']; } - $user_data = SM("user", "tab_") - ->field("id") - ->where([ - 'promote_id' => ['in', $promote_ids], - 'fgame_name' => ['like', "%{$gv['game_name']}%"], - "register_time" => ['between', [$statement_begin_time, $statement_end_time]] - ])->select(); if ($gv['game_name'] != '罚款' && $gv['game_name'] != '奖励') { $amount_data['pay_amount'] += $gv["pay_amount"]; } @@ -543,7 +536,7 @@ class CompanyStatementController extends ThinkController } else { $amount_data['sum_money'] += $gv["sum_money"]; } - $amount_data['user_newcount'] += count($user_data); + } } @@ -729,8 +722,6 @@ class CompanyStatementController extends ThinkController $check_list = array_column(json_decode($_POST["list"],true),"game_name"); -// dump($check_list);die(); - if (!$company_id) { $data = []; } else { @@ -750,6 +741,22 @@ class CompanyStatementController extends ThinkController $statement_info = json_decode($value['statement_info'], true); + $statement_begin_time = $value['statement_begin_time']; + $statement_end_time = $value['statement_end_time']; + + $user_data = []; + if ($promote_ids) { + $user_data = SM("user", "tab_") + ->field("id") + ->where([ + 'promote_id' => ['in', $promote_ids?$promote_ids:0], + "register_time" => ['between', [$statement_begin_time, $statement_end_time]] + ])->select(); + } + + + $amount_data['user_newcount'] += count($user_data); + if ($value['company_type'] == 1) { // $list = array_merge(, $statement_info); @@ -757,16 +764,7 @@ class CompanyStatementController extends ThinkController 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; - - $user_data = SM("user", "tab_") - ->field("id") - ->where([ - 'promote_id' => ['in', $promote_ids?$promote_ids:0], - 'fgame_name' => ['like', "%{$v['game_name']}%"], - "register_time" => ['between', [$statement_begin_time, $statement_end_time]] - ])->select(); + if ($v['game_name'] != '罚款' && $v['game_name'] != '奖励') { $amount_data['pay_amount'] += $v["pay_amount"]; } @@ -777,8 +775,6 @@ class CompanyStatementController extends ThinkController $amount_data['sum_money'] += $v["sum_money"]; } - $amount_data['user_newcount'] += count($user_data); - } } elseif($value['company_type'] == 2) { foreach ($statement_info as $k => $v) { @@ -790,9 +786,6 @@ class CompanyStatementController extends ThinkController 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; - if (!$amount_data['statement_begin_time'] || $amount_data['statement_begin_time'] > $gv['statement_begin_time']) { $amount_data['statement_begin_time'] = $gv['statement_begin_time']; } @@ -801,14 +794,6 @@ class CompanyStatementController extends ThinkController $amount_data['statement_end_time'] = $gv['statement_end_time']; } - $user_data = SM("user", "tab_") - ->field("id") - ->where([ - 'promote_id' => ['in', $promote_ids?$promote_ids:0], - 'fgame_name' => ['like', "%{$gv['game_name']}%"], - "register_time" => ['between', [$statement_begin_time, $statement_end_time]] - ])->select(); - if ($gv['game_name'] != '罚款' && $gv['game_name'] != '奖励') { $amount_data['pay_amount'] += floatval($gv["pay_amount"]); } @@ -818,8 +803,7 @@ class CompanyStatementController extends ThinkController } else { $amount_data['sum_money'] += floatval($gv["sum_money"]); } - - $amount_data['user_newcount'] += count($user_data); + } } } @@ -903,7 +887,7 @@ class CompanyStatementController extends ThinkController $save['statement_begin_time'] = strtotime(str_replace(".", "-", $amount_data['statement_begin_time'])); $save['statement_end_time'] = strtotime(str_replace(".", "-", $amount_data['statement_end_time'])) + 86399; $save['pay_amount'] = $amount_data['pay_amount']; - $save['sum_money'] = $amount_data['sum_money']-($amount_data['sum_money']*$_POST['fax_ratio']/100); + $save['sum_money'] = $amount_data['sum_money']; $save['user_newcount'] = $amount_data['user_newcount']; $save['fax_ratio'] = $_POST['fax_ratio']; $save['statement_ids'] = $_POST['id'].','.$_POST['other_id']; diff --git a/Application/Admin/View/CompanyStatement/poolWmStatement.html b/Application/Admin/View/CompanyStatement/poolWmStatement.html index e34cde00e..c2a50fdd3 100644 --- a/Application/Admin/View/CompanyStatement/poolWmStatement.html +++ b/Application/Admin/View/CompanyStatement/poolWmStatement.html @@ -118,8 +118,8 @@ {$data[0]['game_name']} {$amount_data['pay_amount']} {$amount_data['user_newcount']} - % - {$amount_data['sum_money']} + % + @@ -153,7 +153,7 @@ $(function () { - var sum_amount = parseFloat($(".sum_money").text()); + var sum_amount = parseFloat($(".sum_money").val()); var row = 0; var amount_datas; var other_list; @@ -202,6 +202,21 @@ }); + $(".sum_money").blur(function() { + + var pay_amount = parseFloat($(".pay_amount").text()); + sum_amount = parseFloat($(this).val()); + + if (sum_amount > pay_amount) { + sum_amount = pay_amount; + $(this).val(sum_amount) + } + var jsonObj = JSON.parse(amount_datas); + jsonObj["sum_money"] = sum_amount; + amount_datas = JSON.stringify(jsonObj); + + }); + $("#promote_company").change(function () { var begin = $(".time").data("begin"); var end = $(".time").data("end"); @@ -219,7 +234,7 @@ $(".pay_amount").attr("rowspan",parseInt($(".pay_amount").attr('rowspan'))-row); $(".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); + $(".parent_sum_money").attr("rowspan",parseInt($(".parent_sum_money").attr('rowspan'))-row); layer.load(2); $.ajax({ @@ -244,12 +259,12 @@ $(".pay_amount").text(data.amount_data['pay_amount']); $(".user_newcount").text(data.amount_data['user_newcount']); // $(".fax_ratio").text(data.amount_data['pay_amount']); - $(".sum_money").text(data.amount_data['sum_money']); + $(".sum_money").val(data.amount_data['sum_money']); $(".pay_amount").attr("rowspan",parseInt($(".pay_amount").attr('rowspan'))+row); $(".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); + $(".parent_sum_money").attr("rowspan",parseInt($(".parent_sum_money").attr('rowspan'))+row); sum_amount = data.amount_data['sum_money']; amount_datas = JSON.stringify(data.amount_data); other_list = JSON.stringify(data.list); @@ -276,7 +291,7 @@ sum_money = sum_amount-fax_amount; - $(".sum_money").text(sum_money.toFixed(2)); + $(".sum_money").val(sum_money.toFixed(2)); });