|
@@ -39,13 +39,14 @@ class ComonOrder extends Base
|
|
|
}
|
|
|
|
|
|
public function list(){
|
|
|
- $post = $this->request->only(["start"=>"","end"=>"","cxCode"=>"","customerNo"=>"","companyNo"=>"",
|
|
|
+ $post = $this->request->only(["start"=>"","end"=>"","cxCode"=>"","customerNo"=>"","companyNo"=>"",'status'=>'',
|
|
|
'relaComNo'=>'','page'=>1,'size'=>15],"post","trim");
|
|
|
$where=[];
|
|
|
$post['start']==''?:$where[]=["addtime",">=",date("Y-m-d 00:00:00",strtotime($post['start']))];
|
|
|
$post['end']==''?:$where[]=["addtime","<=",date("Y-m-d 23:59:59",strtotime($post['end']))];
|
|
|
$post['cxCode']==''?:$where[]=["cxCode","like","%{$post['cxCode']}%"];
|
|
|
$post['customerNo']==''?:$where[]=["customerNo","=",$post['customerNo']];
|
|
|
+ $post['status']==''?:$where[]=["status","=",$post['status']];
|
|
|
$post['companyNo']==''?:$where[]=["companyNo|supplierNo","=",$post['companyNo']];
|
|
|
$post['relaComNo']==''?:$where[]=["companyNo|supplierNo|customerNo","=",$post['relaComNo']];
|
|
|
$list=$this->model->with(["qrd","cgd"])->where($where)->order("id desc")->paginate(["page"=>$post['page'],"list_rows"=>$post['size']]);
|