审单添加发货方式

app/Http/Controllers/OrderController.php

@@ -888,6 +888,7 @@ Class OrderController extends Controller
                 "product_use_classone_sn" => $request->input('product_use_classone_sn', ''), // 终端客户信息 一级分类
                 "product_use_classtwo_sn" => $request->input('product_use_classtwo_sn', ''), // 终端客户信息 二级分类
                 "customer_website"        => $request->input('customer_website', ''), // 终端客户信息 客户网址
+                "zy_delivery_type"        => $request->input('zy_delivery_type', ''), // 发货方式
             ];
 
             $is_temp_save = $request->input('is_temp_save', ''); 
@@ -947,7 +948,7 @@ Class OrderController extends Controller
                 }
 
                 $url = Config('website.api_domain').'order/changeOrder';
-            }
+            }           
 // dd(curlApi($url, $resData, "POST"));
             $temp = json_decode(curlApi($url, $resData, "POST"), true);
 

public/js/change_order.js

@@ -376,6 +376,7 @@
                     var order_goods_type = $('input[name=order_goods_type]').val();
                     var order_id         = $('input[name=order_id]').val();
                     var business_type    = $('input[name=business_type]').val();
+                    var delivery_type    = $('.zy_delivery_type').val();
 
                     // 若存在digikey商品，终端客户信息必填 2020-4-26
                     // if (is_dgk_exists) {
@@ -512,9 +513,15 @@
                                 return false;
                             }
                         }
-                    }       
+                    }  
 
-                     // 非管理员或经理权限、非联营订单、非样片单 需要判断商品价格是否低于80%以下
+                    // 发货方式
+                    if (delivery_type == '') {
+                        layer.msg('请选择发货方式');
+                        return false;
+                    }     
+
+                    // 非管理员或经理权限、非联营订单、非样片单 需要判断商品价格是否低于80%以下
                     if (!is_manager && order_goods_type != 1 && business_type != 1) { 
                         // 设置默认值false
                         $('input[name=check_failed]').val(0);
@@ -679,6 +686,7 @@
                             $('.order_pay_type').val(temp_save_info.order_pay_type); // 调整付款类型
                             $('#kefu_remark').val(temp_save_info.kefu_remark); // 客服备注                          
                             $('.advance').val(temp_save_info.deposit_amount); // 调整定金 
+                            $('.zy_delivery_type').val(temp_save_info.zy_delivery_type); // 发货方式 
 
                             // 调整付款时间
                             if (temp_save_info.payTime == 'other') {

resources/views/changeOrder/content.blade.php

@@ -12,6 +12,7 @@
             /* 提交审核弹框label */
             .submit-check label { display: inline-block; width: 120px; text-align: right;}
             input[type="text"] {width: 120px;}
+            .order-change-main table th { text-align: center; vertical-align: middle; }
         </style>
 
         <div class="tabs-box">
@@ -331,7 +332,7 @@
                      <table class="table table-bordered table-hover check-table">
                         @if ($order_info['order_goods_type'] == 1)
                         <tr>
-                            <td class="check-table-title" width="20%">付款类型：</td>
+                            <th class="check-table-title" width="20%">付款类型</th>
                             <td class="check-select">
                                 <label><input class="order_all_pay" type="radio" name="order_pay_type" value="1">全额付款</label>                        
                                 <!-- 销售类型为现卖时展示 -->
@@ -344,7 +345,7 @@
                         </tr>
                         @else 
                         <tr>
-                            <td class="check-table-title" width="20%">付款类型：</td>
+                            <th class="check-table-title" width="20%">付款类型</th>
                             <td class="check-select">
                                 <label><input class="order_all_pay" type="radio" name="order_pay_type" value="1">全额付款</label>    
                                 <label><input class="order_account_period" type="radio" name="order_pay_type" value="3">账期</label>
@@ -399,7 +400,7 @@
 
                     <div class="show-advance-pay">
                         <hr/>
-                        <p>定金调整</p>
+                        <!-- <p>定金调整</p> -->
                         <table class="table table-bordered table-hover">
                             <tr>
                                 <th width="20%">定金金额</th>
@@ -421,7 +422,7 @@
                     </div>
 
                     <div class="show-pay-time">
-                        <p>付款时间</p>
+                        <!-- <p>付款时间</p> -->
                         <table class="table table-bordered table-hover change-table">
                             <tr>
                                 <th width="20%">选择付款时间</th>
@@ -444,6 +445,16 @@
                                     </div>
                                 </td>
                             </tr>
+                            <tr>
+                                <th>发货方式</th>
+                                <td>
+                                    <select name="zy_delivery_type" class="zy_delivery_type">
+                                        <option value="">请选择</option>
+                                        <option value="1">现货优先发货</option>
+                                        <option value="2">拼单发货</option>
+                                    </select>
+                                </td>
+                            </tr>
                         </table>
                     </div>
                     
@@ -581,6 +592,9 @@
         $('.checked_right').hide();
     } 
 
+    var zy_delivery_type = "{{ $order_temp_info['zy_delivery_type'] }}"; // 发货方式
+    $('.zy_delivery_type').val(zy_delivery_type);
+    
     // 倒计时
     function countDown(times){
         var timer=null;

resources/views/changeOrder/tempSave.blade.php

@@ -129,6 +129,11 @@
                 </tr>
 
                 <tr>
+                    <th>发货方式：</th>
+                    <td>{{$order_temp_info['temp_save_info']['zy_delivery_type'] == 1 ? '现货优先发货' : '拼单发货'}}</td>
+                </tr>
+
+                <tr>
                     <th>客服备注：</th>
                     <td>{{ $order_temp_info['temp_save_info']['kefu_remark'] }}</td>
                 </tr>