修改分佣提成明细表

application/index/controller/Finance.php

@@ -494,6 +494,7 @@ class Finance extends Basic
         $pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
         $where    = [];
         $where['a.confirm_status'] = 1;
+        $where['a.is_del'] = 0;
 
         if(!empty($this->params['create_time']) && empty($this->params['end_time'])) {
             $where['a.confirm_date'] = ['>= time', $this->params['create_time'] . ' 00:00:00'];
@@ -523,7 +524,7 @@ class Finance extends Basic
             $where['b.house_number'] = ['like', '%'.$this->params['house_number'].'%'];
         }
 
-        $field = 'a.id,a.confirm_date,a.practical_fee,b.scale_fee,d.internal_address,b.agent_id,b.house_number';
+        $field = 'a.id,b.id as bargain_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);
@@ -543,7 +544,7 @@ class Finance extends Basic
         $pageSize = 250000;
         $where    = [];
         $where['a.confirm_status'] = 1;
-
+        $where['a.is_del'] = 0;
         if(!empty($this->params['create_time']) && empty($this->params['end_time'])) {
             $where['a.confirm_date'] = ['>= time', $this->params['create_time'] . ' 00:00:00'];
         }
@@ -572,7 +573,7 @@ class Finance extends Basic
             $where['b.house_number'] = ['like', '%'.$this->params['house_number'].'%'];
         }
 
-        $field = 'a.id,a.confirm_date,a.practical_fee,b.scale_fee,d.internal_address,b.agent_id,cash,service_charge,tallAge,charity_fund,real_fee';
+        $field = 'a.id,a.confirm_date,a.practical_fee,b.scale_fee,d.internal_address,b.agent_id,cash,service_charge,charity_fund,real_fee';
 
         $m_commission = new OPartialCommission();
 

public/resource/template/commission_template_tpl.html

@@ -11,8 +11,8 @@
         <td>[%= it[item]['practical_fee'] %]</td>
         
         <td>
-            <a class="btn1 btn-info edit" href="#modal-details" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a>
-            <a class="btn1 btn-info timeline"  href="#modal-linetime" data-toggle="modal" data-id='[%= it[item]["id"] %]'>时间轴</a>
+            <a class="btn1 btn-info edit" href="#modal-details" data-toggle="modal" data-id='[%= it[item]["bargain_id"] %]'>详情</a>
+            <a class="btn1 btn-info timeline"  href="#modal-linetime" data-toggle="modal" data-id='[%= it[item]["bargain_id"] %]'>时间轴</a>
         </td>
     </tr>
     [% } %]