Merge branch 'master-new-dev-wf' of wugg/phpstock into master-new

app/admin/controller/Consult.php

@@ -2489,6 +2489,8 @@ class Consult extends Base
         $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] !== "" ? trim($this->post['relaComNo']) : "";
         if ($relaComNo !== "") $where[] = ["d.companyNo", '=', $relaComNo];
 
+        $companyNo = $this->post['companyNo']??'';
+        if($companyNo!='') $where[]=['d.companyNo','like','%' .$this->post['companyNo']. '%'];
         //Db::name("consult_order")->where(["zxNo"=>$zxinfo['zxNo'],"is_del"=>0])->find();
 
         $count = Db::name('consult_bids')

app/admin/controller/SupplierClient.php

@@ -94,7 +94,8 @@ class SupplierClient extends Base {
         $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] != "" ? trim($this->post['relaComNo']) : "";
         if ($relaComNo !== "") $where[] = ['po.companyNo', '=', $relaComNo];
 
-        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] != "" ? trim($this->post['relaComNo']) : "";
+        $companyNo = $this->post['companyNo']??'';
+        if($companyNo!='') $where[]=['po.companyNo','like','%'.$this->post['companyNo']. '%'];
 
         $userCommon = \app\admin\common\User::getIns();
 //        //只有level2的账号过滤数据权限
@@ -129,7 +130,7 @@ class SupplierClient extends Base {
         $count = Db::name("purchease_order")
             ->alias('po')
             ->leftJoin('order_num on', 'on.cgdNo=po.cgdNo')
-            ->leftJoin("depart_user u", "u.uid=po.cgder_id AND u.is_del=0")
+//            ->leftJoin("depart_user u", "u.uid=po.cgder_id AND u.is_del=0")
             ->where($where)
             ->where(function ($query) use ($where) {
                 $query->whereOr([['po.order_type', '<>', 1], ['po.order_source', '=', 0]]);
@@ -303,6 +304,9 @@ class SupplierClient extends Base {
         	if($relaComNo!=='') $where[]=['b.supplierNo','=', $relaComNo];
         }
 
+        $companyNo = $this->post['companyNo']??'';
+        if($companyNo!='') $where[]=['b.companyNo','like','%'.$this->post['companyNo']. '%'];
+
         $count = Db::name('purchease_in')
             ->alias('a')
             ->join("purchease_order b","b.cgdNo=a.cgdNo","left")
@@ -547,6 +551,8 @@ class SupplierClient extends Base {
 			 if($relaComNo!='') $where[]=['c.supplierNo','=', $relaComNo];
 		}
 
+        $companyNo = $this->post['companyNo']??'';
+        if($companyNo!='') $where[]=['a.companyNo','like', '%'.$this->post['companyNo']. '%'];
 
         $count = Db::name('purchease_diff')
             ->alias('a')