来源修改

application/index/controller/Finance.php

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

application/index/view/finance/getCollection.html

@@ -388,9 +388,8 @@
 												</select>
 												<select class="form-control btn2 ld-Marheight" id="come_from">
 													<option value="-1">来源</option>
-													<option value="0">app</option>
-													<option value="1">智能pos机</option>
-													<option value="2">调整</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="">