Commit c6c6b126 authored by hujun's avatar hujun

实收明细修改

parent 379066aa
...@@ -836,14 +836,6 @@ class Finance extends Basic ...@@ -836,14 +836,6 @@ class Finance extends Basic
$where['d.internal_address'] = [ 'like', '%' . $this->params['internal_address'] . '%' ]; $where['d.internal_address'] = [ 'like', '%' . $this->params['internal_address'] . '%' ];
} }
if (!empty($this->params['phone'])) {
$where['e.phone'] = [ 'like', '%' . $this->params['phone'] . '%' ];
}
if (!empty($this->params['name'])) {
$where['e.name'] = [ 'like', '%' . $this->params['name'] . '%' ];
}
if (!empty($this->params['house_number'])) { if (!empty($this->params['house_number'])) {
$where['b.house_number'] = [ 'like', '%' . $this->params['house_number'] . '%' ]; $where['b.house_number'] = [ 'like', '%' . $this->params['house_number'] . '%' ];
} }
...@@ -860,6 +852,10 @@ class Finance extends Basic ...@@ -860,6 +852,10 @@ class Finance extends Basic
$where['e.district_id'] = $this->params['district_id']; $where['e.district_id'] = $this->params['district_id'];
} }
if (!empty($this->params['partial_id'])) {
$where['e.id'] = $this->params['partial_id'];
}
$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,a.real_income_id,a.should_commission'; $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,a.real_income_id,a.should_commission';
$m_commission = new OPartialCommission(); $m_commission = new OPartialCommission();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment