|
@@ -22,7 +22,15 @@ class OrderController extends Controller
|
22
|
22
|
$page = 1;
|
23
|
23
|
}
|
24
|
24
|
|
25
|
|
- $admin_id = $request->input('admin_id');
|
|
25
|
+ $self_role = session('role_name');
|
|
26
|
+ if($self_role == '超级管理员' || $self_role == '团队主管'){
|
|
27
|
+ $admin_id = $request->input('admin_id');
|
|
28
|
+ $search_admin = 1;
|
|
29
|
+ }else{
|
|
30
|
+ $admin_id = session('admin_id');
|
|
31
|
+ $search_admin = 0;
|
|
32
|
+ }
|
|
33
|
+
|
26
|
34
|
$stime = $request->input('stime');
|
27
|
35
|
$etime = $request->input('etime');
|
28
|
36
|
|
|
@@ -266,7 +274,7 @@ class OrderController extends Controller
|
266
|
274
|
$order = array();
|
267
|
275
|
$order['customerName'] = $request->input('customerName'); //买家名称
|
268
|
276
|
$order['receiverName'] = $request->input('receiverName'); //收件人
|
269
|
|
- if(preg_match('/^1\d{10}$/', $phone) && !substr($phone,3,4) == '****') $order['receiverMobile'] = $phone; //收件人手机
|
|
277
|
+ if(preg_match('/^1\d{10}$/', $phone)) $order['receiverMobile'] = $phone; //收件人手机
|
270
|
278
|
$order['receiverState'] = $request->input('receiverState'); //省份
|
271
|
279
|
$order['receiverCity'] = $request->input('receiverCity'); //市
|
272
|
280
|
$order['receiverDistrict'] = $request->input('receiverDistrict'); //区
|
|
@@ -381,7 +389,12 @@ class OrderController extends Controller
|
381
|
389
|
|
382
|
390
|
public function order_export(Request $request){
|
383
|
391
|
|
384
|
|
- $admin_id = $request->input('admin_id');
|
|
392
|
+ $self_role = session('role_name');
|
|
393
|
+ if($self_role == '超级管理员' || $self_role == '团队主管'){
|
|
394
|
+ $admin_id = $request->input('admin_id');
|
|
395
|
+ }else{
|
|
396
|
+ $admin_id = session('admin_id');
|
|
397
|
+ }
|
385
|
398
|
$stime = $request->input('stime');
|
386
|
399
|
$etime = $request->input('etime');
|
387
|
400
|
|