1

app/Service/ConstructionService.php

@@ -414,6 +414,8 @@ class ConstructionService extends Service
                 ->get()->toArray();
             $model->whereIn('sales_order_id',array_unique(array_column($sale,'id')));
         }
+        if(! empty($data['install_method'])) $model->where('install_method',$data['install_method']);
+        if(! empty($data['install_position'])) $model->where('install_position',$data['install_position']);
 
         $list = $this->limit($model,'',$data);
         $list = $this->fillData($list);

app/Service/PurchaseOrderService.php

@@ -329,6 +329,28 @@ class PurchaseOrderService extends Service
                 $model->where('order_type',$data['order_type']);
             }
         }
+        if(! empty($data['sale_order'])){
+            $model2 = SalesOrder::Clear($user,$data);
+            $sale = $model2->where('del_time',0)
+                ->where('order_number', 'LIKE', '%'.$data['sale_order'].'%')
+                ->select('id')
+                ->get()->toArray();
+            $model->whereIn('sales_order_id',array_unique(array_column($sale,'id')));
+        }
+        if(! empty($data['supplier_man'])){
+            $emp = Supplier::where('del_time',0)
+                ->where('title', 'LIKE', '%'.$data['supplier_man'].'%')
+                ->select('id')
+                ->get()->toArray();
+            $model->whereIn('supplier',array_unique(array_column($emp,'id')));
+        }
+        if(! empty($data['purchase_man'])){
+            $emp = Employee::where('del_time',0)
+                ->where('emp_name', 'LIKE', '%'.$data['purchase_man'].'%')
+                ->select('id')
+                ->get()->toArray();
+            $model->whereIn('purchase_id',array_unique(array_column($emp,'id')));
+        }
 
         $list = $this->limit($model,'',$data);
         $list = $this->fillListData($list,$data,$user);