Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 9ee1a62c by 朱继来
Options

自营添加推送

parent fd70a646
Inline Side-by-side
Showing with 71 additions and 26 deletions
app/Http/Controllers/OrderController.php
...@@ -405,8 +405,8 @@ Class OrderController extends Controller ...@@ -405,8 +405,8 @@ Class OrderController extends Controller
$map['is_new_order'] = $request->input('is_new_order', ''); $map['is_new_order'] = $request->input('is_new_order', '');
$map['business_type'] = $request->input('business_type', ''); $map['business_type'] = $request->input('business_type', '');
// 订单查看权限---交易员、客服、测试 // 订单查看权限---交易员、客服、自营客服
if (in_array($info['role'], [3, 4])) { if (in_array($info['role'], [3, 4, 7])) {
// 筛选自己的订单 // 筛选自己的订单
$map['sale_id'] = $request->user->userId; $map['sale_id'] = $request->user->userId;
} }
...@@ -450,14 +450,17 @@ Class OrderController extends Controller ...@@ -450,14 +450,17 @@ Class OrderController extends Controller
// 获取所有的业务员 （包括经理、交易员、客服、测试） // 获取所有的业务员 （包括经理、交易员、客服、测试）
$perm = new PermController; $perm = new PermController;
if ($tid == 1 || $tid == 3) { if ($tid == 1) {
$manager = $perm->getRoleUsers($request, '经理'); $manager = $perm->getRoleUsers($request, '经理');
$test = $perm->getRoleUsers($request, '测试'); $test = $perm->getRoleUsers($request, '测试');
$sales = $perm->getRoleUsers($request, '交易员'); $sales = $perm->getRoleUsers($request, '交易员');
$kefu = $perm->getRoleUsers($request, '客服'); $kefu = $perm->getRoleUsers($request, '客服');
$sale_list = array_merge($manager, $sales, $test, $kefu); $sale_list = array_merge($manager, $sales, $test, $kefu);
} else { } else if ($tid == 2) {
$sale_list = $perm->getRoleUsers($request, '客服'); $manager = $perm->getRoleUsers($request, '自营客服主管');
$test = $perm->getRoleUsers($request, '测试');
$kefu = $perm->getRoleUsers($request, '自营客服');
$sale_list = array_merge($manager, $test, $kefu);
} }
//获取订单列表 //获取订单列表
...@@ -824,15 +827,21 @@ Class OrderController extends Controller ...@@ -824,15 +827,21 @@ Class OrderController extends Controller
$info = $this->orderDetail($request, $id); $info = $this->orderDetail($request, $id);
$this->pageHeader($request, $info, '推送业务员', ["title" => '推送业务员', "href" => '#']); $this->pageHeader($request, $info, '推送业务员', ["title" => '推送业务员', "href" => '#']);
// 获取所有的业务员
$sale_list = $this->getSales('销售');
$perm = new PermController; $perm = new PermController;
$tags = $request->input('tags', '');
if ($tags && $tags == 'self') {
$manager = $perm->getRoleUsers($request, '自营客服主管');
$test = $perm->getRoleUsers($request, '测试');
$sale_list = '';
$kefu = $perm->getRoleUsers($request, '自营客服');
} else {
$manager = $perm->getRoleUsers($request, '经理'); $manager = $perm->getRoleUsers($request, '经理');
$test = $perm->getRoleUsers($request, '测试'); $test = $perm->getRoleUsers($request, '测试');
$sale_list = $perm->getRoleUsers($request, '交易员'); $sale_list = $perm->getRoleUsers($request, '交易员');
$kefu = $perm->getRoleUsers($request, '客服'); $kefu = $perm->getRoleUsers($request, '客服');
}
$info['manager'] = $this->filterLeave($manager); $info['manager'] = $this->filterLeave($manager);
$info['test'] = $this->filterLeave($test); $info['test'] = $this->filterLeave($test);
......
app/Http/Controllers/PermController.php
...@@ -88,6 +88,8 @@ ...@@ -88,6 +88,8 @@
return 8; return 8;
} else if ($department->name == '财务') { } else if ($department->name == '财务') {
return 9; return 9;
} else if ($department->name == '自营客服主管') {
return 10;
} else { } else {
return 0; return 0;
} }
......
resources/views/detail/content.blade.php
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
@if(in_array($order_info['status'], [1, 2, 3, 4]) && $order_invoice_info['invoice_status'] < 2 && in_array('update_invoice', $userPerms)) @if(in_array($order_info['status'], [1, 2, 3, 4]) && $order_invoice_info['invoice_status'] < 2 && in_array('update_invoice', $userPerms))
<a href="/changeInvoice/{{$order_info['order_id']}}" class="btn btn-success btn-sm changeBtn">更改发票</a> <a href="/changeInvoice/{{$order_info['order_id']}}" class="btn btn-success btn-sm changeBtn">更改发票</a>
@endif @endif
@elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'self' && !$extend) @elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'self' && isset($extend) && !$extend)
<?php <?php
if ($order_info['status'] > 3) { // 已付款请求财务接口判断是否能修改发票 if ($order_info['status'] > 3) { // 已付款请求财务接口判断是否能修改发票
$isChangeInvoice = App\Http\Controllers\isChangeInvoice($order_info['order_sn']); $isChangeInvoice = App\Http\Controllers\isChangeInvoice($order_info['order_sn']);
......
resources/views/detail/sendSales.blade.php
...@@ -9,10 +9,14 @@ ...@@ -9,10 +9,14 @@
<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))
<tr> <tr>
<td class="check-table-title" width="20%">经理：</td> @if ($order_info['order_goods_type'] == 1)
<td class="check-table-title" width="10%">经理：</td>
@else
<td class="check-table-title" width="10%">客服主管：</td>
@endif
<td> <td>
@if (!empty($manager))
<ul> <ul>
@foreach ($manager as $k => $v) @foreach ($manager as $k => $v)
@if ($v->userId == $order_info['sale_id']) @if ($v->userId == $order_info['sale_id'])
...@@ -22,14 +26,14 @@ ...@@ -22,14 +26,14 @@
@endif @endif
@endforeach @endforeach
</ul> </ul>
@endif
</td> </td>
</tr> </tr>
@endif
@if (!empty($sale_list))
<tr> <tr>
<td class="check-table-title" width="20%">交易员：</td> <td class="check-table-title">交易员：</td>
<td> <td>
@if (!empty($sale_list))
<ul> <ul>
@foreach ($sale_list as $key => $vo) @foreach ($sale_list as $key => $vo)
@if ($vo->userId == $order_info['sale_id']) @if ($vo->userId == $order_info['sale_id'])
...@@ -39,14 +43,14 @@ ...@@ -39,14 +43,14 @@
@endif @endif
@endforeach @endforeach
</ul> </ul>
@endif
</td> </td>
</tr> </tr>
@endif
@if (!empty($kefu))
<tr> <tr>
<td class="check-table-title" width="20%">客服：</td> <td class="check-table-title">客服：</td>
<td> <td>
@if (!empty($kefu))
<ul> <ul>
@foreach ($kefu as $key => $vo) @foreach ($kefu as $key => $vo)
@if ($vo->userId == $order_info['sale_id']) @if ($vo->userId == $order_info['sale_id'])
...@@ -56,14 +60,14 @@ ...@@ -56,14 +60,14 @@
@endif @endif
@endforeach @endforeach
</ul> </ul>
@endif
</td> </td>
</tr> </tr>
@endif
@if (!empty($test))
<tr> <tr>
<td class="check-table-title" width="20%">测试：</td> <td class="check-table-title">测试：</td>
<td> <td>
@if (!empty($test))
<ul> <ul>
@foreach ($test as $key => $vo) @foreach ($test as $key => $vo)
@if ($vo->userId == $order_info['sale_id']) @if ($vo->userId == $order_info['sale_id'])
...@@ -73,14 +77,14 @@ ...@@ -73,14 +77,14 @@
@endif @endif
@endforeach @endforeach
</ul> </ul>
@endif
</td> </td>
</tr> </tr>
@endif
<!-- 查看权限：当前推送人或管理员、经理、测试、运营助理 --> <!-- 查看权限：当前推送人 或 管理员、经理、测试、运营助理 或 自营客服主管 -->
@if ($sale_id == $order_info['sale_id'] || in_array($role, [1, 2, 5, 8])) @if ($sale_id == $order_info['sale_id'] || (in_array($role, [1, 2, 5, 8]) || in_array($role, [1, 10]) ))
<tr> <tr>
<td class="check-table-title" width="20%">备注信息：</td> <td class="check-table-title">备注信息：</td>
<td> <td>
<textarea name="send_remark" id="send_remark" class="form-control">{{$order_temp_info['send_remark']}}</textarea> <textarea name="send_remark" id="send_remark" class="form-control">{{$order_temp_info['send_remark']}}</textarea>
</td> </td>
......
resources/views/selfOrder/content.blade.php
...@@ -59,7 +59,29 @@ ...@@ -59,7 +59,29 @@
</select> </select>
</dd> </dd>
</dl> </dl>
<dl>
<dt>客服：</dt>
<dd>
<select id="order_send" name="order_send" class="form-control order_send selectpicker" title="全部" data-live-search="true" data-size="7">
<option value="">全部</option>
<option value="0">无推送</option>
<optgroup label="在职">
@foreach ($sale_list as $v)
@if ($v->status != 4)
<option value="{{$v->userId}}">{{$v->name}}</option>
@endif
@endforeach
</optgroup>
<optgroup label="离职">
@foreach ($sale_list as $v)
@if ($v->status == 4)
<option value="{{$v->userId}}">{{$v->name}}</option>
@endif
@endforeach
</optgroup>
</select>
</dd>
</dl>
<dl> <dl>
<dt>支付方式：</dt> <dt>支付方式：</dt>
<dd> <dd>
...@@ -187,6 +209,7 @@ ...@@ -187,6 +209,7 @@
<th class="pl30">订单状态</th> <th class="pl30">订单状态</th>
<th class="pl30">销售类型</th> <th class="pl30">销售类型</th>
<th class="pl30">支付方式</th> <th class="pl30">支付方式</th>
<th class="pl30">客服</th>
<th class="pl30">订单来源</th> <th class="pl30">订单来源</th>
<th class="pl30">发货状态</th> <th class="pl30">发货状态</th>
<th class="pl30">下单时间</th> <th class="pl30">下单时间</th>
...@@ -230,6 +253,8 @@ ...@@ -230,6 +253,8 @@
<td class="show-list"><?php print_r(App\Http\Controllers\getPayName($v['order_id'])); ?></td> <td class="show-list"><?php print_r(App\Http\Controllers\getPayName($v['order_id'])); ?></td>
<td class="show-list"><?php print_r(App\Http\Controllers\getSalesName($v['sale_id'])); ?></td>
<td class="show-list"><?php echo App\Http\Controllers\getOrderSource($v['order_id'], $v['order_type']); ?></td> <td class="show-list"><?php echo App\Http\Controllers\getOrderSource($v['order_id'], $v['order_type']); ?></td>
<td class="show-list" class="show-list"> <td class="show-list" class="show-list">
...@@ -267,6 +292,11 @@ ...@@ -267,6 +292,11 @@
<a class="btn btn-success" href="/change/{{$v['order_id']}}?tags=self" target="_blank">人工审单</a> <a class="btn btn-success" href="/change/{{$v['order_id']}}?tags=self" target="_blank">人工审单</a>
@endif @endif
<!-- 管理员和自营客服主管或有推送权限显示 -->
@if ((in_array($role, [1, 10]) || in_array('self_send_salesman', $userPerms)))
<a class="btn btn-info" href="/sendSales/{{ $v['order_id'] }}?tags=self" target="_blank">推送</a>
@endif
@if ($v['status'] > 1 && in_array('self_order_download_contract', $userPerms)) @if ($v['status'] > 1 && in_array('self_order_download_contract', $userPerms))
<a class="btn btn-default download-contract" data-id="{{$v['order_id']}}" href="javascript:;">下载合同</a> <a class="btn btn-default download-contract" data-id="{{$v['order_id']}}" href="javascript:;">下载合同</a>
@endif @endif
...@@ -280,7 +310,7 @@ ...@@ -280,7 +310,7 @@
<!-- 点击展示内容 --> <!-- 点击展示内容 -->
<tr class="show-other-content"> <tr class="show-other-content">
<td colspan="10"> <td colspan="11">
<table class="table table-hover table-bordered"> <table class="table table-hover table-bordered">
<tr> <tr>
<td class="table-list-title">公司名称</td> <td class="table-list-title">公司名称</td>
......
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