Browse Source

采购单列表和采购入库单列表增加order_type,order-source字段筛选

wufeng 2 years ago
parent
commit
70d82c3d16
2 changed files with 13 additions and 3 deletions
  1. 6 0
      app/admin/controller/Purch.php
  2. 7 3
      app/admin/controller/Purchin.php

+ 6 - 0
app/admin/controller/Purch.php

@@ -137,6 +137,12 @@ class Purch extends Base
         $company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
         if ($company_name !== "") $where[] = ["po.cgder_id", 'in', get_company_item_user_by_name($company_name)];
 
+        $order_type = isset($this->post['order_type']) && $this->post['order_type'] !== "" ? intval($this->post['order_type']) : "";
+        if ($order_type != "") $where[] = ["po.order_type", '=', $order_type];
+
+        $order_source = isset($this->post['order_source']) && $this->post['order_source'] !== "" ? intval($this->post['order_source']) : "";
+        if ($order_source != "") $where[] = ["po.order_source", '=', $order_source];
+        
 //        if(!empty($role['platform']) ){
 //            $where[]=["po.platform_id","in",$role['platform']];
 //        }

+ 7 - 3
app/admin/controller/Purchin.php

@@ -54,9 +54,13 @@ class Purchin extends Base
         if($end !=""){
             $where[]= ["a.sendtime",'<=',$end];
         }
-        $order_type=isset($this->post['order_type']) && $this->post['order_type']!==""? intval($this->post['order_type']):"";
-        if($order_type !=""){
-            $where[]= ["b.order_type",'=',$order_type];
+        $order_type = isset($this->post['order_type']) && $this->post['order_type'] !== "" ? intval($this->post['order_type']) : "";
+        if ($order_type != "") {
+            $where[] = ["b.order_type", '=', $order_type];
+        }
+        $order_source = isset($this->post['order_source']) && $this->post['order_source'] !== "" ? intval($this->post['order_source']) : "";
+        if ($order_source != "") {
+            $where[] = ["b.order_source", '=', $order_source];
         }
         $good_type_code=isset($this->post['good_type_code']) && $this->post['good_type_code']!==""? trim($this->post['good_type_code']):"";
         if($good_type_code !=""){