Commit 1377e346 by 朱继来

Merge branch 'master' into development

parents 7c7f99ec 1d16214e
...@@ -260,6 +260,14 @@ function isChangeInvoice($order_sn) ...@@ -260,6 +260,14 @@ function isChangeInvoice($order_sn)
} }
} }
// 自营线下订单
function getOrderExtend($order_id)
{
$extend = DB::connection('order')->table('lie_order_extend')->where(['order_id' => $order_id, 'order_type' => 3])->select('temp_id')->first();
return $extend ? true : false;
}
Class OrderController extends Controller Class OrderController extends Controller
{ {
// 首页 // 首页
......
...@@ -275,10 +275,11 @@ ...@@ -275,10 +275,11 @@
<td> <td>
<div class="btn-group btn-group-xs"> <div class="btn-group btn-group-xs">
<a class="btn btn-primary" href="/details/{{$v['order_id']}}?tags=self" target="_blank">详情</a> <a class="btn btn-primary" href="/details/{{$v['order_id']}}?tags=self" target="_blank">详情</a>
@if (in_array('self_check_order', $userPerms) && in_array($v['status'], [1, 2, 3])) <?php $extend = App\Http\Controllers\getOrderExtend($v['order_id']); ?>
<a class="btn btn-success" href="/change/{{$v['order_id']}}?tags=self" target="_blank">人工审单</a> @if (in_array('self_check_order', $userPerms) && in_array($v['status'], [1, 2]) && !$extend)
@endif <a class="btn btn-success" href="/change/{{$v['order_id']}}?tags=self" target="_blank">人工审单</a>
@endif
@if (in_array('self_order_download_contract', $userPerms)) @if (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>
......
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