Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
朱继来
/
后台订单管理
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
45cce3dc
authored
Dec 05, 2018
by
朱继来
Browse files
Options
_('Browse Files')
Download
Plain Diff
Merge branch 'master' of
http://119.23.72.7/zhujilai/Order
into zjl_batch_goods_20181129
parents
fcd4d2ca
1d16214e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
4 deletions
app/Http/Controllers/OrderController.php
resources/views/selfOrder/content.blade.php
app/Http/Controllers/OrderController.php
View file @
45cce3dc
...
@@ -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
{
{
// 首页
// 首页
...
...
resources/views/selfOrder/content.blade.php
View file @
45cce3dc
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment