Commit bc9b52d7 by 朱继来

Merge branch 'zjl_exception_20181221' into development

parents 719fc138 c84cbf2e
Showing with 18 additions and 5 deletions
......@@ -14,7 +14,11 @@
<th width="20%">供应商</th>
<th>型号</th>
<th>未发货数量</th>
<th>均摊后单价</th>
@if ($order_info['order_pay_type'] == 2 && $order_info['advance_amount'] == 0 && $order_price_info['ext_price'] > 0)
<th>采购单价</th>
@else
<th>均摊后单价</th>
@endif
<th>退货数量</th>
<th width="10%">小计</th>
</thead>
......@@ -34,10 +38,19 @@
<input type="hidden" name="refund_info[{{$v['rec_id']}}][unshipped_num]" class="unshipped_num" value="{{ $v['goods_number'] }}">
<span>{{$v['goods_number']}}</span>
</td>
<td>
<input type="hidden" name="refund_info[{{$v['rec_id']}}][single_pre_price]" class="single_pre_price" value="{{ $v['single_pre_price'] }}">
<span>{{$v['single_pre_price_format']}}</span>
</td>
@if ($order_info['order_pay_type'] == 2 && $order_info['advance_amount'] == 0 && $order_price_info['ext_price'] > 0)
<td>
<input type="hidden" name="refund_info[{{$v['rec_id']}}][goods_price]" class="single_pre_price" value="{{ $v['goods_price'] }}">
<input type="hidden" name="refund_info[{{$v['rec_id']}}][single_pre_price]" value="{{ $v['single_pre_price'] }}">
<span>{{$v['goods_price_format']}}</span>
</td>
@else
<td>
<input type="hidden" name="refund_info[{{$v['rec_id']}}][goods_price]" value="{{ $v['goods_price'] }}">
<input type="hidden" name="refund_info[{{$v['rec_id']}}][single_pre_price]" class="single_pre_price" value="{{ $v['single_pre_price'] }}">
<span>{{$v['single_pre_price_format']}}</span>
</td>
@endif
<td>
<input class="only_number int_num refund_num" name="refund_info[{{$v['rec_id']}}][refund_num]" value="">
</td>
......
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