收款是否开业

application/index/controller/Finance.php

@@ -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 {
             $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,';

application/index/view/finance/getCollection.html

@@ -407,6 +407,11 @@
 												</select>
 												<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>
+												<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="reset" style="float:left">重置</span>
 												<span class="btn btn-info btn3 ld-Marheight" id="export" style="float: left;">导出报表</span>

application/model/OPayLogModel.php

@@ -344,6 +344,7 @@ class OPayLogModel extends Model
                 ->join("o_order b", "a.order_id = b.id", "left")
                 ->join('g_houses d', 'b.house_id = d.id', 'left')
                 ->join('a_agents e', 'a.agent_id=e.id', 'left')
+                ->join('o_bargain f', 'a.bargain_id=f.id', 'left')
                 ->limit($pageSize)
                 ->page($pageNo)
                 ->order($order_)
@@ -366,6 +367,7 @@ class OPayLogModel extends Model
                 ->join("o_order b", "a.order_id = b.id", "left")
                 ->join('g_houses d', 'b.house_id = d.id', 'left')
                 ->join('a_agents e', 'a.agent_id=e.id', 'left')
+                ->join('o_bargain f', 'a.bargain_id=f.id', 'left')
                 ->where($params)
                 ->count();
     }
@@ -387,6 +389,7 @@ class OPayLogModel extends Model
                 ->join("o_order b", "a.order_id = b.id", "left")
                 ->join('g_houses d', 'b.house_id = d.id', 'left')
                 ->join('a_agents e', 'a.agent_id=e.id', 'left')
+                ->join('o_bargain f', 'a.bargain_id=f.id', 'left')
                 ->where($where)
                 ->sum($field);
         } else {
@@ -395,6 +398,7 @@ class OPayLogModel extends Model
                 ->join("o_order b", "a.order_id = b.id", "left")
                 ->join('g_houses d', 'b.house_id = d.id', 'left')
                 ->join('a_agents e', 'a.agent_id=e.id', 'left')
+                ->join('o_bargain f', 'a.bargain_id=f.id', 'left')
                 ->where($where)
                 ->sum($field);
 

public/resource/js/getCollection.js

@@ -615,6 +615,16 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 					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){
@@ -1298,7 +1308,8 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 			var commit_shop = $('#commit_shop').val();
 			var comit_name = that.agent_id_phone;//$('#comit_name').val();
 			var params = {};
-			var paramsStr = "" ; 
+			var paramsStr = "" ;
+			var is_open = $('#is_open').val();
 			if ( commite_time_start ) {
 				params.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',
 				params.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);
 			if (excel) {
 				return paramsStr.substr(0,paramsStr.length-1)