|
@@ -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"=>"",
|
|
|
+ $param= $this->request->param(["start"=>"","end"=>"","supplierNo"=>"","companyNo"=>"","status"=>"",'relaNo'=>'',
|
|
|
"invoice_number"=>"","invoice_type"=>"","page"=>1,"size"=>15,"apply_id"=>""],"post","trim");
|
|
|
$where=[];
|
|
|
$whereOr=[];
|
|
@@ -27,6 +27,7 @@ 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($this->level!=1) {
|
|
|
if($param['supplierNo']!==''||$param['companyNo']!==''){
|
|
|
$whereOr[]=['apply_id','=', $this->uid];
|
|
@@ -36,6 +37,7 @@ class Invoice extends Base{
|
|
|
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'].'%'];
|
|
|
}
|
|
|
|
|
|
}
|