Commit 64dab078 by 朱继来

调整明细

parent eba8be3d
Showing with 15 additions and 15 deletions
...@@ -488,10 +488,10 @@ ...@@ -488,10 +488,10 @@
@if (empty($_REQUEST['tags'])) @if (empty($_REQUEST['tags']))
<th>备注</th> <th>备注</th>
@endif @endif
<th> @if ($order_info['order_goods_type'] == 1)
<th></th>
</th> @endif
<?php <?php
if ($action_name == 'changeOrder' && count($order_items_info) > 1 && in_array($order_info['status'], [1, 2])) { if ($action_name == 'changeOrder' && count($order_items_info) > 1 && in_array($order_info['status'], [1, 2])) {
...@@ -564,17 +564,17 @@ ...@@ -564,17 +564,17 @@
@if (empty($_REQUEST['tags'])) @if (empty($_REQUEST['tags']))
<td class="remarks"> <td class="remarks">
@if(!empty($v['remarks'])) @if(!empty($v['remarks']))
{{$v['remarks']}} {{$v['remarks']}}
@endif @endif
</td> </td>
@endif @endif
<td> @if ($order_info['order_goods_type'] == 1)
<!-- <button type="button" class="btn btn-success btn-xs remarks">编辑</button> --> <td>
<button type="button" class="btn btn-success btn-xs edit-item" data-id="{{$v['rec_id']}}" data-batch="{{$v['batch']}}" data-bid="{{$v['buyer_id']}}" data-remarks="{{$v['remarks']}}">编辑</button> <!-- <button type="button" class="btn btn-success btn-xs remarks">编辑</button> -->
</td> <button type="button" class="btn btn-success btn-xs edit-item" data-id="{{$v['rec_id']}}" data-batch="{{$v['batch']}}" data-bid="{{$v['buyer_id']}}" data-remarks="{{$v['remarks']}}">编辑</button>
</td>
@endif
@if ($action_name == 'changeOrder' && count($order_items_info) > 1 && in_array($order_info['status'], [1, 2])) @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> <td><a class="btn btn-danger deletegoods" href="javascript:;" data-id="{{$v['rec_id']}}">删除</a></td>
...@@ -587,21 +587,21 @@ ...@@ -587,21 +587,21 @@
@if ($order_info['order_remark']) @if ($order_info['order_remark'])
<tr> <tr>
<td>订单备注信息:</td> <td>订单备注信息:</td>
<td colspan="10">{{$order_info['order_remark']}}</td> <td colspan="16">{{$order_info['order_remark']}}</td>
</tr> </tr>
@endif @endif
@if ($order_temp_info['kefu_remark']) @if ($order_temp_info['kefu_remark'])
<tr> <tr>
<td>客服备注信息:</td> <td>客服备注信息:</td>
<td colspan="10">{{$order_temp_info['kefu_remark']}}</td> <td colspan="16">{{$order_temp_info['kefu_remark']}}</td>
</tr> </tr>
@endif @endif
@if ($order_info['order_goods_type'] == 2 && $order_temp_info['business_type'] == 1) @if ($order_info['order_goods_type'] == 2 && $order_temp_info['business_type'] == 1)
<tr> <tr>
<td>项目需求描述:</td> <td>项目需求描述:</td>
<td colspan="10">{{$order_temp_info['sample_demand_desc']}}</td> <td colspan="16">{{$order_temp_info['sample_demand_desc']}}</td>
</tr> </tr>
@endif @endif
</tfoot> </tfoot>
......
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