Merge pull request 'feature/add_item' (#196) from feature/add_item into release

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

Application/Admin/Controller/CompanyStatementController.class.php

@@ -617,6 +617,12 @@ class CompanyStatementController extends ThinkController
         $assign_data = [];
         $sum = [];
 
+        if ($_REQUEST["time"]) {
+            $start = strtotime($_REQUEST["time"]."-01-01");
+            $end = strtotime(date("Y-m-t",strtotime($_REQUEST["time"]."-12"))) + 86399;
+            $map["statement_begin_time"] = ["between",[$start,$end]];
+        }
+
         foreach ($company_id as $ckey => $cvalue) {
 
             $use_data = [

Application/Admin/Controller/CompanyStatementPoolController.class.php

@@ -222,7 +222,7 @@ class CompanyStatementPoolController extends ThinkController
         $infolist = SM("company_statement_info","tab_")->field("*,'1' as st")->where("pool_id = '{$id}'")->select();
         //获取母单
         $pool_info =  SM("company_statement_pool","tab_")
-            ->field('wm_statement_ids,statement_num,create_lack_ids,verify_status,is_payment,withdraw_type,statement_begin_time,statement_end_time,verify_log')->where("id={$id}")->find();
+            ->field('statement_num,create_lack_ids,verify_status,is_payment,withdraw_type,statement_begin_time,statement_end_time,verify_log')->where("id={$id}")->find();
         if(!empty($pool_info['create_lack_ids'])){
             $l_ids = $pool_info['create_lack_ids'];
             $lack_info = SM("company_lack_statement_info","tab_")->field("*,'0' as st")->where("id in ({$l_ids})")->select();
@@ -311,7 +311,7 @@ class CompanyStatementPoolController extends ThinkController
         //获取基本信息
         $infolist = SM("company_statement_info","tab_")->field("*,'1' as st")->where("pool_id = '{$id}' and pay_status!=1")->select();
         //获取母单
-        $pool_info =  SM("company_statement_pool","tab_")->field('wm_statement_ids,statement_num,create_lack_ids,verify_status,is_payment,withdraw_type,statement_begin_time,statement_end_time')->where("id={$id}")->find();
+        $pool_info =  SM("company_statement_pool","tab_")->field('statement_num,create_lack_ids,verify_status,is_payment,withdraw_type,statement_begin_time,statement_end_time')->where("id={$id}")->find();
         if(!empty($pool_info['create_lack_ids'])){
             $l_ids = $pool_info['create_lack_ids'];
             $lack_info = SM("company_lack_statement_info","tab_")->field("*,'0' as st")->where("id in ({$l_ids})")->select();

Application/Admin/View/CompanyStatementPool/lists.html

@@ -546,7 +546,7 @@
             });
 
             //撤销汇总
-            $(".cancelWmPool,.reCount").on("click",function(){
+            $(".cancelWmPool").on("click",function(){
                 var id = $(this).data('id');
                 var url = "{:U('cancelWmPool')}";
                 layer.confirm("撤销汇总/重算都是不可逆操作，请慎重选择",{title:false}, function(index){