ad

app/admin/controller/OrderInv.php

@@ -156,6 +156,7 @@ class OrderInv extends BaseController{
             "invNo"=>$invNo,
             "inv_value"=>$invfee,
             "inv_out"=> $companyNo,
+            "inv_company"=> $company['company_name'],
             "apply_id"=>$this->uid,
             "apply_name"=>$this->uname,
             "inv_type"=>$invtype,//发票类型  专用 普通 电子专用 电子普通
@@ -849,6 +850,14 @@ class OrderInv extends BaseController{
         if($invNo!==""){
            $condition[]=["a.invNo","like","%$invNo%"];
         }
+         $inv_company = isset($this->post['inv_company'])&&$this->post['inv_company']!=="" ? trim($this->post['inv_company']):"";
+        if($inv_company!==""){
+           $condition[]=["a.inv_company","like","%$inv_company%"];
+        }
+         $buyer_name = isset($this->post['buyer_name'])&&$this->post['buyer_name']!=="" ? trim($this->post['buyer_name']):"";
+        if($buyer_name!==""){
+           $condition[]=["b.buyer_title","like","%$buyer_name%"];
+        }
 
          $apply_id = isset($this->post['apply_id'])&&$this->post['apply_id']!=="" ? intval($this->post['apply_id']):"";
         if($apply_id!==""){
@@ -864,12 +873,6 @@ class OrderInv extends BaseController{
         $page= $page>$total ? intval($total):$page;
         $list=Db::name("invoice_pool")->alias("a")->leftJoin("invoice_pool_info b","a.invNo=b.invNo")->where($condition)
         ->page($page,$size)->order("a.addtime desc")->select()->toArray();
-        foreach ($list as &$item) {
-          $company =Db::name("company_info")->where(["companyNo"=>$item['inv_out']])->find();
-//          $kehu =Db::name("customer_info")->where(["companyNo"=>$item['inv_in']])->find();
-          $item['companyName'] = $company['company_name']??"";
-//          $item['customerName'] = $kehu['companyName']??"";
-        }
         return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
     }
     //获取发票详情
@@ -882,8 +885,6 @@ class OrderInv extends BaseController{
       if(empty($poolinfo)){
              return error_show(1004,"为找到开票信息");
       }
-        $company =Db::name("company_info")->where(["companyNo"=>$poolinfo['inv_out']])->find();
-        $poolinfo['companyName'] = $company['company_name']??"";
         $pool =  Db::name("invoice_pool_info")->where(["invNo"=>$invNo])->find();
         $poolinfo['buyer_title'] = $pool['buyer_title']??'';
         $poolinfo['buyer_code'] = $pool['buyer_code']??'';