da

app/cxinv/controller/Invoice.php

@@ -15,7 +15,7 @@ class Invoice extends Base{
         $this->model = new \app\cxinv\model\Invoice();
     }
     public function List(){
-        $param= $this->request->param(["start"=>"","end"=>"","supplierNo"=>"","companyNo"=>"","status"=>"",'relaNo'=>'',
+        $param= $this->request->param(["start"=>"","end"=>"","supplierNo"=>"","companyNo"=>"","status"=>"",'relaComNo'=>'',
         "invoice_number"=>"","invoice_type"=>"","page"=>1,"size"=>15,"apply_id"=>""],"post","trim");
         $where=[];
         $whereOr=[];
@@ -27,23 +27,24 @@ class Invoice extends Base{
         if($param['invoice_number']!=='') $where[]=['invoice_number','like','%'.$param['invoice_number'].'%'];
         if($param['invoice_type']!=='') $where[]=['invoice_type','=',$param['invoice_type']];
         if($param['apply_id']!=='') $where[]=['apply_id','=',$param['apply_id']];
-        if($param['relaNo']!=='') $where[]=['companyNo|supplierNo','=',$param['relaNo']];
+        if($param['relaComNo']!=='') $where[]=['companyNo|supplierNo','=',$param['relaComNo']];
         if($this->level!=1) {
-                    if($param['supplierNo']!==''||$param['companyNo']!==''){
-                        $whereOr[]=['apply_id','=', $this->uid];
-                        if($param['status']!=='')  $whereOr[]=['status','=', $param['status']];
-                        if($param['start']!=='') $whereOr[]=['createTime','>=',startTime($param['start'])];
-                        if($param['end']!=='') $whereOr[]=['createTime','<=',endTime($param['end'])];
-                        if($param['invoice_number']!=='') $whereOr[]=['invoice_number','like','%'.$param['invoice_number'].'%'];
-                        if($param['invoice_type']!=='') $whereOr[]=['invoice_type','=',$param['invoice_type']];
-                        if ($param['supplierNo']!=='') $whereOr[]=['supplierNo','like','%'.$param['supplierNo'].'%'];
-                        if ($param['companyNo']!=='') $whereOr[]=['companyNo','like','%'.$param['companyNo'].'%'];
-                    }
-
-                }
-        $list=$this->model->where($where)->whereOr(function($query)use($whereOr){
+            $whereOr[]=['apply_id','=', $this->uid];
+            if($param['status']!=='')  $whereOr[]=['status','=', $param['status']];
+            if($param['start']!=='') $whereOr[]=['createTime','>=',startTime($param['start'])];
+            if($param['end']!=='') $whereOr[]=['createTime','<=',endTime($param['end'])];
+            if($param['invoice_number']!=='') $whereOr[]=['invoice_number','like','%'.$param['invoice_number'].'%'];
+            if($param['invoice_type']!=='') $whereOr[]=['invoice_type','=',$param['invoice_type']];
+            if ($param['supplierNo']!=='') $whereOr[]=['supplierNo','like','%'.$param['supplierNo'].'%'];
+            if ($param['companyNo']!=='') $whereOr[]=['companyNo','like','%'.$param['companyNo'].'%'];
+        }
+        $list=$this->model
+        ->where($where)
+        ->whereOr(function($query)use($whereOr){
             $query->where($whereOr);
-        })->order('id desc')->paginate(['page'=>$param['page'],'list_rows'=>$param['size']]);
+        })
+        ->order('id desc')
+        ->paginate(['page'=>$param['page'],'list_rows'=>$param['size']]);
         return success('获取成功',['list'=>$list->items(),'count'=>$list->total()]);
     }
 

app/cxinv/controller/Label.php

@@ -35,7 +35,7 @@ class Label extends Base{
 			];
         $this->model->startTrans();
         try{
-            TagLog::CheckOrderInfo($param['code'],$param['total_fee'],$tag_info->type);
+            TagLog::CheckOrderInfo($param['code'],$param['total_fee'],$tag_info['type']);
             TagLog::create($tagdata);
             $this->model->commit();
         }catch (\Exception $e){
@@ -81,8 +81,8 @@ class Label extends Base{
 
     	empty($param['betweenTime'])?:$where[]=['tag_log.addtime','between',$param['betweenTime']];
 
-        if($param['order_type']==1)$param['customerNo']==''?:$where[]=["{$sbtable}.customerNo",'like',"%{$param['customerNo']}%"];
-        if($param['order_type']!=1)$param['supplierNo']==''?:$where[]=["{$sbtable}.supplierNo",'like',"%{$param['supplierNo']}%"];
+        if($param['order_type']==2)$param['customerNo']==''?:$where[]=["{$sbtable}.customerNo",'like',"%{$param['customerNo']}%"];
+        if($param['order_type']!=2)$param['supplierNo']==''?:$where[]=["{$sbtable}.supplierNo",'like',"%{$param['supplierNo']}%"];
     	$param['companyNo']==''?:$where[]=["{$sbtable}.companyNo",'like',"%{$param['companyNo']}%"];
     	$param['type']==''?:$where[]=['tagInfo.type','=',$param['type']];
     	$param['status']===''?:$where[]=['tag_log.status','=',$param['status']];

app/cxinv/controller/Payinv.php

@@ -66,8 +66,8 @@ class Payinv extends Base{
     }
 
     public function list(){
-        $params = $this->request->param(["page"=>1,"size"=>20,"status"=>"","payNo"=>"","apply_id"=>"","companyNo"=>"","supplierNo"=>"","invoiceType"=>"",
-        "open_time"=>"", "invoiceNumber"=>"","start"=>"","end"=>"","hpNo"=>""]);
+        $params = $this->request->param(["page"=>1,"size"=>20,"status"=>"","payNo"=>"","apply_id"=>"","companyNo"=>"",
+        "supplierNo"=>"","invoiceType"=>"",'relaComNo'=>'', "open_time"=>"", "invoiceNumber"=>"","start"=>"","end"=>"","hpNo"=>""]);
         $where=[["a.is_del","=",0],["invType","=",4]];
          $check =RoleAction::checkRole($this->roleid,[82,120]);
         if($check){
@@ -85,6 +85,7 @@ class Payinv extends Base{
             $where[]=['a.addtime','between',[startTime($params['start']),endTime($params['end'])]];
         }
         if ($params['hpNo']!='')$where[]=['a.hpNo','like','%'.$params['hpNo'].'%'];
+        if($params['relaComNo']!='') $where[]=['b.companyNo|b.supplierNo','=',$params['relaComNo']];
         $list = $this->model->alias('a')
             ->join('invoice b','a.payNo=b.InvCode')
             ->field('a.*,b.supplierNo,b.supplierName,b.companyName,b.companyNo')