Commit f6e2cb2f authored by hujun's avatar hujun

收款是否开业

parent 575bc7e9
...@@ -2977,6 +2977,17 @@ class Finance extends Basic ...@@ -2977,6 +2977,17 @@ class Finance extends Basic
} }
} }
//案场费和中介费是否开业
if (isset($this->params['is_open'])) {
if ($this->params['is_open'] == 1) {
$where['f.is_open'] = 1;
} else {
$where['f.is_open'] = 0;
}
$where['a.type'] = ['in', '91,92'];
$is_show = 1;
}
try { try {
$order = new OPayLogModel(); $order = new OPayLogModel();
$field = 'a.id,a.create_time,a.order_id,a.father_id,a.money,a.real_money,a.pay_type,a.type,a.source,a.transaction_fee,a.source,b.f_id,a.transfer_name,a.receipt_number,a.bargain_id,'; $field = 'a.id,a.create_time,a.order_id,a.father_id,a.money,a.real_money,a.pay_type,a.type,a.source,a.transaction_fee,a.source,b.f_id,a.transfer_name,a.receipt_number,a.bargain_id,';
......
...@@ -407,6 +407,11 @@ ...@@ -407,6 +407,11 @@
</select> </select>
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="comit_name" placeholder="提交人姓名" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="comit_name" placeholder="提交人姓名" type="text" value="">
<ul class="user-ul" style="display:none"></ul> <ul class="user-ul" style="display:none"></ul>
<select class="form-control btn2 ld-Marheight" id="is_open">
<option value="-1">是否开业</option>
<option value="0"></option>
<option value="1"></option>
</select>
<span class="btn btn-info btn3 ld-Marheight" id="search" style="float:left">搜索</span> <span class="btn btn-info btn3 ld-Marheight" id="search" style="float:left">搜索</span>
<span class="btn btn-info btn3 ld-Marheight" id="reset" style="float:left">重置</span> <span class="btn btn-info btn3 ld-Marheight" id="reset" style="float:left">重置</span>
<span class="btn btn-info btn3 ld-Marheight" id="export" style="float: left;">导出报表</span> <span class="btn btn-info btn3 ld-Marheight" id="export" style="float: left;">导出报表</span>
......
...@@ -344,6 +344,7 @@ class OPayLogModel extends Model ...@@ -344,6 +344,7 @@ class OPayLogModel extends Model
->join("o_order b", "a.order_id = b.id", "left") ->join("o_order b", "a.order_id = b.id", "left")
->join('g_houses d', 'b.house_id = d.id', 'left') ->join('g_houses d', 'b.house_id = d.id', 'left')
->join('a_agents e', 'a.agent_id=e.id', 'left') ->join('a_agents e', 'a.agent_id=e.id', 'left')
->join('o_bargain f', 'a.bargain_id=f.id', 'left')
->limit($pageSize) ->limit($pageSize)
->page($pageNo) ->page($pageNo)
->order($order_) ->order($order_)
...@@ -366,6 +367,7 @@ class OPayLogModel extends Model ...@@ -366,6 +367,7 @@ class OPayLogModel extends Model
->join("o_order b", "a.order_id = b.id", "left") ->join("o_order b", "a.order_id = b.id", "left")
->join('g_houses d', 'b.house_id = d.id', 'left') ->join('g_houses d', 'b.house_id = d.id', 'left')
->join('a_agents e', 'a.agent_id=e.id', 'left') ->join('a_agents e', 'a.agent_id=e.id', 'left')
->join('o_bargain f', 'a.bargain_id=f.id', 'left')
->where($params) ->where($params)
->count(); ->count();
} }
...@@ -387,6 +389,7 @@ class OPayLogModel extends Model ...@@ -387,6 +389,7 @@ class OPayLogModel extends Model
->join("o_order b", "a.order_id = b.id", "left") ->join("o_order b", "a.order_id = b.id", "left")
->join('g_houses d', 'b.house_id = d.id', 'left') ->join('g_houses d', 'b.house_id = d.id', 'left')
->join('a_agents e', 'a.agent_id=e.id', 'left') ->join('a_agents e', 'a.agent_id=e.id', 'left')
->join('o_bargain f', 'a.bargain_id=f.id', 'left')
->where($where) ->where($where)
->sum($field); ->sum($field);
} else { } else {
...@@ -395,6 +398,7 @@ class OPayLogModel extends Model ...@@ -395,6 +398,7 @@ class OPayLogModel extends Model
->join("o_order b", "a.order_id = b.id", "left") ->join("o_order b", "a.order_id = b.id", "left")
->join('g_houses d', 'b.house_id = d.id', 'left') ->join('g_houses d', 'b.house_id = d.id', 'left')
->join('a_agents e', 'a.agent_id=e.id', 'left') ->join('a_agents e', 'a.agent_id=e.id', 'left')
->join('o_bargain f', 'a.bargain_id=f.id', 'left')
->where($where) ->where($where)
->sum($field); ->sum($field);
......
...@@ -615,6 +615,16 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -615,6 +615,16 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
that.search_person(); that.search_person();
} }
}); });
$("#maintable_deal_type").click(function () {
var type = $(this).val();
if (type == 91 || type == 92) {
$("#is_open").removeAttr("disabled");
} else {
$("#is_open").attr("disabled","disabled");
$("#is_open").val(-1);
}
});
}, },
getMaxBackPrice : function(id){ getMaxBackPrice : function(id){
...@@ -1298,7 +1308,8 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -1298,7 +1308,8 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
var commit_shop = $('#commit_shop').val(); var commit_shop = $('#commit_shop').val();
var comit_name = that.agent_id_phone;//$('#comit_name').val(); var comit_name = that.agent_id_phone;//$('#comit_name').val();
var params = {}; var params = {};
var paramsStr = "" ; var paramsStr = "" ;
var is_open = $('#is_open').val();
if ( commite_time_start ) { if ( commite_time_start ) {
params.start_time = commite_time_start; params.start_time = commite_time_start;
paramsStr += "start_time=" + commite_time_start + "&" paramsStr += "start_time=" + commite_time_start + "&"
...@@ -1360,6 +1371,10 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -1360,6 +1371,10 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
params.agent_id = comit_name; params.agent_id = comit_name;
paramsStr += "agent_id=" + comit_name + "&" paramsStr += "agent_id=" + comit_name + "&"
} }
if (is_open > -1) {
params.is_open = is_open;
paramsStr += "is_open=" + is_open + "&";
}
receiv.buildSearchParamsLiu = paramsStr.substr(0,paramsStr.length-1); receiv.buildSearchParamsLiu = paramsStr.substr(0,paramsStr.length-1);
if (excel) { if (excel) {
return paramsStr.substr(0,paramsStr.length-1) return paramsStr.substr(0,paramsStr.length-1)
......
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