|
|
@@ -40,17 +40,22 @@ class ComonOrder extends Base
|
|
|
|
|
|
public function list(){
|
|
|
$post = $this->request->only(["start"=>"","end"=>"","cxCode"=>"","customerNo"=>"","companyNo"=>"",'status'=>'',
|
|
|
- 'relaComNo'=>'','platform_type'=>'','page'=>1,'size'=>15],"post","trim");
|
|
|
+ 'relaComNo'=>'','platform_type'=>'','inv_status'=>'','pay_status'=>'','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['platform_type']==''?:$where[]=["platform_type","=",$post['platform_type']];
|
|
|
- $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']]);
|
|
|
+ $post['start']==''?:$where[]=["comon_order.addtime",">=",date("Y-m-d 00:00:00",strtotime($post['start']))];
|
|
|
+ $post['end']==''?:$where[]=["comon_order.addtime","<=",date("Y-m-d 23:59:59",strtotime($post['end']))];
|
|
|
+ $post['cxCode']==''?:$where[]=["comon_order.cxCode","like","%{$post['cxCode']}%"];
|
|
|
+ $post['customerNo']==''?:$where[]=["comon_order.customerNo","=",$post['customerNo']];
|
|
|
+ $post['status']==''?:$where[]=["comon_order.status","=",$post['status']];
|
|
|
+ $post['inv_status']==''?:$where[]=["qrd.inv_status","=",$post['inv_status']];
|
|
|
+ $post['pay_status']==''?:$where[]=["qrd.pay_status","=",$post['pay_status']];
|
|
|
+// $post['status']==''?:$where[]=["comon_order.status","=",$post['status']];
|
|
|
+ $post['platform_type']==''?:$where[]=["comon_order.platform_type","=",$post['platform_type']];
|
|
|
+ $post['companyNo']==''?:$where[]=["comon_order.companyNo|comon_order.supplierNo","=",$post['companyNo']];
|
|
|
+ $post['relaComNo']==''?:$where[]=["comon_order.companyNo|comon_order.supplierNo|comon_order.customerNo","=",
|
|
|
+ $post['relaComNo']];
|
|
|
+ $list=$this->model->withJoin(["qrd","cgd"],"left")->where($where)->order("id desc")->paginate
|
|
|
+ (["page"=>$post['page'],"list_rows"=>$post['size']]);
|
|
|
$this->success("0",["list"=>$list->items(),"count"=>$list->total()]);
|
|
|
}
|
|
|
//通用订单创建对账单
|
