有效期限制展示

resources/views/script/SupplierListScript.blade.php

@@ -3,7 +3,7 @@
         let $ = layui.jquery;
         let $ = layui.jquery;
         let Split = layui.Split;
         let Split = layui.Split;
         // 水平分割，需要分割的元素(id)、默认大小(百分比)、最小值(单位px)
         // 水平分割，需要分割的元素(id)、默认大小(百分比)、最小值(单位px)
-        Split(['#s1', '#s6', '#s7','#s8'], {sizes: [9, 12, 12,12], minSize: 70});
+        Split(['#s1', '#s6', '#s7', '#s8'], {sizes: [9, 12, 12, 12], minSize: 70});
         // Split(['#s1', '#s2', '#s3', '#s4', '#s5', '#s6', '#s7','#s8'], {sizes: [9, 12, 12, 12, 12, 12, 12,19], minSize: 70});
         // Split(['#s1', '#s2', '#s3', '#s4', '#s5', '#s6', '#s7','#s8'], {sizes: [9, 12, 12, 12, 12, 12, 12,19], minSize: 70});
         let table = layui.table;
         let table = layui.table;
         let form = layui.form;
         let form = layui.form;
@@ -178,9 +178,13 @@
                 }
                 }
             },
             },
             {field: 'average_sku_num', title: '日均上架数', align: 'center', width: 100},
             {field: 'average_sku_num', title: '日均上架数', align: 'center', width: 100},
-            {field: 'cp_time_day', title: '有效期最高天数', align: 'center', width: 120, templet: function (data) {
-                    return data.cp_time_day == -1 ?'无限制': data.cp_time_day + '天';
-                }},
+            {
+                field: 'cp_time_day', title: '有效期最高天数', align: 'center', width: 180, templet: function (data) {
+                    let cpTime = data.cp_time_day == -1 ? '无限制' : data.cp_time_day + '天';
+                    let futuresCpTime = data.futures_cp_time_day == -1 ? '无限制' : data.futures_cp_time_day + '天';
+                    return '现货 : ' + cpTime + ' | 期货 : ' + futuresCpTime;
+                }
+            },
             {field: 'create_name', title: '创建人', align: 'center', width: 70},
             {field: 'create_name', title: '创建人', align: 'center', width: 70},
             {field: 'update_time', title: '最近修改时间', align: 'center', width: 145},
             {field: 'update_time', title: '最近修改时间', align: 'center', width: 145},
             {field: 'supplier_type_name', title: '供应商类别', align: 'center', width: 110},
             {field: 'supplier_type_name', title: '供应商类别', align: 'center', width: 110},
@@ -763,4 +767,4 @@
     function clearTypeFilter() {
     function clearTypeFilter() {
         $('.main_filter').attr('class', 'main_filter');
         $('.main_filter').attr('class', 'main_filter');
     }
     }
-</script>
+</script>
\ No newline at end of file