Commit b0d17eed by 朱继来

添加自营订单

parent c9daff4a
...@@ -226,6 +226,14 @@ Class OrderController extends Controller ...@@ -226,6 +226,14 @@ Class OrderController extends Controller
// 订单列表 // 订单列表
public function orderList(Request $request) public function orderList(Request $request)
{ {
$info = $this->getOrderInfo($request, 1);
return view('orderlist', $info);
}
// 获取页面及订单信息 tid为订单类型:1.联营 2. 自营
public function getOrderInfo($request, $tid)
{
$info = $this->getPageInfo($request); $info = $this->getPageInfo($request);
$map = array(); $map = array();
...@@ -269,6 +277,8 @@ Class OrderController extends Controller ...@@ -269,6 +277,8 @@ Class OrderController extends Controller
$map['vp_time_set'] = strtotime(Config('website.vp_time_set')); // 竞调账号根据时间展示订单 $map['vp_time_set'] = strtotime(Config('website.vp_time_set')); // 竞调账号根据时间展示订单
} }
$map['order_goods_type'] = $tid;
// 获取所有的业务员 (包括经理和交易员) // 获取所有的业务员 (包括经理和交易员)
// $sale_list = $this->getSales('销售'); // $sale_list = $this->getSales('销售');
$perm = new PermController; $perm = new PermController;
...@@ -299,7 +309,7 @@ Class OrderController extends Controller ...@@ -299,7 +309,7 @@ Class OrderController extends Controller
$info['count'] = $response['data']['count']; $info['count'] = $response['data']['count'];
$info['page'] = $show; $info['page'] = $show;
return view('orderlist', $info); return $info;
} }
// erp订单 // erp订单
...@@ -362,6 +372,14 @@ Class OrderController extends Controller ...@@ -362,6 +372,14 @@ Class OrderController extends Controller
return view('erpOrder', $info); return view('erpOrder', $info);
} }
// 自营订单
public function selfOrder(Request $request)
{
$info = $this->getOrderInfo($request, 2);
return view('selfOrder', $info);
}
// 获取对应部门人员 // 获取对应部门人员
public function getSales($title='') public function getSales($title='')
{ {
......
...@@ -59,7 +59,7 @@ Route::group(['middleware' => 'web'], function () { ...@@ -59,7 +59,7 @@ Route::group(['middleware' => 'web'], function () {
Route::get('/count', 'OrderCountController@count'); Route::get('/count', 'OrderCountController@count');
Route::get('/amount', 'OrderCountController@amount'); Route::get('/amount', 'OrderCountController@amount');
Route::get('/self_order', 'OrderCountController@selfOrder'); Route::get('/self_order', 'OrderController@selfOrder');
}); });
......
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>订单管理后台 | 订单列表</title>
<script>document.domain="{{ Config::get('website.domain') }}";</script>
@include('orderlist.css')
@include('orderlist.js')
</head>
<body class="">
<div id="wrapper">
<!-- layouts.navigation -->
@include('layouts.navigation')
<div id="page-wrapper" class="gray-bg">
<div class="row">
@include('selfOrder.content')
</div>
</div>
</div>
</body>
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