Commit c7b69533 authored by hujun's avatar hujun

税费列表增加字段

parent 095edb3e
...@@ -968,7 +968,7 @@ class Finance extends Basic ...@@ -968,7 +968,7 @@ class Finance extends Basic
$pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo']; $pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
$pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize']; $pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
$fields = 'a.id,a.create_time,e.name,e.phone,a.fee,b.house_number,d.internal_address,a.agent_id,b.father_id,b.order_id'; $fields = 'a.id,a.create_time,e.name,e.phone,a.fee,b.house_number,d.internal_address,a.agent_id,b.father_id,b.id as bargain_id,b.order_id';
$where['c.is_del'] = 0; $where['c.is_del'] = 0;
$where['b.status'] = [ 'in', [10,11,13] ]; //10已提交 11审核成功 $where['b.status'] = [ 'in', [10,11,13] ]; //10已提交 11审核成功
......
...@@ -67,14 +67,6 @@ class OPartialCommission extends BaseModel ...@@ -67,14 +67,6 @@ class OPartialCommission extends BaseModel
$data[$k]['role_name'] = '无'; $data[$k]['role_name'] = '无';
} }
} }
if (isset($v['bargain_id'])) {
$bargain_id = $m_bargain->where('id',$v['bargain_id'])->value('father_id');
if ($bargain_id != 0) {
$data[$k]['bargain_id'] = $bargain_id;
}
}
} }
return $result; return $result;
} }
......
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