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 @@ 合计 - {$data.statement_count.pay_amount} + {$data.statement_count.statement_money} 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('请选择公司类型');