source

application/index/controller/Finance.php

@@ -2398,7 +2398,7 @@ class Finance extends Basic
             }
 
             //来源
-            if (!empty($this->params['source'])) {
+            if ($this->params['source'] > -1) {
                 $where['a.source'] = $this->params['source'];
                 $is_show = 1;
             }

application/index/view/finance/getCollection.html

@@ -345,10 +345,10 @@
 													<option value="60">其他</option>
 												</select>
 												<select class="form-control btn2 ld-Marheight" id="come_from">
-													<option value="">来源</option>
+													<option value="-1">来源</option>
 													<option value="0">app</option>
 													<option value="1">智能pos机</option>
-													<option value="1">调整</option>
+													<option value="2">调整</option>
 												</select>
 												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="order_id" placeholder="带看ID" type="text" value="">
 												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="get_id" placeholder="收款ID" type="text" value="">

public/resource/js/getCollection.js

@@ -789,8 +789,8 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 				paramsStr += "pay_type=" + maintable_pay_type + "&"
 			}
 			if ( come_from ) {
-				params.soucre = come_from;
-				paramsStr += "soucre=" + come_from + "&"
+				params.source = come_from;
+				paramsStr += "source=" + come_from + "&"
 			}
 			if ( order_id ) {
 				params.order_id = order_id;
@@ -949,7 +949,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 			} else {
 				$("#comes").text('调整');
 			}
-	 		doc.find("#status").text(data.soucre_id);
+	 		doc.find("#status").text(data.source_id);
 	 		doc.find("#lastTime").val(data.last_transfer_time);
 	 		
 	 		if ( data.type == 91 || data.type == 92) {