ad

app/cxinv/controller/Invoice.php

@@ -28,13 +28,17 @@ class Invoice extends Base{
         if($param['invoice_type']!=='') $where[]=['invoice_type','=',$param['invoice_type']];
         if($param['apply_id']!=='') $where[]=['apply_id','=',$param['apply_id']];
         if($this->level!=1) {
-            if($param['supplierNo']!==''||$param['companyNo']!==''){
-                $whereOr[]=['apply_id','=', $this->uid];
-                if($param['status']!==''){
-                     $whereOr[]=['status','=', $param['status']];
+                    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']];
+
+                    }
+
                 }
-            }
-        }
         $list=$this->model->where($where)->whereOr(function($query)use($whereOr){
             $query->where($whereOr);
         })->order('id desc')->paginate(['page'=>$param['page'],'list_rows'=>$param['size']]);

app/cxinv/controller/Label.php

@@ -73,7 +73,7 @@ class Label extends Base{
 
       public function List(){
         $param = $this->request->param(['betweenTime'=>[],'customerNo'=>'','supplierNo'=>'','companyNo'=>'',
-    	'type'=>'','status'=>'','orderCode'=>'','creater'=>'','order_type'=>0,'size'=>10,'page'=>1],'post','trim');
+    	'type'=>'','status'=>'','orderCode'=>'','creater'=>'','order_type'=>1,'size'=>10,'page'=>1],'post','trim');
     	$modela=['','payInfo','orderInfo','cgdInfo'];
     	$sbtable = $modela[$param['order_type']];
     	$type = [[],[1,2],[3,4],[5,6]];

app/cxinv/model/TagLog.php

@@ -42,7 +42,7 @@ namespace app\cxinv\model;
     	->bind(['companyNo','companyName','supplierNo','supplierName']);
     }
     /** 添加标签
-	* @param $type 标签类型 1对账单付款2对账单回票3销售回款4销售开票5采购单付款 6采购单开票
+	* @param $type 标签类型 1对账单付款2对账单回票3销售回款4销售开票5采购单付款 6采购单回票
 	* @param $code  单编号
 	* @param $total_fee 标签金额
 	* @return \think\response\Json|void