调整订单详情页

resources/views/detail/content.blade.php

@@ -416,7 +416,11 @@
 
 
                         <th>制造商</th>
                         <th>制造商</th>
                         
                         
-                        @if ($username != 'vpadmin@ichunt.com')
+                        <!-- ERP或京东订单 -->
+                        @if (in_array($order_info['order_type'], [2, 3])) 
+                            <th>采购数量</th>
+                            <th>采购单价</th>
+                        @elseif ($username != 'vpadmin@ichunt.com')
                             <th>采购数量</th>
                             <th>采购数量</th>
                             <th>采购单价</th>
                             <th>采购单价</th>
                             <th>均摊后单价</th>
                             <th>均摊后单价</th>
@@ -454,7 +458,9 @@
                                 <span id="{{$v['rec_id']}}">{{$v['goods_price_format']}}</span>
                                 <span id="{{$v['rec_id']}}">{{$v['goods_price_format']}}</span>
                             </td>
                             </td>
                             
                             
-                            @if ($username != 'vpadmin@ichunt.com')
+                            @if (in_array($order_info['order_type'], [2, 3]))
+                                <td>{{ $currency . number_format($v['goods_price'] * $v['goods_number'], 4, '.', '') }}</td>
+                            @elseif ($username != 'vpadmin@ichunt.com')
                                 <td>{{$v['single_pre_price_format']}}</td>
                                 <td>{{$v['single_pre_price_format']}}</td>
                                 <td>{{$v['single_pre_price_amount']}}</td>
                                 <td>{{$v['single_pre_price_amount']}}</td>
                             @else
                             @else
@@ -568,8 +574,8 @@
                     <tr>
                     <tr>
                         <td>订单总额：</td>
                         <td>订单总额：</td>
                         <td>
                         <td>
-                            <span style="color:red;font-size:20px">{{$currency}}
-                                <span class="amount">{{$order_info['order_amount']}}</span>
+                            <span style="color:red;font-size:20px">
+                                {{$currency}}<span class="amount">{{$order_info['order_amount']}}</span>
                             </span>
                             </span>
                         </td>
                         </td>
                     </tr>
                     </tr>
@@ -581,6 +587,14 @@
                                 <span id="other_money">{{$order_price_info['pay_preferential']}}</span>
                                 <span id="other_money">{{$order_price_info['pay_preferential']}}</span>
                             </td>
                             </td>
                         </tr>
                         </tr>
+                        <tr>
+                            <td>实际支付金额：</td>
+                            <td class="edit-parent-td">
+                                <span style="color:red;font-size:20px">
+                                    {{$currency}}<span class="amount">{{$order_info['order_amount'] + $order_price_info['pay_preferential']}}</span>
+                                </span>
+                            </td>
+                        </tr>
                     @endif
                     @endif
                 </table>
                 </table>
             </div>
             </div>