|
@@ -77,6 +77,14 @@ class Sale extends BaseController{
|
|
|
if($customer!=''){
|
|
|
$condition[]=["a.customerName","like","%$customer%"];
|
|
|
}
|
|
|
+ $companyNo = isset($post['companyNo'])&&$post['companyNo']!=''?trim($post['companyNo']):'';
|
|
|
+ if($companyNo!==''){
|
|
|
+ $condition[]=["a.companyNo","like","%$companyNo%"];
|
|
|
+ }
|
|
|
+ $companyName = isset($post['companyName'])&&$post['companyName']!=''?trim($post['companyName']):'';
|
|
|
+ if($companyName !=''){
|
|
|
+ $condition[]=["a.companyName","like","%$companyName%"];
|
|
|
+ }
|
|
|
$platName = isset($post['platName'])&&$post['platName']!=''?trim($post['platName']):'';
|
|
|
if($platName!=''){
|
|
|
$condition[]=["a.platName","like","%$platName%"];
|
|
@@ -100,7 +108,6 @@ class Sale extends BaseController{
|
|
|
if($tag_id==3) $condition[]=["a.pay_tag|inv_tag","=",1];
|
|
|
if($tag_id==4) $condition[]=["a.pay_tag&inv_tag","=",1];
|
|
|
}
|
|
|
-
|
|
|
$cat_status= isset($post['cat_status'])&&$post['cat_status']!=="" ? intval($post['cat_status']) :"";
|
|
|
if($cat_status!=='') $condition[]=["b.status","=",$cat_status];
|
|
|
$count =Db::name("qrd_info")->alias("a")->leftJoin("good b","a.goodNo=b.spuCode")->where($condition)->count();
|