Merge branch 'zjl_iteration_20181127' into development

resources/views/detail/changeOrder.blade.php

@@ -130,14 +130,16 @@
                             <!-- 销售类型为预售时展示 -->
                             <!-- 销售类型为预售时展示 -->
                             @if ($order_info['sale_type'] == 2)
                             @if ($order_info['sale_type'] == 2)
                                 <td>
                                 <td>
-                                    <input type="text" class="only_number" name="change_info[{{$v['rec_id']}}][delivery_time]" value="" placeholder="请填写天数">
+                                    <input type="text" class="only_number" name="change_info[{{$v['rec_id']}}][delivery_time]" value="{{$v['delivery_time']}}" placeholder="请填写天数">
                                 </td>
                                 </td>
                                 <td>
                                 <td>
+                                    <!-- 未锁库存 -->
+                                    @if (!$v['is_lock']) 
                                     <label>
                                     <label>
                                         <input type="checkbox" name="change_info[{{$v['rec_id']}}][is_lock]" value="{{$v['goods_id']}}">
                                         <input type="checkbox" name="change_info[{{$v['rec_id']}}][is_lock]" value="{{$v['goods_id']}}">
                                         <span>锁定库存，可用库存：<b class="text-danger">{{ App\Http\Controllers\getSelfStock($v['goods_id']) }}</b></span>
                                         <span>锁定库存，可用库存：<b class="text-danger">{{ App\Http\Controllers\getSelfStock($v['goods_id']) }}</b></span>
                                     </label>
                                     </label>
-                                    
+                                    @endif
                                 </td>
                                 </td>
                             @endif
                             @endif
                         </tr>
                         </tr>

resources/views/detail/content.blade.php

@@ -27,7 +27,12 @@
                 ?>
                 ?>
 
 
                 <tr>
                 <tr>
+                    @if ($order_info['order_goods_type'] == 2)
+                        <th>订单类型</th>
+                    @endif
+
                     @if ($order_info['order_pay_type'] == 2)
                     @if ($order_info['order_pay_type'] == 2)
+                        <th>订单类型</th>
                         <th>预付款</th>
                         <th>预付款</th>
                         <th>尾款</th>
                         <th>尾款</th>
                     @endif
                     @endif
@@ -40,6 +45,10 @@
                 </tr>
                 </tr>
                 
                 
                 <tr>
                 <tr>
+                    @if ($order_info['order_goods_type'] == 2)
+                        <td>{{ $order_info['sale_type'] == 1 ? '现卖' : '预售' }}</td>
+                    @endif
+
                     @if ($order_info['order_pay_type'] == 2)                      
                     @if ($order_info['order_pay_type'] == 2)                      
                         <td>{{$currency.$order_info['advance_amount']}}</td>
                         <td>{{$currency.$order_info['advance_amount']}}</td>
 
 
@@ -512,7 +521,10 @@
                 </table>
                 </table>
             </div>
             </div>
             
             
+            <!-- 非内部采购下单显示付款地址 -->
+            @if (isset($order_temp_info) && $order_temp_info['order_type'] != 3)
                 <p>客户付款地址：{{ Config('website.pay_url').$order_info['order_id'] }}</p>
                 <p>客户付款地址：{{ Config('website.pay_url').$order_info['order_id'] }}</p>
+            @endif
         </div>
         </div>
         
         
         <?php $client_source = App\Http\Controllers\clientSource($order_info['user_id']); ?>
         <?php $client_source = App\Http\Controllers\clientSource($order_info['user_id']); ?>