|
|
@@ -122,14 +122,18 @@ class OrderController extends Controller
|
|
122
|
122
|
$stime = $request->input('stime');
|
|
123
|
123
|
$etime = $request->input('etime');
|
|
124
|
124
|
$delivery_type = (int)$request->input('delivery_type'); //发货状态 0到发货时间（未填物流信息） 2全部
|
|
|
125
|
+ $receiverName = $request->input('receiverName');
|
|
|
126
|
+ $receiverMobile = $request->input('receiverMobile');
|
|
125
|
127
|
|
|
126
|
128
|
//仓库管理员只能看到发货之前的订单
|
|
127
|
129
|
$today_date = date('Y-m-d');
|
|
128
|
|
- $count = Order::where(function($query) use($admin_id, $stime, $etime, $today_date, $delivery_type){
|
|
|
130
|
+ $count = Order::where(function($query) use($admin_id, $stime, $etime, $today_date, $delivery_type, $receiverName, $receiverMobile){
|
|
129
|
131
|
if($admin_id) $query->where('admin_id', $admin_id);
|
|
130
|
132
|
if($stime) $query->where('createTime', '>=', $stime);
|
|
131
|
133
|
if($etime) $query->where('createTime', '<=', $etime);
|
|
132
|
134
|
if($delivery_type==0) $query->where('delivery_date', '<=', $today_date)->where('logistics_id', '=', '');
|
|
|
135
|
+ if($receiverName) $query->where('receiverName', 'like', $receiverName . '%');
|
|
|
136
|
+ if($receiverMobile) $query->where('receiverMobile', $receiverMobile);
|
|
133
|
137
|
})->where('is_del',0)->where('warehouse', $warehouse)->count();
|
|
134
|
138
|
if ($count > 1) {
|
|
135
|
139
|
// 总页数
|
|
|
@@ -139,11 +143,13 @@ class OrderController extends Controller
|
|
139
|
143
|
$pages = 1;
|
|
140
|
144
|
}
|
|
141
|
145
|
|
|
142
|
|
- $result = Order::where(function($query) use($admin_id, $stime, $etime, $today_date, $delivery_type){
|
|
|
146
|
+ $result = Order::where(function($query) use($admin_id, $stime, $etime, $today_date, $delivery_type, $receiverName, $receiverMobile){
|
|
143
|
147
|
if($admin_id) $query->where('admin_id', $admin_id);
|
|
144
|
148
|
if($stime) $query->where('createTime', '>=', $stime);
|
|
145
|
149
|
if($etime) $query->where('createTime', '<=', $etime);
|
|
146
|
150
|
if($delivery_type==0) $query->where('delivery_date', '<=', $today_date)->where('logistics_id', '=', '');
|
|
|
151
|
+ if($receiverName) $query->where('receiverName', 'like', $receiverName . '%');
|
|
|
152
|
+ if($receiverMobile) $query->where('receiverMobile', $receiverMobile);
|
|
147
|
153
|
})->where('is_del',0)->where('warehouse', $warehouse)->orderBy('id', 'desc')->offset($offset)->limit($pageSize)->get();
|
|
148
|
154
|
$result = json_decode(json_encode($result),true);
|
|
149
|
155
|
|
