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
623eb564
authored
Dec 19, 2018
by
朱继来
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
添加财务跳转,调整财务对账金额对比
parent
58a9a6f0
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
app/Http/Controllers/OrderController.php
public/js/order.js
app/Http/Controllers/OrderController.php
View file @
623eb564
...
...
@@ -358,8 +358,8 @@ Class OrderController extends Controller
$info
=
$this
->
getOrderInfo
(
$request
,
1
);
$info
[
'title'
]
=
'平台订单'
;
// 若为京东自营、自营客服角色,则跳转到自营列表
if
(
in_array
(
$info
[
'role'
],
[
6
,
7
]))
{
// 若为京东自营、自营客服
、财务
角色,则跳转到自营列表
if
(
in_array
(
$info
[
'role'
],
[
6
,
7
,
9
]))
{
return
redirect
(
'self_order'
);
}
...
...
public/js/order.js
View file @
623eb564
...
...
@@ -1678,7 +1678,7 @@
content
+=
'<div>'
;
if
(
trans_amount
==
order_amount
)
{
if
(
parseFloat
(
trans_amount
)
==
parseFloat
(
order_amount
)
)
{
content
+=
'<p><i class="fa fa-check-circle" style="color:green;"></i> 应付金额和对账金额一致</p>'
;
}
else
{
content
+=
'<p><i class="fa fa-warning error"></i> 应付金额和对账金额不一致,请谨慎核对!</p>'
;
...
...
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