Merge branch 'zjl_inquiry_order_20210311'

public/js/add_inquiry_order.js

@@ -853,6 +853,7 @@ layui.config({
             ,url: '/ajax/cartList' //数据接口
             ,method:'post'
             ,cellMinWidth: 80 //全局定义常规单元格的最小宽度
+            // ,size: 'sm'
             ,where: {
                 uid: $('.user_id').val(),
                 delivery_place: $('.delivery_place').val() ? $('.delivery_place').val() : 1,
@@ -860,16 +861,16 @@ layui.config({
             }
             // ,page: true //开启分页
             ,cols: [[ //表头
-                {title: '序号', type: 'numbers', fixed: 'left', width: 60}
-                ,{field: 'goods_id', title: 'SKUID', width: 180}
-                ,{field: 'goods_name', title: '商品名称', width: 200}
-                ,{field: 'brand_name', title: '制造商', width: 200}
+                {title: '序号', type: 'numbers', fixed: 'left', width: 50}
+                ,{field: 'goods_id', title: 'SKUID'}
+                ,{field: 'goods_name', title: '商品名称'}
+                ,{field: 'brand_name', title: '制造商'}
                 ,{field: 'supplier_name', title: '供应商'}
-                ,{field: 'goods_number', title: '采购数量', edit: 'text', style: 'cursor: pointer;', width: 120}
-                ,{field: 'goods_price', title: '采购单价', edit: 'text', style: 'cursor: pointer;', width: 120}
+                ,{field: 'goods_number', title: '采购数量', edit: 'text', style: 'cursor: pointer;'}
+                ,{field: 'goods_price', title: '采购单价', edit: 'text', style: 'cursor: pointer;'}
                 ,{field: 'goods_amount_format', title: '小计'}
                 ,{field: 'delivery_time', title: '货期', edit: 'text', style: 'cursor: pointer;'}
-                ,{field: 'buyer_id', title: '采购员', templet: '#t_buyer_id'}
+                ,{field: 'buyer_id', title: '采购员', templet: '#t_buyer_id', style: 'overflow: visible;'}
                 ,{field: 'batch', title: '批次', edit: 'text', style: 'cursor: pointer;'}
                 ,{title: '操作',  align:'center', fixed: 'right', toolbar: '#list_action', width: 80}
             ]]
@@ -883,7 +884,7 @@ layui.config({
                 }
 
                 $('.carts-info').show(); // 显示商品table
-                $(".layui-table-body, .layui-table-box, .layui-table-cell").css('overflow', 'visible'); // 下拉显示
+                $(".layui-table-body, .layui-table-box").css('overflow', 'visible'); // 下拉显示
 
                 cart_ids = [];
 

resources/views/addInquiryOrder/goodsInfo.blade.php

@@ -96,7 +96,7 @@
 
 <style>
     .carts-info{ display: none; }
-    .carts-info td{ overflow: hidden; }
+    .carts-info .laytable-cell-1-0-9{ overflow: visible; } /* 指定采购列 */
 </style>
 <!-- 商品列表 -->
 <div class="carts-info">