|
@@ -1713,20 +1713,12 @@ class OrderController extends Controller
|
1713
|
1713
|
|
1714
|
1714
|
}
|
1715
|
1715
|
|
1716
|
|
- $stime = $request->input('stime');
|
1717
|
|
- $etime = $request->input('etime');
|
1718
|
|
- $receiverName = $request->input('receiverName');
|
1719
|
|
- $receiverMobile = $request->input('receiverMobile');
|
1720
|
|
- $admin_id = (int)$request->input('admin_id');
|
1721
|
|
- $page = (int)$request->input('page');
|
1722
|
|
- $str_query = 'page='.$page.'&admin_id='.$admin_id.'&stime='.$stime.'&etime='.$etime.'&receiverName='.$receiverName.'&receiverMobile='.$receiverMobile;
|
1723
|
|
-
|
1724
|
1716
|
//获取可变更状态
|
1725
|
1717
|
$enableStatus = $this->getEnableStatus($old_status, $order->warehouse);
|
1726
|
1718
|
if( !empty($enableStatus) ){
|
1727
|
1719
|
$statusArr = array_column($enableStatus, 'status');
|
1728
|
1720
|
if( !in_array($order->status, $statusArr) ){
|
1729
|
|
- return redirect('/admin/order/index?'.$str_query)->with('info', '异常操作');
|
|
1721
|
+ return redirect('/admin/order/index')->with('info', '异常操作');
|
1730
|
1722
|
}
|
1731
|
1723
|
}else{
|
1732
|
1724
|
return redirect('/admin/order/index');
|
|
@@ -1795,8 +1787,15 @@ class OrderController extends Controller
|
1795
|
1787
|
}
|
1796
|
1788
|
|
1797
|
1789
|
// exit('<script>window.location.replace(document.referrer)</script>');
|
1798
|
|
-// echo '<script>window.location.replace(document.referrer)</script>';die;
|
|
1790
|
+ echo '<script>window.location.replace(document.referrer)</script>';die;
|
1799
|
1791
|
|
|
1792
|
+ $stime = $request->input('stime');
|
|
1793
|
+ $etime = $request->input('etime');
|
|
1794
|
+ $receiverName = $request->input('receiverName');
|
|
1795
|
+ $receiverMobile = $request->input('receiverMobile');
|
|
1796
|
+ $admin_id = (int)$request->input('admin_id');
|
|
1797
|
+ $page = (int)$request->input('page');
|
|
1798
|
+ $str_query = 'page='.$page.'&admin_id='.$admin_id.'&stime='.$stime.'&etime='.$etime.'&receiverName='.$receiverName.'&receiverMobile='.$receiverMobile;
|
1800
|
1799
|
return redirect('/admin/order/index?'.$str_query)->with('info', '操作成功');
|
1801
|
1800
|
}
|
1802
|
1801
|
|