Merge branch 'zjl_inquiry_20210519' into development

public/js/add_inquiry_order.js

@@ -869,7 +869,7 @@ layui.config({
             ,cols: [[ //表头
                 {title: '序号', type: 'numbers', fixed: 'left', width: 50}
                 ,{field: 'goods_id', title: 'SKUID'}
-                ,{field: 'goods_name', title: '商品名称'}
+                ,{field: 'goods_name', title: '商品名称', minWidth: 100}
                 ,{field: 'brand_name', title: '制造商'}
                 ,{field: 'supplier_name', title: '供应商'}
                 ,{field: 'goods_number', title: '采购数量', edit: 'text', style: 'cursor: pointer;'}
@@ -891,6 +891,7 @@ layui.config({
 
                 $('.carts-info').show(); // 显示商品table
                 $(".layui-table-body, .layui-table-box").css('overflow', 'visible'); // 下拉显示
+                $('.buyer_id').parent('.layui-table-cell').css('overflow', 'visible');
 
                 cart_ids = [];
 
@@ -913,7 +914,7 @@ layui.config({
 
     //下拉框监听事件
     form.on('select(buyer_id)', function(data) {
-        var cart_id = $('#buyer_id').data('cid');
+        var cart_id = $('.buyer_id').data('cid');
         var value = data.value;
 
         var datax = {

resources/views/addInquiryOrder/goodsInfo.blade.php

@@ -96,7 +96,7 @@
 
 <style>
     .carts-info{ display: none; }
-    .carts-info .layui-table-cell{ overflow: visible; } 
+    /*.carts-info .layui-table-cell{ overflow: visible; } */
 </style>
 <!-- 商品列表 -->
 <div class="carts-info">
@@ -117,7 +117,7 @@
     }
 </style>
 <script type="text/html" id="t_buyer_id">
-    <select name="buyer_id" id="buyer_id" lay-filter="buyer_id" data-cid="@{{ d.cart_id }}">
+    <select name="buyer_id" class="buyer_id" lay-filter="buyer_id" data-cid="@{{ d.cart_id }}">
         @{{ d.buyerSelect }}   
     </select>
 </script>