Commit f0aed09d authored by hujun's avatar hujun

成交报告-分佣提成列表-显示绑定的实收日期

parent 833032c7
...@@ -1042,6 +1042,7 @@ class OBargainModel extends Model ...@@ -1042,6 +1042,7 @@ class OBargainModel extends Model
$m_agent = new AAgents(); $m_agent = new AAgents();
$m_partial = new OPartialCommission(); $m_partial = new OPartialCommission();
$m_real = new ORealIncome();
$fields_str = 'a.id,a.name,a.phone,b.store_name,c.district_name'; $fields_str = 'a.id,a.name,a.phone,b.store_name,c.district_name';
foreach ($data as $k => $v) { foreach ($data as $k => $v) {
$result[$k] = $v; $result[$k] = $v;
...@@ -1093,6 +1094,7 @@ class OBargainModel extends Model ...@@ -1093,6 +1094,7 @@ class OBargainModel extends Model
} }
$result[$k]["last_commission_id"] = $partial_commission[$i]["id"]; $result[$k]["last_commission_id"] = $partial_commission[$i]["id"];
$result[$k]['partial_commission'] = $partial_commission; $result[$k]['partial_commission'] = $partial_commission;
$result[$k]['income_time'] = $m_real->field('id,income_time')->find($v['real_income_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