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
d2159f22
authored
Jul 13, 2020
by
朱继来
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
自营添加推送WMS
parent
ffb13fcc
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
46 additions
and
1 deletions
app/Http/Controllers/ApiController.php
config/website.php
resources/views/selfOrder/content.blade.php
app/Http/Controllers/ApiController.php
View file @
d2159f22
...
@@ -377,5 +377,15 @@ class ApiController extends Controller
...
@@ -377,5 +377,15 @@ class ApiController extends Controller
$this
->
Export
(
0
,
'更新标准品牌成功'
);
$this
->
Export
(
0
,
'更新标准品牌成功'
);
}
}
public
function
pushWms
(
$request
)
{
$order_sn
=
$request
->
input
(
'order_sn'
,
''
);
$url
=
Config
(
'website.pur_url'
)
.
'/server/wms2?order_sn='
.
$order_sn
;
$res
=
curlApi
(
$url
);
$this
->
Export
(
0
,
'成功'
);
}
}
}
config/website.php
View file @
d2159f22
...
@@ -100,4 +100,6 @@ return [
...
@@ -100,4 +100,6 @@ return [
'export_joint_source_id'
=>
16
,
'export_joint_source_id'
=>
16
,
'export_self_source_id'
=>
17
,
'export_self_source_id'
=>
17
,
'pur_url'
=>
'http://pur.ichunt.net'
,
];
];
resources/views/selfOrder/content.blade.php
View file @
d2159f22
...
@@ -382,13 +382,19 @@
...
@@ -382,13 +382,19 @@
<!-- 管理员和自营客服主管或有推送权限显示 -->
<!-- 管理员和自营客服主管或有推送权限显示 -->
@if ((in_array($role, [1, 10]) || in_array('self_send_salesman', $userPerms)))
@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>
<a
class=
"btn btn-info"
href=
"/sendSales/{{ $v['order_id'] }}?tags=self"
target=
"_blank"
>
推送
客服
</a>
@endif
@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
@if ($v['status'] >= 4
&&
$v['status']
<
=
7
)
<
a
class=
"btn btn-warning push-wms"
data-sn=
"{{$v['order_sn']}}"
href=
"javascript:;"
>
推送WMS
</a>
<!-- <a class="btn btn-warning" href="{{ Config('website.pur_url') }}/server/wms2?order_sn={{$v['order_sn']}}" target="_blank">推送WMS</a> -->
@endif
@if ($v['status'] == -1
&&
!$v['cancel_reason'])
@if ($v['status'] == -1
&&
!$v['cancel_reason'])
<a
class=
"btn btn-danger input-cancel-reason"
href=
"javascript:;"
data-oid=
"{{$v['order_id']}}"
data-type=
"4"
>
填写取消原因
</a>
<a
class=
"btn btn-danger input-cancel-reason"
href=
"javascript:;"
data-oid=
"{{$v['order_id']}}"
data-type=
"4"
>
填写取消原因
</a>
@endif
@endif
...
@@ -481,4 +487,30 @@
...
@@ -481,4 +487,30 @@
$
.
lie
.
order
.
index
();
$
.
lie
.
order
.
index
();
$
.
lie
.
track
.
orderTrack
();
$
.
lie
.
track
.
orderTrack
();
$
.
lie
.
cancel
.
cancelorder
();
$
.
lie
.
cancel
.
cancelorder
();
// 推送到WMS
$
(
'.push-wms'
).
click
(
function
()
{
var
order_sn
=
$
(
this
).
data
(
'sn'
);
layer
.
open
({
title
:
'推送WMS'
,
content
:
'确定推送到WMS吗?'
,
btn
:
[
'确定'
,
'取消'
],
btn1
:
function
(
index
)
{
$
.
ajax
({
url
:
'/api/pushWms'
,
data
:
{
order_sn
:
order_sn
},
dataType
:
"json"
,
success
:
function
(
resp
)
{
layer
.
close
(
index
);
layer
.
msg
(
'成功'
);
}
});
},
btn2
:
function
(
index
)
{
layer
.
close
(
index
)
}
})
})
</script>
</script>
\ No newline at end of file
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