Commit be75af31 by 朱继来

temp

parent cb137960
......@@ -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);
......
......@@ -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
......@@ -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>
......
......@@ -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">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment