|
|
@@ -19,17 +19,21 @@ class GoodZx extends Base{
|
|
|
}
|
|
|
public function list(){
|
|
|
$param = $this->request->param(["spuCode"=>"","status"=>"","tax_status"=>"","order_source"=>"","orderCode"=>"",
|
|
|
- "start"=>"","end"=>"","relaComNo"=>"","good_name"=>"","supplierNo"=>"","name"=>"","page"=>"1","size"=>"10"],"post","trim");
|
|
|
+ "start"=>"","end"=>"","relaComNo"=>"","good_name"=>"","supplierNo"=>"","name"=>"","page"=>"1","size"=>"10","creater"=>""],
|
|
|
+ "post","trim");
|
|
|
$where =[['is_del','=',0]] ;
|
|
|
if($param['spuCode']!="") $where[]=['good_zixun.spuCode','like',"%".$param['spuCode']."%"];
|
|
|
if($param['status']!="") $where[]=['good_zixun.status','=',$param['status']];
|
|
|
if($param['tax_status']!="") $where[]=['good_tax.status','=',$param['tax_status']==0?null:$param['tax_status']];
|
|
|
- if($param['order_source']!="") $where[]=['order_source','=',$param['order_source']];
|
|
|
+ if($param['order_source']!="") $where[]=['order_source','in',$param['order_source']];
|
|
|
if($param['orderCode']!="") $where[]=['good_zixun.spuCode','in',\app\admin\model\Sale::where("orderCode","=",$param['orderCode'])->column("good_code")];
|
|
|
- if($param['relaComNo']!="") $where[]=['good_zixun.companyNo|supplierNo','like',"%".$param['relaComNo']."%"];
|
|
|
+ if($param['relaComNo']!="") $where[]=['good_zixun.companyNo|supplierNo','=',$param['relaComNo']];
|
|
|
if($param['good_name']!="") $where[]=['good_name','like',"%".$param['good_name']."%"];
|
|
|
- if($param['supplierNo']!="") $where[]=['supplierNo','like',"%".$param['supplierNo']."%"];
|
|
|
+ if($param['supplierNo']!="") $where[]=['supplierNo','like',$param['supplierNo']];
|
|
|
if($param['name']!="") $where[]=['supplierName','like',"%".$param['name']."%"];
|
|
|
+ if($param['start']!="") $where[]=['good_zixun.addtime','>=',startTime($param['start'])];
|
|
|
+ if($param['end']!="") $where[]=['good_zixun.addtime','<=',endTime($param['end'])];
|
|
|
+ if($param['creater']!="") $where[]=['good_zixun.creater','like',"%{$param['creater']}%"];
|
|
|
$list = $this->model->with(["brand","unit","cat","Platform","GoodTax"=>["outCategory","inCategory","cgdCategory"]])->withJoin("good_tax","left")
|
|
|
->where($where)->order('id desc')
|
|
|
->paginate(['page'=>$param['page'],'list_rows'=>$param['size']])
|
