From f4aeae340d6da255018ac292fff38e522a9100b9 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 26 Aug 2020 10:26:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E8=A1=A5=E7=82=B9=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/CompanyStatementController.class.php  |  2 +-
 .../CompanyStatement/viewPuComplementStatement.html  |  2 +-
 .../View/CompanyStatement/viewSpecialComplement.html | 12 ++++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php
index 1343a9aa1..f9f7f3350 100644
--- a/Application/Admin/Controller/CompanyStatementController.class.php
+++ b/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_")
diff --git a/Application/Admin/View/CompanyStatement/viewPuComplementStatement.html b/Application/Admin/View/CompanyStatement/viewPuComplementStatement.html
index 0182a09bd..44181396d 100644
--- a/Application/Admin/View/CompanyStatement/viewPuComplementStatement.html
+++ b/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>
diff --git a/Application/Admin/View/CompanyStatement/viewSpecialComplement.html b/Application/Admin/View/CompanyStatement/viewSpecialComplement.html
index de1056731..ceb1eb76d 100644
--- a/Application/Admin/View/CompanyStatement/viewSpecialComplement.html
+++ b/Application/Admin/View/CompanyStatement/viewSpecialComplement.html
@@ -377,6 +377,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('请选择公司类型');