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
0482f799
authored
Dec 25, 2019
by
朱继来
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
订单明细添加费用、折扣
parent
70918906
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
12 deletions
resources/views/detail/content.blade.php
resources/views/detail/content.blade.php
View file @
0482f799
...
...
@@ -469,6 +469,9 @@
@endif
<th>
小计
</th>
<th>
费用
</th>
<th>
折扣
</th>
<th>
合计
</th>
<th>
货期
</th>
@if ($order_info['order_goods_type'] == 1)
...
...
@@ -480,7 +483,6 @@
@if ($order_info['order_goods_type'] == 1)
<th>
生产跟踪
</th>
@endif
@if (empty($_REQUEST['tags']))
<th>
备注
</th>
...
...
@@ -512,14 +514,17 @@
</td>
@if (in_array($order_info['order_type'], [2, 3]))
<td>
{{ $
currency . number_format($v['goods_price'] * $v['goods_number'], 2, '.', '')
}}
</td>
<td>
{{ $
v['goods_amount_format']
}}
</td>
@elseif ($username != 'vpadmin@ichunt.com')
<td>
{{$v['single_pre_price_format']}}
</td>
<td>
{{$v['
single_pre_price_amoun
t']}}
</td>
<td>
{{$v['
goods_amount_forma
t']}}
</td>
@else
<td>
{{ $
currency . number_format($v['goods_price'] * $v['goods_number'], 2, '.', '')
}}
</td>
<td>
{{ $
v['goods_amount_format']
}}
</td>
@endif
<td>
{{$v['extra_price']}}
</td>
<td>
{{$v['goods_discount_amount']}}
</td>
<td>
{{ number_format($v['goods_amount'] + $v['extra_price'] - $v['goods_discount_amount'], 2, '.', '') }}
</td>
<td>
{{$v['delivery_time']}}
</td>
@if ($order_info['order_goods_type'] == 1)
...
...
@@ -534,10 +539,7 @@
@else
自采
@endif
</td>
</td>
@if ($order_info['order_goods_type'] == 1)
<td><a
class=
"order-track"
data-rid=
"{{$v['rec_id']}}"
>
{{ App\Http\Controllers\getLastTrack($v['rec_id']) }}
</a></td>
...
...
@@ -559,10 +561,6 @@
@if ($action_name == 'changeOrder'
&&
count($order_items_info) > 1
&&
in_array($order_info['status'], [1, 2]))
<td><a
class=
"btn btn-danger deletegoods"
href=
"javascript:;"
data-id=
"{{$v['rec_id']}}"
>
删除
</a></td>
@endif
</tr>
@endforeach
@endif
...
...
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