Commit 908e8bb6 authored by zw's avatar zw

bug

parent fe7422e6
...@@ -137,7 +137,7 @@ class Finance extends Basic ...@@ -137,7 +137,7 @@ class Finance extends Basic
$is_show = 1; $is_show = 1;
} }
if (!empty($this->params['is_pay_log'])) { /* if (!empty($this->params['is_pay_log'])) {
if ($this->params['is_pay_log'] == 1) { if ($this->params['is_pay_log'] == 1) {
$where[] = ['EXP', 'f.id is not null']; $where[] = ['EXP', 'f.id is not null'];
} else { } else {
...@@ -145,7 +145,7 @@ class Finance extends Basic ...@@ -145,7 +145,7 @@ class Finance extends Basic
} }
$is_show = 1; $is_show = 1;
} }*/
$excel_title = '成交报告'; $excel_title = '成交报告';
switch ($check_status) { switch ($check_status) {
......
...@@ -202,11 +202,11 @@ ...@@ -202,11 +202,11 @@
<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="bargain_id" placeholder="成交报告id" type="text" value=""> <input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="bargain_id" placeholder="成交报告id" type="text" value="">
<div class="clear"></div> <div class="clear"></div>
<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="maintable_user_ID" placeholder="客户ID" type="text" value=""> <input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="maintable_user_ID" placeholder="客户ID" type="text" value="">
<select class="form-control btn2" id="isPayment"> <!--<select class="form-control btn2" id="isPayment">
<option value="">是否收款</option> <option value="">是否收款</option>
<option value="1">是</option> <option value="1">是</option>
<option value="2">否</option> <option value="2">否</option>
</select> </select>-->
<span class="total-commission">应收佣金总计:<span class="total-commission-should"></span></span> <span class="total-commission">应收佣金总计:<span class="total-commission-should"></span></span>
<span class="total-commission">已收佣金总计:<span class="total-commission-real"></span></span> <span class="total-commission">已收佣金总计:<span class="total-commission-real"></span></span>
<span class="total-commission">未收佣金总计:<span class="total-commission-no">0</span></span> <span class="total-commission">未收佣金总计:<span class="total-commission-no">0</span></span>
......
...@@ -390,7 +390,7 @@ class OBargainModel extends Model ...@@ -390,7 +390,7 @@ class OBargainModel extends Model
->join('o_order c', 'a.order_id = c.id', 'left') ->join('o_order c', 'a.order_id = c.id', 'left')
->join('g_houses d', 'c.house_id = d.id', 'left') ->join('g_houses d', 'c.house_id = d.id', 'left')
->join('o_partial_commission e', 'e.bargain_id = a.id', 'left') ->join('o_partial_commission e', 'e.bargain_id = a.id', 'left')
->join('o_paylog f', 'a.id = f.bargain_id', 'left') //->join('o_paylog f', 'a.id = f.bargain_id', 'left')
->where($params) ->where($params)
->sum($field); ->sum($field);
} }
...@@ -408,7 +408,7 @@ class OBargainModel extends Model ...@@ -408,7 +408,7 @@ class OBargainModel extends Model
->join('o_order c', 'a.order_id = c.id', 'left') ->join('o_order c', 'a.order_id = c.id', 'left')
->join('g_houses d', 'c.house_id = d.id', 'left') ->join('g_houses d', 'c.house_id = d.id', 'left')
->join('o_partial_commission e', 'e.bargain_id = a.id', 'left') ->join('o_partial_commission e', 'e.bargain_id = a.id', 'left')
->join('o_paylog f', 'a.id = f.bargain_id', 'left') //->join('o_paylog f', 'a.id = f.bargain_id', 'left')
->where($params) ->where($params)
->group('a.id') ->group('a.id')
->count(); ->count();
......
...@@ -90,7 +90,7 @@ class ORealIncome extends BaseModel ...@@ -90,7 +90,7 @@ class ORealIncome extends BaseModel
->join('o_report b', 'a.report_id = b.id', 'left') ->join('o_report b', 'a.report_id = b.id', 'left')
->join('o_order c', 'a.order_id = c.id', 'left') ->join('o_order c', 'a.order_id = c.id', 'left')
->join('g_houses d', 'c.house_id = d.id', 'left') ->join('g_houses d', 'c.house_id = d.id', 'left')
->join('o_paylog f', 'a.id = f.bargain_id', 'left') //->join('o_paylog f', 'a.id = f.bargain_id', 'left')
->where($params) ->where($params)
->sum($field); ->sum($field);
} }
......
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