采购管理

app/Filters/ProcurementCheckSheetFilters.php

@@ -20,7 +20,7 @@ class ProcurementCheckSheetFilters
     protected $supplierQuery;
     protected $array_filter;
     protected $filters = [
-        'id','status','signed_at','supplier_id'
+        'id','status','signed_at','supplier_id',
     ];
     protected $params = [];
 
@@ -91,7 +91,7 @@ class ProcurementCheckSheetFilters
 
     public function supplier_id($supplier_id)
     {
-        $this->searchWay($this->getSupplierQuery(),$supplier_id,'supplier_id');
+        $this->searchWay($this->getSupplierQuery(),$supplier_id,'id');
     }
     public function signed_at($signed_at)
     {
@@ -108,14 +108,16 @@ class ProcurementCheckSheetFilters
 
     public function afterApply()
     {
-        if($this->procurementDeliveryQuery)
-            $this->queryBuilder->whereIn('procurement_delivery_id',$this->procurementDeliveryQuery);
+
+        if($this->supplierQuery)
+            $this->getProcurementQuery()->whereIn('supplier_id',$this->supplierQuery);
 
         if($this->procurementQuery)
-            $this->getProcurementQuery()->whereIn('procurement_id',$this->procurementQuery);
+            $this->getProcurementDeliveryQuery()->whereIn('procurement_id',$this->procurementQuery);
+
+        if($this->procurementDeliveryQuery)
+            $this->queryBuilder->whereIn('procurement_delivery_id',$this->procurementDeliveryQuery);
 
-        if($this->supplierQuery)
-            $this->getSupplierQuery()->whereIn('supplier_id',$this->supplierQuery);
 
     }
 }

app/Filters/ProcurementFilters.php

@@ -121,7 +121,7 @@ class ProcurementFilters
     }
     public function supplier_id($supplier_id)
     {
-        $this->searchWay($this->getSupplierQuery(),$supplier_id,'supplier_id');
+        $this->searchWay($this->queryBuilder,$supplier_id,'id');
     }
 
     public function material_id($material_id)

resources/views/procurement/finance/checkBill.blade.php

@@ -187,6 +187,7 @@
                     if (!_this.invoice_number){
                         tempTip.setDuration(3000);
                         tempTip.show('发票号不可为空!');
+                        return;
                     }
                     let url = '{{url('procurement/finance/fillInvoice')}}';
                     let params = {invoice_number:_this.invoice_number,procurementCheckSheetId:_this.procurementCheckSheetId};