|
@@ -659,6 +659,8 @@ class GoodsController extends Controller
|
659
|
659
|
//获取请求参数
|
660
|
660
|
$name = $request->input('name');
|
661
|
661
|
$cate_name = trim($request->input('cate_name'));
|
|
662
|
+ $status = $request->input('status',null);
|
|
663
|
+
|
662
|
664
|
$page = (int)$request->input('page');
|
663
|
665
|
$pageSize = 20;
|
664
|
666
|
if($page<=0){
|
|
@@ -687,12 +689,13 @@ class GoodsController extends Controller
|
687
|
689
|
}
|
688
|
690
|
|
689
|
691
|
//获取数据总条数
|
690
|
|
- $count = GoodsSkus::where(function($query) use ($goodsIds){
|
|
692
|
+ $count = GoodsSkus::where(function($query) use ($goodsIds,$status){
|
691
|
693
|
if(count($goodsIds) > 1){
|
692
|
694
|
$query->whereIn('goodsCode',$goodsIds);
|
693
|
695
|
}else if(count($goodsIds) == 1){
|
694
|
696
|
$query->where('goodsCode',$goodsIds);
|
695
|
697
|
}
|
|
698
|
+ if(!is_null($status)) $query->where('is_del',$status);
|
696
|
699
|
})->count();
|
697
|
700
|
|
698
|
701
|
//分页数据处理
|
|
@@ -706,12 +709,13 @@ class GoodsController extends Controller
|
706
|
709
|
|
707
|
710
|
//获取数据项
|
708
|
711
|
$offset = ($page-1) * $pageSize;
|
709
|
|
- $result = GoodsSkus::where(function($query) use ($goodsIds){
|
|
712
|
+ $result = GoodsSkus::where(function($query) use ($goodsIds,$status){
|
710
|
713
|
if(count($goodsIds) > 1){
|
711
|
714
|
$query->whereIn('goodsCode',$goodsIds);
|
712
|
715
|
} else if(count($goodsIds) == 1){
|
713
|
716
|
$query->where('goodsCode',$goodsIds);
|
714
|
717
|
}
|
|
718
|
+ if(!is_null($status)) $query->where('is_del',$status);
|
715
|
719
|
})->orderBy('id', 'desc')->offset($offset)->limit($pageSize)->get();
|
716
|
720
|
$result = json_decode(json_encode($result),true);
|
717
|
721
|
|
|
@@ -735,6 +739,7 @@ class GoodsController extends Controller
|
735
|
739
|
'name' =>$name,
|
736
|
740
|
'cate_name' =>$cate_name,
|
737
|
741
|
'cates' =>$cates,
|
|
742
|
+ 'status' =>$status,
|
738
|
743
|
]);
|
739
|
744
|
}
|
740
|
745
|
|
|
@@ -747,6 +752,7 @@ class GoodsController extends Controller
|
747
|
752
|
//获取请求参数
|
748
|
753
|
$name = $request->input('name');
|
749
|
754
|
$cate_name = trim($request->input('cate_name'));
|
|
755
|
+ $status = $request->input('status');
|
750
|
756
|
|
751
|
757
|
//若有请求参数,初步获取查询结果
|
752
|
758
|
$goodsIds = array();
|
|
@@ -762,12 +768,13 @@ class GoodsController extends Controller
|
762
|
768
|
}
|
763
|
769
|
|
764
|
770
|
//进一步获取数据查询结果
|
765
|
|
- $result = GoodsSkus::where(function($query) use ($goodsIds){
|
|
771
|
+ $result = GoodsSkus::where(function($query) use ($goodsIds,$status){
|
766
|
772
|
if(count($goodsIds) > 1){
|
767
|
773
|
$query->whereIn('goodsCode',$goodsIds);
|
768
|
774
|
}else if(count($goodsIds) == 1){
|
769
|
775
|
$query->where('goodsCode',$goodsIds);
|
770
|
776
|
}
|
|
777
|
+ if($status) $query->where('is_del',$status);
|
771
|
778
|
})->orderBy('id', 'desc')->get();
|
772
|
779
|
$result = json_decode(json_encode($result),true);
|
773
|
780
|
|