|
|
@@ -18,18 +18,34 @@ class Goodup extends BaseController
|
|
|
$page = isset($this->post['page']) && $this->post['page'] !==""? intval($this->post['page']):"1";
|
|
|
$size = isset($this->post['size']) && $this->post['size'] !==""? intval($this->post['size']):"10";
|
|
|
$where =[["is_del","=",0]];
|
|
|
- $cat_id = isset($this->post['cat_id']) && $this->post['cat_id'] !=="" ? trim($this->post['cat_id']):"";
|
|
|
+ $cat_id = isset($this->post['cat_id']) && $this->post['cat_id'] !=="" ? intval($this->post['cat_id']):"";
|
|
|
if($cat_id!==""){
|
|
|
$where[]=['cat_id',"=",$cat_id];
|
|
|
}
|
|
|
$good_name = isset($this->post['good_name']) && $this->post['good_name'] !=="" ? trim($this->post['good_name']):"";
|
|
|
if($good_name!==""){
|
|
|
- $where[]=['good_name',"like","$good_name"];
|
|
|
+ $where[]=['good_name',"like","%$good_name%"];
|
|
|
+ }
|
|
|
+ $good_type = isset($this->post['good_type']) && $this->post['good_type'] !=="" ? trim($this->post['good_type'])
|
|
|
+ :"";
|
|
|
+ if($good_type!==""){
|
|
|
+ $where[]=['good_type',"=",$good_type];
|
|
|
+ }
|
|
|
+ $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !=="" ? trim($this->post['companyNo'])
|
|
|
+ :"";
|
|
|
+ if($companyNo!==""){
|
|
|
+ $where[]=['company_id',"like","%$companyNo%"];
|
|
|
+ }
|
|
|
+ $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] !=="" ? trim($this->post['supplierNo'])
|
|
|
+ :"";
|
|
|
+ if($supplierNo!==""){
|
|
|
+ $where[]=['supplierNo',"like","%$supplierNo%"];
|
|
|
+ }
|
|
|
+ $brandid = isset($this->post['brandid']) && $this->post['good_brandid'] !=="" ? intval($this->post['brandid'])
|
|
|
+ :"";
|
|
|
+ if($brandid!==""){
|
|
|
+ $where[]=['brand_id',"=",$brandid];
|
|
|
}
|
|
|
-// $good_code = isset($this->post['good_code']) && $this->post['good_code'] !=="" ? trim($this->post['good_code']):"";
|
|
|
-// if($good_code!==""){
|
|
|
-// $where [] = ['good_code',"like",$good_code];
|
|
|
-// }
|
|
|
$start = isset($this->post['start']) && $this->post['start']!=="" ? $this->post['start']:"";
|
|
|
if($start!==""){
|
|
|
$where[]=['addtime',">=",date('Y-m-d H:i:s',strtotime($start))];
|
