确认分佣时间

application/index/controller/Finance.php

@@ -490,17 +490,19 @@ class Finance extends Basic
 
         $pageNo   = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
         $pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
+        $where    = [];
+        $where['a.confirm_status'] = 1;
 
         if(!empty($this->params['create_time']) && empty($this->params['end_time'])) {
-            $where['a.create_time'] = ['> time', $this->params['create_time'] . ' 00:00:00'];
+            $where['a.confirm_date'] = ['> time', $this->params['create_time']];
         }
 
         if(!empty($this->params['end_time']) && empty($this->params['create_time'])) {
-            $where['a.create_time'] = ['< time', $this->params['create_time'] . ' 23:59:59'];
+            $where['a.confirm_date'] = ['< time', $this->params['create_time']];
         }
 
         if (!empty($this->params['end_time']) && !empty($this->params['create_time'])) {
-            $where['a.create_time'] = ['between time', [$this->params['create_time'] . ' 00:00:00', $this->params['create_time'] . ' 23:59:59']];
+            $where['a.confirm_date'] = ['between time', [$this->params['create_time'] . ' 00:00:00', $this->params['create_time']]];
         }
 
         if (!empty($this->params['internal_address'])) {
@@ -519,8 +521,7 @@ class Finance extends Basic
             $where['b.house_number'] = ['like', '%'.$this->params['house_number'].'%'];
         }
 
-        $where = [];
-        $field = 'a.id,a.create_time,a.practical_fee,b.scale_fee,d.internal_address,b.agent_id,b.house_number';
+        $field = 'a.id,a.confirm_date,a.practical_fee,b.scale_fee,d.internal_address,b.agent_id,b.house_number';
         $m_commission = new OPartialCommission();
 
         $data['data']['list']  = $m_commission->getCommissionBargainList($pageNo, $pageSize, 'a.id desc', $field, $where);

application/model/OPartialCommission.php

@@ -151,7 +151,7 @@ class OPartialCommission extends BaseModel
         //确认分佣加时间 否则 只是保存分佣数据
         if ($data['confirm_date']) {
             $insert_data['confirm_date'] = $data['confirm_date'];
-            $insert_data['confirm_stutas'] = 1;
+            $insert_data['confirm_status'] = 1;
         }
 
         if (empty($insert_data['id'])) {

public/resource/template/commission_template_tpl.html

@@ -2,7 +2,7 @@
     [% if(it) { %]
     [% for(var item in it){ %]
     <tr class="text-center">
-        <td>[%= it[item]['create_time'] %]</td>
+        <td>[%= it[item]['confirm_date'] %]</td>
         <td>[%= it[item]['district_store'] %]</td>
         <td>[%= it[item]['agent'] %]</td>
         <td>[%= it[item]['internal_address'] %]</td>