Commit f72917f2 by 朱继来

添加付款类型条件

parent d0dc3d31
Showing with 4 additions and 3 deletions
...@@ -344,9 +344,9 @@ Class OrderController extends Controller ...@@ -344,9 +344,9 @@ Class OrderController extends Controller
$info = $this->orderDetail($request, $id); $info = $this->orderDetail($request, $id);
//待审核才可以 //待审核才可以
// if($info['order_info']['status'] != 1){ if(!in_array($info['order_info']['status'], [-1, 1, 2])){
// return redirect('/prompt')->with(['message'=>"该订单不符合人工审单条件~【status:{$info['order_info']['status']}】",'url' =>$_SERVER['HTTP_REFERER'], 'jumpTime'=>3,'status'=>false]); return redirect('/prompt')->with(['message'=>"该订单不符合人工审单条件~【status:{$info['order_info']['status']}】",'url' =>$_SERVER['HTTP_REFERER'], 'jumpTime'=>3,'status'=>false]);
// } }
// 获取所有的业务员 // 获取所有的业务员
$sale_list = $this->getSales('销售'); $sale_list = $this->getSales('销售');
...@@ -419,6 +419,7 @@ Class OrderController extends Controller ...@@ -419,6 +419,7 @@ Class OrderController extends Controller
$resData = [ $resData = [
"cancel_reason" => $request->input('cancel_reason', ''), "cancel_reason" => $request->input('cancel_reason', ''),
"sale_id" => $request->input('sale_id', ''), "sale_id" => $request->input('sale_id', ''),
"order_pay_type" => $request->input('order_pay_type', ''),
"status" => $request->input('order_status', ''), "status" => $request->input('order_status', ''),
"deposit_amount" => $request->input('deposit_amount', ''), "deposit_amount" => $request->input('deposit_amount', ''),
"goods_amount" => $request->input('goods_amount', ''), "goods_amount" => $request->input('goods_amount', ''),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment