下单添加发货方式

app/Http/Controllers/AddOrderController.php

@@ -559,9 +559,10 @@ Class AddOrderController extends Controller
                 $data['address_name']   = $request->input('address_name');
                 $data['address_name']   = $request->input('address_name');
                 $data['address_mobile'] = $request->input('address_mobile');
                 $data['address_mobile'] = $request->input('address_mobile');
             } else { // 联营、自营线上订单
             } else { // 联营、自营线上订单
-                $data['role']           = $request->input('role', '');
-                $data['tax_id']         = $request->input('tax_id');
-                $data['user_coupon_id'] = $request->input('user_coupon_id');
+                $data['role']             = $request->input('role', '');
+                $data['tax_id']           = $request->input('tax_id');
+                $data['user_coupon_id']   = $request->input('user_coupon_id');
+                $data['zy_delivery_type'] = $request->input('zy_delivery_type');
 
 
                 if ($data['type'] == 1) { // 联营
                 if ($data['type'] == 1) { // 联营
                     $data['customer_cn']             = $request->input('customer_cn', '');
                     $data['customer_cn']             = $request->input('customer_cn', '');

public/js/add_order.js

@@ -730,14 +730,20 @@
                             datax.address_name = $('input[name=address_name]').val();
                             datax.address_name = $('input[name=address_name]').val();
                             datax.address_mobile = $('input[name=address_mobile]').val();
                             datax.address_mobile = $('input[name=address_mobile]').val();
                         } else { // 联营、自营线上订单
                         } else { // 联营、自营线上订单
-                            var tax_id = $('.tax_id').val();
-                            var inv_type = $('input[name=inv_type]:checked').val();
-                            var user_coupon_id = $('.user_coupon_id').val();
+                            var tax_id           = $('.tax_id').val();
+                            var inv_type         = $('input[name=inv_type]:checked').val();
+                            var user_coupon_id   = $('.user_coupon_id').val();
+                            var zy_delivery_type = $('.zy_delivery_type').val();
 
 
                             if (!address_id) {
                             if (!address_id) {
                                 layer.msg('请选择快递信息');
                                 layer.msg('请选择快递信息');
                                 return false;
                                 return false;
                             }
                             }
+
+                            if (!zy_delivery_type) {
+                                layer.msg('请选择发货方式');
+                                return false;
+                            }
                             
                             
                             if (type == 4) { // 自营其他业务
                             if (type == 4) { // 自营其他业务
                                 var business_type = $('#business_type').val();
                                 var business_type = $('#business_type').val();
@@ -799,12 +805,11 @@
                                 datax.customer_website        = customer_website;     
                                 datax.customer_website        = customer_website;     
                             }
                             }
 
 
-                            datax.tax_id = tax_id;
-                            datax.user_coupon_id = user_coupon_id; 
+                            datax.tax_id           = tax_id;
+                            datax.user_coupon_id   = user_coupon_id; 
+                            datax.zy_delivery_type = zy_delivery_type; 
                         }
                         }
 
 
-                        // self.attr('disabled', true).css('pointer-events', 'none'); // 成功生成订单后禁用按钮，防止重复提交
-
                         // 自营线上
                         // 自营线上
                         if (type == 2 && is_online == 1) {
                         if (type == 2 && is_online == 1) {
                             var sale_type = $('#sale_type').val();           
                             var sale_type = $('#sale_type').val();           

resources/views/addOrder/content.blade.php

@@ -97,6 +97,23 @@
                 </div>     
                 </div>     
             </div>
             </div>
 
 
+            <div class="shipping-info">
+                <h4>发货方式 <span class="title-tips"><i class="fa fa-info-circle"></i>现货发货创建的自营通知单，账户为原客户账户，公司和原客户地址； 拼单发货创建的自营通知单，账户为15011111111，猎芯公司以及星火仓的地址</span></h4>
+
+                <div class="row">
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            <span><i class="text-danger">*</i> 选择发货方式：</span>
+                            <select name="zy_delivery_type" class="zy_delivery_type">
+                                <option value="">请选择</option>
+                                <option value="1">现货发货</option>
+                                <option value="2">拼单发货</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>   
+            </div>
+
             <div class="invoice-info">
             <div class="invoice-info">
                 <h4>发票信息 <span class="title-tips"><i class="fa fa-info-circle"></i>可在订单中心完善发票信息，需要在订单审核通过前填写发票信息，否则无法同步至ERP</span></h4>
                 <h4>发票信息 <span class="title-tips"><i class="fa fa-info-circle"></i>可在订单中心完善发票信息，需要在订单审核通过前填写发票信息，否则无法同步至ERP</span></h4>
 
 

resources/views/detail/detail_base_info.blade.php

@@ -27,6 +27,7 @@
         <th>支付方式</th>
         <th>支付方式</th>
         <th>支付状态</th>
         <th>支付状态</th>
         <th>支付类型</th>
         <th>支付类型</th>
+        <th>发货方式</th>
         <th>发货状态</th>
         <th>发货状态</th>
         <th>物流单号</th>
         <th>物流单号</th>
         <th>京东订单编号</th>
         <th>京东订单编号</th>
@@ -100,6 +101,7 @@
                 } 
                 } 
             ?>
             ?>
         </td>
         </td>
+        <td>{{ $order_temp_info['zy_delivery_type'] == 1 ? '现货发货' : '拼单发货' }}</td>
         <td>
         <td>
             <?php 
             <?php 
                 if ($order_shipping_info) {
                 if ($order_shipping_info) {