Merge branch 'zjl_inquiry_order_20210311' into development

app/Http/Controllers/AddOrderController.php

@@ -597,6 +597,7 @@ Class AddOrderController extends Controller
     {
     {
         if ($request->isMethod('post')) {        
         if ($request->isMethod('post')) {        
             $data['type']          = $request->input('type');
             $data['type']          = $request->input('type');
+            $data['inv_com_id']    = $request->input('inv_com_id', 0);
             $data['uid']           = $request->input('uid');
             $data['uid']           = $request->input('uid');
             $data['sale_id']       = $request->user->userId;
             $data['sale_id']       = $request->user->userId;
             $data['address_id']    = $request->input('address_id');
             $data['address_id']    = $request->input('address_id');

public/js/add_inquiry_order.js

@@ -627,7 +627,8 @@ layui.config({
         var self             = $(this);
         var self             = $(this);
         var type             = self.data('type'); // 1-联营线上，2-自营线上，3-自营线下，4-自营其他业务
         var type             = self.data('type'); // 1-联营线上，2-自营线上，3-自营线下，4-自营其他业务
         var inv_type         = $('input[name=inv_type]:checked').val(); // 开票方式
         var inv_type         = $('input[name=inv_type]:checked').val(); // 开票方式
-        var inv_com_name     = $('.inv_com_name').val();
+        var inv_com_id       = $('.inv_com_id').val() || 0;
+        var inv_com_name     = $('.inv_com_name').val() || '';
         var user_id          = $('.user_id').val() || 0;
         var user_id          = $('.user_id').val() || 0;
         var tax_id           = $('.tax_id').val() || 0;
         var tax_id           = $('.tax_id').val() || 0;
         var zy_delivery_type = $('.zy_delivery_type').val() || 0;
         var zy_delivery_type = $('.zy_delivery_type').val() || 0;
@@ -742,6 +743,7 @@ layui.config({
 
 
         var datax = {
         var datax = {
             type: type,
             type: type,
+            inv_com_id: inv_com_id,
             uid: user_id,
             uid: user_id,
             tax_id: tax_id,
             tax_id: tax_id,
             zy_delivery_type: zy_delivery_type,
             zy_delivery_type: zy_delivery_type,