财务汇总表

application/index/controller/Finance.php

@@ -1003,7 +1003,7 @@ class Finance extends Basic
         $pageSize     = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
 
         $where['c.is_del'] = 0;        //订单状态
-        $where['a.status']       = ['in', '10,11'];   //10已提交 11审核成功
+        $where['a.status']       = ['in', '10,11,13'];   //10已提交 11审核成功
         $where['b.father_id']    = ['<>', 0];  //去除税费总佣金
         $where['c.confirm_status'] = 1;   //确认分佣
 
@@ -1032,7 +1032,7 @@ class Finance extends Basic
 
         if (!empty($this->params['income_start_date']) && !empty($this->params['income_end_date'])){
             $where['f.income_time'] = [ 'between time', [ $this->params['income_start_date'], $this->params['income_end_date']]];
-            $income_date = date('Y.m.d', strtotime($this->params['income_start_date'])) .'-'. date('Y.m.d', $this->params['income_end_date']);
+            $income_date = date('Y.m.d', strtotime($this->params['income_start_date'])) .'-'. date('Y.m.d', strtotime($this->params['income_end_date']));
         } else {
 //            $where['f.income_time'] = [ 'between time', [ date('Y-m-d',strtotime($month_start)), date('Y-m-d',strtotime($month_end))]];
 //            $income_date = $month_start_dot .'-'. $month_end_dot;
@@ -1041,7 +1041,7 @@ class Finance extends Basic
         /**收佣日期 end**/
 
         /**提交成交报告日期 start**/
-        if (!empty($this->params['bargain_start_date']) && empty($this->params['bargain_end_date'])) {
+        if (!empty($this->params['bargain_end_date']) && empty($this->params['income_end_date'])) {
             $where['a.create_time'] = [ '> time', $this->params['bargain_start_date'] ] . ' 00:00:00';
         }
 

public/resource/js/commissionTotal.js

@@ -318,12 +318,12 @@ define(['doT', 'text!temp/commissionTotal_template_tpl.html', 'css!style/home.cs
 			params.pageSize = business.pageSize;
 			params.name = $('#user_name').val();
 			params.phone = $('#user_phone').val();
-			params.commission_start_date = $('#create_time').val();
-			params.commission_end_date = $('#end_time').val();
-			params.deal_start_date = $('#create_dealtime').val();
-			params.deal_end_date = $('#end_dealtime').val();
-			params.operation_start_date = $('#create_ticketTime').val();
-			params.operation_end_date = $('#end_ticketTime').val();
+			params.income_start_date = $('#create_time').val();
+			params.income_end_date = $('#end_time').val();
+			params.bargain_start_date = $('#create_dealtime').val();
+			params.bargain_end_date = $('#end_dealtime').val();
+			params.deal_start_date = $('#create_ticketTime').val();
+			params.deal_end_date = $('#end_ticketTime').val();
 			params.district_id = $("#qx-store option:selected").val(); //部门id 添加字段
 			params.store_name = $('#store_name').val();
 

public/resource/template/commissionTotal_template_tpl.html

 <script id="commissionTotal_list_tpl" type="text/template">
-    [% if(it) { %]
+    [% if(it[0]) { %]
     [% for(var item in it){ %]
     <tr class="text-center">
         <td>[%= it[item]['income_date'] %]</td>
@@ -20,7 +20,7 @@
     [% } %]
     [% }else{ %]
     <tr>
-        <td colspan="8" style="text-align:center;"> 暂无数据</td>
+        <td colspan="9" style="text-align:center;"> 暂无数据</td>
     </tr>
     [% } %]
 </script>