Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 42860d30 by 朱继来
Options

Merge branch 'zjl_erp_syn_20190514' into development

parents 4f18777e b9cf3fdc
Inline Side-by-side
Showing with 66 additions and 85 deletions
resources/views/detail/content.blade.php
...@@ -164,34 +164,43 @@ ...@@ -164,34 +164,43 @@
</tr> </tr>
</table> </table>
<div class="col-lg-12 col-md-12 col-xs-12">
<!-- 收货信息 -->
<div class="col-lg-4 col-md-4 col-xs-4">
<table class="table table-bordered"> <table class="table table-bordered">
<caption style="text-align: center; background: #f9f9f9;">收货信息 <tr class="caption">
<th colspan="7" style="text-align: center; background: #f9f9f9;">
收货信息
@if (!$isPage) @if (!$isPage)
<!-- 订单状态小于5 且 更新地址权限存在 显示按钮 --> <!-- 订单状态小于5 且 更新地址权限存在 显示按钮 -->
@if (!isset($_REQUEST['tags'])) @if (!isset($_REQUEST['tags']))
@if (in_array($order_info['status'], array(1, 2, 3, 4)) && in_array('update_address', $userPerms)) @if (in_array($order_info['status'], array(1, 2, 3, 4)) && in_array('update_address', $userPerms))
<a href="/changeShipping/{{$order_info['order_id']}}" class="btn btn-success btn-sm changeBtn">编辑</a> <a href="/changeShipping/{{$order_info['order_id']}}" class="btn btn-success btn-sm changeBtn">更改收货地址</a>
@endif @endif
@elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'self') @elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'self')
@if (in_array($order_info['status'], array(1, 2, 4)) && in_array('self_order_update_address', $userPerms)) @if (in_array($order_info['status'], array(1, 2, 4)) && in_array('self_order_update_address', $userPerms))
<a href="/changeShipping/{{$order_info['order_id']}}?tags={{$_REQUEST['tags']}}" class="btn btn-success btn-sm changeBtn">编辑</a> <a href="/changeShipping/{{$order_info['order_id']}}?tags={{$_REQUEST['tags']}}" class="btn btn-success btn-sm changeBtn">更改收货地址</a>
@endif @endif
@elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'erp') @elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'erp')
<a href="/changeShipping/{{$order_info['order_id']}}?tags={{$_REQUEST['tags']}}" class="btn btn-success btn-sm changeBtn">编辑</a> <a href="/changeShipping/{{$order_info['order_id']}}?tags={{$_REQUEST['tags']}}" class="btn btn-success btn-sm changeBtn">更改收货地址</a>
@endif @endif
@endif @endif
</caption> </th>
<tr>
<th width="25%">订单编号</th>
<td>{{$order_info['order_sn']}}</td>
</tr> </tr>
<tr> <tr>
<th>订单编号</th>
<th>会员账号</th> <th>会员账号</th>
<th>收货人</th>
<th>联系电话/手机</th>
<th>配送方式</th>
@if ($order_info['order_shipping_type'] == 2)
<th>自提地址</th>
@else
<th>收货地址</th>
@endif
</tr>
<tr>
<td>
{{$order_info['order_sn']}}
</td>
<td> <td>
@if ($user_mobile) @if ($user_mobile)
{{$user_mobile}} {{$user_mobile}}
...@@ -199,53 +208,33 @@ ...@@ -199,53 +208,33 @@
{{isset($order_info['user_info']['email']) ? $order_info['user_info']['email'] : ''}} {{isset($order_info['user_info']['email']) ? $order_info['user_info']['email'] : ''}}
@endif @endif
</td> </td>
</tr>
<tr>
<th>收货人</th>
<td>{{$order_address_info['consignee']}}</td> <td>{{$order_address_info['consignee']}}</td>
</tr>
<tr>
<th>联系电话</th>
<td>{{$order_address_info['mobile']}}</td> <td>{{$order_address_info['mobile']}}</td>
</tr>
<tr>
<th>配送方式</th>
<td>
@if ($order_info['order_shipping_type'] == 2) @if ($order_info['order_shipping_type'] == 2)
客户自提 <td>客户自提</td>
<td>{{$order_address_info['address']}}</td>
@else @else
快递送货 <td>快递送货</td>
@endif
</td>
</tr>
<tr>
<th>配送地址</th>
<td> <td>
@if ($order_info['order_shipping_type'] == 2)
{{$order_address_info['address']}}
@else
{{$order_address_info['province_val']}}&nbsp;&nbsp;{{$order_address_info['city_val']}}&nbsp;&nbsp;{{$order_address_info['district_val']}}&nbsp;&nbsp;{{$order_address_info['address']}} {{$order_address_info['province_val']}}&nbsp;&nbsp;{{$order_address_info['city_val']}}&nbsp;&nbsp;{{$order_address_info['district_val']}}&nbsp;&nbsp;{{$order_address_info['address']}}
@endif
</td> </td>
@endif
</tr> </tr>
</table> </table>
</div>
<!-- 发票信息 -->
@if (!empty($order_invoice_info)) @if (!empty($order_invoice_info))
<div class="col-lg-4 col-md-4 col-xs-4"> <table class="table table-bordered order-express">
<table class="table table-bordered"> <tr class="caption">
<caption style="text-align: center; background: #f9f9f9;"> <th colspan="3" style="text-align: center; background: #f9f9f9;">
发票信息 发票信息
@if (!$isPage) @if (!$isPage)
<!-- 发票状态小于2（已发货）且更改权限存在 显示按钮 --> <!-- 发票状态小于2（已发货）且更改权限存在 显示按钮 -->
@if (!isset($_REQUEST['tags'])) @if (!isset($_REQUEST['tags']))
@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' && !$extend)
<?php <?php
...@@ -253,20 +242,35 @@ ...@@ -253,20 +242,35 @@
$isChangeInvoice = App\Http\Controllers\isChangeInvoice($order_info['order_sn']); $isChangeInvoice = App\Http\Controllers\isChangeInvoice($order_info['order_sn']);
if ($isChangeInvoice) { if ($isChangeInvoice) {
echo '<a href="/changeInvoice/'.$order_info['order_id'].'?tags='.$_REQUEST['tags'].'" class="btn btn-success btn-sm changeBtn">编辑</a>'; echo '<a href="/changeInvoice/'.$order_info['order_id'].'?tags='.$_REQUEST['tags'].'" class="btn btn-success btn-sm changeBtn">更改发票</a>';
} }
} else { } else {
if ($order_invoice_info['invoice_status'] < 2 && in_array('self_order_update_invoice', $userPerms)) { if ($order_invoice_info['invoice_status'] < 2 && in_array('self_order_update_invoice', $userPerms)) {
echo '<a href="/changeInvoice/'.$order_info['order_id'].'?tags='.$_REQUEST['tags'].'" class="btn btn-success btn-sm changeBtn">编辑</a>'; echo '<a href="/changeInvoice/'.$order_info['order_id'].'?tags='.$_REQUEST['tags'].'" class="btn btn-success btn-sm changeBtn">更改发票</a>';
} }
} }
?> ?>
<!-- in_array($order_info['status'], [1, 2, 3, 4]) && $order_invoice_info['invoice_status'] < 2 && in_array('self_order_update_invoice', $userPerms) --> <!-- in_array($order_info['status'], [1, 2, 3, 4]) && $order_invoice_info['invoice_status'] < 2 && in_array('self_order_update_invoice', $userPerms) -->
@elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'erp') @elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'erp')
<a href="/changeInvoice/{{$order_info['order_id']}}?tags={{$_REQUEST['tags']}}" class="btn btn-success btn-sm changeBtn">编辑</a> <a href="/changeInvoice/{{$order_info['order_id']}}?tags={{$_REQUEST['tags']}}" class="btn btn-success btn-sm changeBtn">更改发票</a>
@endif @endif
@endif @endif
</caption> </th>
</tr>
<tr>
<td colspan="3">
<table class="table inv">
<tr>
<th>发票类型</th>
<th>发票抬头</th>
<th>公司注册地址</th>
<th>公司电话</th>
<th>税务登记号</th>
<th>开户银行</th>
<th>银行卡号</th>
<th>开票状态</th>
</tr>
@if ($order_invoice_info['inv_type'] == 1) @if ($order_invoice_info['inv_type'] == 1)
<tr style="text-align: center;"> <tr style="text-align: center;">
...@@ -274,7 +278,6 @@ ...@@ -274,7 +278,6 @@
</tr> </tr>
@else @else
<tr> <tr>
<th width="25%">发票类型</th>
<td> <td>
<?php <?php
switch ($order_invoice_info['inv_type']) { switch ($order_invoice_info['inv_type']) {
...@@ -284,72 +287,50 @@ ...@@ -284,72 +287,50 @@
} }
?> ?>
</td> </td>
</tr>
<tr>
<th>发票抬头</th>
<td>{{$order_invoice_info['tax_title']}}</td> <td>{{$order_invoice_info['tax_title']}}</td>
</tr>
<tr>
<th>公司注册地址</th>
<td>{{$order_invoice_info['company_address']}}</td> <td>{{$order_invoice_info['company_address']}}</td>
</tr>
<tr>
<th>公司电话</th>
<td>{{$order_invoice_info['company_phone']}}</td> <td>{{$order_invoice_info['company_phone']}}</td>
</tr>
<tr>
<th>税务登记号</th>
<td>{{$order_invoice_info['tax_no']}}</td> <td>{{$order_invoice_info['tax_no']}}</td>
</tr>
<tr>
<th>开户银行</th>
<td>{{$order_invoice_info['bank_name']}}</td> <td>{{$order_invoice_info['bank_name']}}</td>
</tr>
<tr>
<th>银行卡号</th>
<td>{{$order_invoice_info['bank_account']}}</td> <td>{{$order_invoice_info['bank_account']}}</td>
</tr>
<tr>
<th>开票状态</th>
<td>{{$order_invoice_info['invoice_status_val']}}</td> <td>{{$order_invoice_info['invoice_status_val']}}</td>
</tr> </tr>
@endif @endif
</table> </table>
</div> </td>
</tr>
</table>
@endif @endif
<!-- 合同乙方信息 -->
<div class="col-lg-4 col-md-4 col-xs-4">
<table class="table table-bordered"> <table class="table table-bordered">
<caption style="text-align: center; background: #f9f9f9;"> <tr class="caption">
合同乙方信息 <th colspan="4" style="text-align: center; background: #f9f9f9;">合同乙方信息
<!-- 待审核可编辑 --> <!-- 待审核可编辑 -->
@if ($order_info['status'] == 1) @if ($order_info['status'] == 1)
<a href="javascript:;" class="btn btn-success btn-sm changeBtn contract_info_edit">编辑</a> <a href="javascript:;" class="btn btn-success btn-sm changeBtn contract_info_edit">编辑</a>
@endif @endif
</caption> </th>
<tr>
<th width="25%">公司名称</th>
<td>{{ $order_temp_info['contract_com_name'] }}</td>
</tr> </tr>
<tr> <tr>
<th>公司名称</th>
<th>公司地址</th> <th>公司地址</th>
<td>{{ $order_temp_info['contract_com_addr'] }}</td> <th>联系人</th>
<th>联系电话</th>
</tr> </tr>
@if ($order_temp_info['contract_com_name'])
<tr> <tr>
<th>联系人</th> <td>{{ $order_temp_info['contract_com_name'] }}</td>
<td>{{ $order_temp_info['contract_com_addr'] }}</td>
<td>{{ $order_temp_info['contract_link_name'] }}</td> <td>{{ $order_temp_info['contract_link_name'] }}</td>
<td>{{ $order_temp_info['contract_link_tel'] }}</td>
</tr> </tr>
@else
<tr> <tr>
<th>联系电话</th> <td colspan="4" style="text-align: center;">无乙方信息</td>
<td>{{ $order_temp_info['contract_link_tel'] }}</td>
</tr> </tr>
@endif
</table> </table>
</div>
</div>
<!-- 发票收货地址 --> <!-- 发票收货地址 -->
@if ($order_invoice_address_info) @if ($order_invoice_address_info)
......
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