Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 25060136 by 朱继来
Options

添加快递信息

parent 9b9e843d
Inline Side-by-side
Showing with 85 additions and 65 deletions
app/Http/Controllers/OrderController.php
...@@ -1409,6 +1409,7 @@ Class OrderController extends Controller ...@@ -1409,6 +1409,7 @@ Class OrderController extends Controller
'order_pay_log' => $temp['data']['order_pay_log'], 'order_pay_log' => $temp['data']['order_pay_log'],
'order_price_info' => $temp['data']['order_price_info'], 'order_price_info' => $temp['data']['order_price_info'],
'order_temp_info' => $temp['data']['order_temp_info'], 'order_temp_info' => $temp['data']['order_temp_info'],
'order_shipping_inside' => $temp['data']['order_shipping_inside'],
'actionLog' => $actionLog, 'actionLog' => $actionLog,
]; ];
......
resources/views/detail/content.blade.php
...@@ -500,89 +500,108 @@ ...@@ -500,89 +500,108 @@
<!-- 人工审单时去掉操作按钮 --> <!-- 人工审单时去掉操作按钮 -->
@if (!isset($_REQUEST['tags']) && $action_name != 'changeOrder' && $action_name != 'sendSales') @if (!isset($_REQUEST['tags']) && $action_name != 'changeOrder' && $action_name != 'sendSales')
<p style="padding-left: 5px;">操作</p> <p style="padding-left: 5px;">操作</p>
<div class="tabs-box"> <div class="tabs-box">
<!-- 判断操作权限 --> <!-- 判断操作权限 -->
@if (($role == 1 || $role ==2) && $order_info['status'] == 1 && in_array('check_order', $userPerms)) @if (($role == 1 || $role ==2) && $order_info['status'] == 1 && in_array('check_order', $userPerms))
<a class="btn btn-success" href="{{URL('change', ['order_id'=>$order_info['order_id']])}}" class="btn btn-default">人工审单</a> <a class="btn btn-success" href="{{URL('change', ['order_id'=>$order_info['order_id']])}}" class="btn btn-default">人工审单</a>
@endif @endif
@if ($order_info['status'] == 2 && in_array('cancel_order', $userPerms)) @if ($order_info['status'] == 2 && in_array('cancel_order', $userPerms))
<a href="{{URL('cancelPay', ['order_id'=>$order_info['order_id']])}}" class="btn btn-default">取消订单</a> <a href="{{URL('cancelPay', ['order_id'=>$order_info['order_id']])}}" class="btn btn-default">取消订单</a>
@endif @endif
<!-- 预付款 管理员完成首款对账后改变'对账'按钮 --> <!-- 预付款 管理员完成首款对账后改变'对账'按钮 -->
@if ($order_info['status'] >= 2 && in_array('check_account', $userPerms)) @if ($order_info['status'] >= 2 && in_array('check_account', $userPerms))
@if ($order_info['status'] == 3 && (!empty($order_pay_log) && $order_pay_log[0]['pay_type'] != '')) @if ($order_info['status'] == 3 && (!empty($order_pay_log) && $order_pay_log[0]['pay_type'] != ''))
<a href="javascript:;" data-id="{{$order_info['order_id']}}" class="btn btn-default last-check">对账</a> <a href="javascript:;" data-id="{{$order_info['order_id']}}" class="btn btn-default last-check">对账</a>
@else @else
<a href="{{URL('checkPay', ['order_id'=>$order_info['order_id']])}}" class="btn btn-default">对账</a> <a href="{{URL('checkPay', ['order_id'=>$order_info['order_id']])}}" class="btn btn-default">对账</a>
@endif
@endif @endif
@endif
@if (in_array($order_info['status'], array(4, 7, 8, 10)) && in_array('order_send', $userPerms)) @if (in_array($order_info['status'], array(4, 7, 8, 10)) && in_array('order_send', $userPerms))
<!-- <a href="{{URL('send', ['order_id'=>$order_info['order_id']])}}" class="btn btn-default">订单发货</a> --> <!-- <a href="{{URL('send', ['order_id'=>$order_info['order_id']])}}" class="btn btn-default">订单发货</a> -->
@endif @endif
@if ($order_info['status'] == 10 && in_array('send_invoice', $userPerms)) @if ($order_info['status'] == 10 && in_array('send_invoice', $userPerms))
<a href="{{URL('invShipping', ['order_id'=>$order_info['order_id']])}}" class="btn btn-default">寄送发票</a> <a href="{{URL('invShipping', ['order_id'=>$order_info['order_id']])}}" class="btn btn-default">寄送发票</a>
@endif @endif
</div> </div>
@elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'self') @elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'self')
<p style="padding-left: 5px;">操作</p> <p style="padding-left: 5px;">操作</p>
<div class="tabs-box"> <div class="tabs-box">
<!-- 判断状态和权限 --> <!-- 判断状态和权限 -->
@if ($order_info['status'] == 2 && in_array('self_order_cancel', $userPerms)) @if ($order_info['status'] == 2 && in_array('self_order_cancel', $userPerms))
<a class="btn btn-default self_cancel" href="javascript:;" data-id="{{$order_info['order_id']}}" class="btn btn-default">取消订单</a> <a class="btn btn-default self_cancel" href="javascript:;" data-id="{{$order_info['order_id']}}" class="btn btn-default">取消订单</a>
@endif @endif
@if ($order_info['status'] == 4 && in_array('self_order_express', $userPerms)) @if ($order_info['status'] == 4 && in_array('self_order_express', $userPerms))
<a class="btn btn-default self_express" href="javascript:;" data-id="{{$order_info['order_id']}}" class="btn btn-default">填写快递单</a> <a class="btn btn-default self_express" href="javascript:;" data-id="{{$order_info['order_id']}}" class="btn btn-default">填写快递单</a>
@endif @endif
@if (in_array($order_info['status'], [4, 8]) && in_array('self_order_invoice_express', $userPerms)) @if (in_array($order_info['status'], [4, 8]) && in_array('self_order_invoice_express', $userPerms))
<a class="btn btn-default self_invoice_express" data-id="{{$order_info['order_id']}}" href="javascript:;" class="btn btn-default">填写发票快递</a> <a class="btn btn-default self_invoice_express" data-id="{{$order_info['order_id']}}" href="javascript:;" class="btn btn-default">填写发票快递</a>
@endif @endif
</div>
</div>
<!-- 快递公司 -->
@if ($shippings) @if ($shippings)
<script> <script>
var shippings = '{!! json_encode($shippings) !!}'; var shippings = '{!! json_encode($shippings) !!}';
var shippings_info = eval('('+shippings+')'); var shippings_info = eval('('+shippings+')');
</script> </script>
@endif @endif
@endif @endif
<!-- 二期处理 --> @if (!empty($order_shipping_inside))
<p>操作记录</p> <p>物流信息</p>
<div class="tabs-box"> <div class="tabs-box">
<table class="table table-bordered table-hover log"> <table class="table table-bordered table-hover">
<thead> <thead>
<tr> <tr>
<th>操作时间</th> <th>物流时间</th>
<th>操作人</th> <th>物流信息</th>
<th>操作事件</th> </tr>
</tr> </thead>
</thead>
<tbody> <tbody>
@if (!empty($actionLog)) @foreach ($order_shipping_inside as $v)
<tr>
<td>{{date('Y-m-d H:i:s', $v['create_time'])}}</td>
<td>{{$v['info']}}</td>
</tr>
@endforeach
</tbody>
</table>
</div>
@endif
@if (!empty($actionLog))
<p>操作记录</p>
<div class="tabs-box">
<table class="table table-bordered table-hover">
<thead>
<tr>
<th>操作时间</th>
<th>操作人</th>
<th>操作事件</th>
</tr>
</thead>
<tbody>
@foreach ($actionLog as $v) @foreach ($actionLog as $v)
<tr> <tr>
<td>{{date('Y-m-d H:i:s', $v->create_time)}}</td> <td>{{date('Y-m-d H:i:s', $v->create_time)}}</td>
<td>{{App\Http\Controllers\getOperatorName($v->operator_id, $v->operator_type)}}</td> <td>{{App\Http\Controllers\getOperatorName($v->operator_id, $v->operator_type)}}</td>
<td>{{$v->event}}</td> <td>{{$v->event}}</td>
</tr> </tr>
@endforeach @endforeach
@else </tbody>
<tr><td colspan="3">无操作记录</td></tr> </table>
@endif </div>
</tbody> @endif
</table>
</div>
</div> </div>
<script> <script>
......
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