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
be75af31
authored
Apr 26, 2020
by
朱继来
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
temp
parent
cb137960
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
4 deletions
app/Http/Controllers/OrderController.php
config/params.php
resources/views/addOrder/content.blade.php
resources/views/detail/content.blade.php
app/Http/Controllers/OrderController.php
View file @
be75af31
...
...
@@ -1585,6 +1585,7 @@ Class OrderController extends Controller
'erpPayLog'
=>
$erpPayLog
,
'order_refund_info'
=>
$temp
[
'data'
][
'order_refund_info'
],
'order_refund_items'
=>
$temp
[
'data'
][
'order_refund_items'
],
'order_extra'
=>
$temp
[
'data'
][
'order_extra'
],
];
$response
=
array_merge
(
$response
,
$info
);
...
...
config/params.php
View file @
be75af31
...
...
@@ -97,5 +97,13 @@
'end_time'
=>
'2019-10-31 23:59:59'
,
],
// 终端客户信息--类型
'end_user_type'
=>
[
1
=>
'终端'
,
2
=>
'贸易商'
,
3
=>
'大学'
,
4
=>
'个人'
,
],
];
\ No newline at end of file
resources/views/addOrder/content.blade.php
View file @
be75af31
...
...
@@ -244,10 +244,11 @@
<span><i
class=
"text-danger"
>
*
</i>
客户类型:
</span>
<select
class=
"layui-select customer_type"
name=
"customer_type"
>
<option
value=
""
>
请选择
</option>
<option
value=
"1"
>
终端
</option>
<option
value=
"2"
>
贸易商
</option>
<option
value=
"3"
>
大学
</option>
<option
value=
"4"
>
个人
</option>
@if (Config('params.end_user_type'))
@foreach (Config('params.end_user_type') as $k => $v)
<option
value=
"{{ $k }}"
>
{{ $v }}
</option>
@endforeach
@endif
</select>
</div>
</div>
...
...
resources/views/detail/content.blade.php
View file @
be75af31
...
...
@@ -451,6 +451,29 @@
@endif
</table>
@endif
<!-- 终端客户信息 -->
@if ($order_extra)
<table
class=
"table table-bordered table-hover"
>
<tr
class=
"caption"
>
<th
colspan=
"4"
style=
"text-align: center; background: #f9f9f9;"
>
终端客户信息
</th>
</tr>
<tr>
<th>
客户名称(中文)
</th>
<th>
客户名称(英文)
</th>
<th>
客户类型
</th>
<th>
产品用途
</th>
</tr>
<tr>
<td>
{{ $order_extra['customer_cn'] }}
</td>
<td>
{{ $order_extra['customer_en'] }}
</td>
<td>
{{ Config('params.end_user_type')[$order_extra['customer_type']] }}
</td>
<td>
{{ $order_extra['product_use'] }}
</td>
</tr>
</table>
@endif
</div>
<div
class=
"tabs-box goods-price table-responsive list-item-table"
>
...
...
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