Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 16704b97 by 朱继来
Options

fix

parent 7e57859b
Inline Side-by-side
Showing with 59 additions and 23 deletions
app/Http/Controllers/OrderController.php
...@@ -837,24 +837,28 @@ Class OrderController extends Controller ...@@ -837,24 +837,28 @@ Class OrderController extends Controller
$tags = $request->input('tags', ''); $tags = $request->input('tags', '');
if ($tags && $tags == 'self') { // 联营
$manager = $perm->getRoleUsers($request, '自营客服主管'); $joint_manager = $perm->getRoleUsers($request, '经理');
$test = $perm->getRoleUsers($request, '测试'); $joint_kefu = $perm->getRoleUsers($request, '客服');
$sale_list = '';
$assistant = $perm->getRoleUsers($request, '自营客服主管助理');
$kefu = $perm->getRoleUsers($request, '自营客服');
$kefu = array_merge($assistant, $kefu);
} else {
$manager = $perm->getRoleUsers($request, '经理');
$test = $perm->getRoleUsers($request, '测试');
$sale_list = $perm->getRoleUsers($request, '交易员'); $sale_list = $perm->getRoleUsers($request, '交易员');
$kefu = $perm->getRoleUsers($request, '客服'); $test = $perm->getRoleUsers($request, '测试');
$self_manager = $self_kefu = '';
if ($tags && $tags == 'self') {
$self_manager = $perm->getRoleUsers($request, '自营客服主管');
$self_assistant = $perm->getRoleUsers($request, '自营客服主管助理');
$self_kefu = $perm->getRoleUsers($request, '自营客服');
$self_kefu = array_merge($self_assistant, $self_kefu);
} }
$info['manager'] = $this->filterLeave($manager); $info['joint_manager'] = $this->filterLeave($joint_manager);
$info['test'] = $this->filterLeave($test); $info['joint_kefu'] = $this->filterLeave($joint_kefu);
$info['sale_list'] = $this->filterLeave($sale_list); $info['sale_list'] = $this->filterLeave($sale_list);
$info['kefu'] = $this->filterLeave($kefu); $info['test'] = $this->filterLeave($test);
$info['self_manager'] = $this->filterLeave($self_manager);
$info['self_kefu'] = $this->filterLeave($self_kefu);
$info['sale_id'] = $request->user->userId; $info['sale_id'] = $request->user->userId;
$info['role'] = $perm->getUserRole($request); $info['role'] = $perm->getUserRole($request);
......
resources/views/detail/sendSales.blade.php
...@@ -9,16 +9,13 @@ ...@@ -9,16 +9,13 @@
<input type="hidden" name="order_id" value="{{$order_info['order_id']}}"> <input type="hidden" name="order_id" value="{{$order_info['order_id']}}">
<table class="table table-bordered table-hover check-table" style="min-height:150px;"> <table class="table table-bordered table-hover check-table" style="min-height:150px;">
@if (!empty($manager)) @if (!empty($joint_manager))
<tr> <tr>
@if ($order_info['order_goods_type'] == 1)
<td class="check-table-title" width="10%">经理：</td> <td class="check-table-title" width="10%">经理：</td>
@else
<td class="check-table-title" width="10%">客服主管：</td>
@endif
<td> <td>
<ul> <ul>
@foreach ($manager as $k => $v) @foreach ($joint_manager as $k => $v)
@if ($v->userId == $order_info['sale_id']) @if ($v->userId == $order_info['sale_id'])
<li><label><input type="radio" name="sale_id" value="{{$v->userId}}" checked /><span>{{$v->name}}</span></label></li> <li><label><input type="radio" name="sale_id" value="{{$v->userId}}" checked /><span>{{$v->name}}</span></label></li>
@else @else
...@@ -30,6 +27,23 @@ ...@@ -30,6 +27,23 @@
</tr> </tr>
@endif @endif
@if (!empty($joint_kefu))
<tr>
<td class="check-table-title">联营客服：</td>
<td>
<ul>
@foreach ($joint_kefu as $key => $vo)
@if ($vo->userId == $order_info['sale_id'])
<li><label><input type="radio" name="sale_id" value="{{$vo->userId}}" checked /><span>{{$vo->name}}</span></label></li>
@else
<li><label><input type="radio" name="sale_id" value="{{$vo->userId}}"/><span>{{$vo->name}}</span></label></li>
@endif
@endforeach
</ul>
</td>
</tr>
@endif
@if (!empty($sale_list)) @if (!empty($sale_list))
<tr> <tr>
<td class="check-table-title">交易员：</td> <td class="check-table-title">交易员：</td>
...@@ -47,12 +61,30 @@ ...@@ -47,12 +61,30 @@
</tr> </tr>
@endif @endif
@if (!empty($kefu)) @if (!empty($self_manager))
<tr>
<td class="check-table-title" width="10%">自营客服主管：</td>
<td>
<ul>
@foreach ($self_manager as $k => $v)
@if ($v->userId == $order_info['sale_id'])
<li><label><input type="radio" name="sale_id" value="{{$v->userId}}" checked /><span>{{$v->name}}</span></label></li>
@else
<li><label><input type="radio" name="sale_id" value="{{$v->userId}}"/><span>{{$v->name}}</span></label></li>
@endif
@endforeach
</ul>
</td>
</tr>
@endif
@if (!empty($self_kefu))
<tr> <tr>
<td class="check-table-title">客服：</td> <td class="check-table-title">自营客服：</td>
<td> <td>
<ul> <ul>
@foreach ($kefu as $key => $vo) @foreach ($self_kefu as $key => $vo)
@if ($vo->userId == $order_info['sale_id']) @if ($vo->userId == $order_info['sale_id'])
<li><label><input type="radio" name="sale_id" value="{{$vo->userId}}" checked /><span>{{$vo->name}}</span></label></li> <li><label><input type="radio" name="sale_id" value="{{$vo->userId}}" checked /><span>{{$vo->name}}</span></label></li>
@else @else
......
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