Merge branch 'ysx-过期时间需求-20260521' into Dev

app/Http/Transformers/SupplierTransformer.php

@@ -120,7 +120,6 @@ class SupplierTransformer
 
             //创建时间和最后上传时间互相补充
             $supplier['last_upload_sku_time'] = $supplier['last_upload_sku_time'] ?: $supplier['sku_create_time'];
-
             //获取最新修改人以及下级审核员
             $log = LogModel::getLastLog($supplier['supplier_id']);
             $supplier['last_update_name'] = $log ? $log['admin_name'] : '';

resources/views/script/SupplierListScript.blade.php

@@ -346,11 +346,17 @@
             {field: 'average_sku_num', title: '日均上架数', align: 'center', width: 100},
             {
                 field: 'is_sku_expire', title: '商品是否过期', align: 'center', width: 130, templet: function (data) {
-                    return data.is_sku_expire == 1 ? '<span style="color: red;">是</span>' : '否';
+                    if (Number(data.sku_expired_in_days) === 1000) {
+                        return '无SKU';
+                    }
+                    return data.sku_expired_in_days > 0 ? '<span style="color: red;">是</span>' : '否';
                 }
             },
             {
                 field: 'sku_expired_in_days', title: '商品过期天数', align: 'center', width: 130, templet: function (data) {
+                    if (Number(data.sku_expired_in_days) === 1000) {
+                        return '无SKU';
+                    }
                     if (data.sku_expired_in_days > 0) {
                         return '<span style="color: red;">' + data.sku_expired_in_days + '</span>';
                     }

resources/views/web/supplier/SupplierListFilter.blade.php

@@ -246,9 +246,13 @@
                 </div>
             </div>
             <div class="layui-inline">
-                @inject('statusPresenter', 'App\Presenters\StatusPresenter')
+                @inject('statusPresenter','App\Presenters\StatusPresenter')
                 {!! $statusPresenter->render('sign_com_id', '签约公司', 0, \App\Http\Services\CrmService::getSignCompanyListMap()) !!}
             </div>
+                  <div class="layui-inline">
+                    @inject('statusPresenter','App\Presenters\StatusPresenter')
+                    {!! $statusPresenter->render('supplier_source', '供应商来源', 0, config('fixed.SupplierSource')) !!}
+                </div>
             <div class="layui-inline">
                 @inject('multiSelectorPresenter','App\Presenters\MultiSelectorPresenter')
                 {!! $multiSelectorPresenter->render('region','区域','',$regionData) !!}

storage/framework/views/587faa134dc1f8953abf61cb2995b8264ba36a12.php

@@ -15,7 +15,7 @@
                             <a class="main_filter" title="待复审" id="need_review">
                                 待复审
                             </a>
-                        </div> */ ?>
+                        </div> --}}
                     </div>
                 </div>
                 <div class="split-item" id="s6" style="text-align: center">
@@ -277,6 +277,11 @@
                 <?php echo $statusPresenter->render('sign_com_id', '签约公司', 0, \App\Http\Services\CrmService::getSignCompanyListMap()); ?>
 
             </div>
+                  <div class="layui-inline">
+                    <?php $statusPresenter = app('App\Presenters\StatusPresenter'); ?>
+                    <?php echo $statusPresenter->render('supplier_source', '供应商来源', 0, config('fixed.SupplierSource')); ?>
+
+                </div>
             <div class="layui-inline">
                 <?php $multiSelectorPresenter = app('App\Presenters\MultiSelectorPresenter'); ?>
                 <?php echo $multiSelectorPresenter->render('region','区域','',$regionData); ?>

storage/framework/views/d4d13e9bcdea7366e4952031431aae4b22f055c1.php

@@ -346,11 +346,17 @@
             {field: 'average_sku_num', title: '日均上架数', align: 'center', width: 100},
             {
                 field: 'is_sku_expire', title: '商品是否过期', align: 'center', width: 130, templet: function (data) {
-                    return data.is_sku_expire == 1 ? '<span style="color: red;">是</span>' : '否';
+                    if (Number(data.sku_expired_in_days) === 1000) {
+                        return '无SKU';
+                    }
+                    return data.sku_expired_in_days > 0 ? '<span style="color: red;">是</span>' : '否';
                 }
             },
             {
                 field: 'sku_expired_in_days', title: '商品过期天数', align: 'center', width: 130, templet: function (data) {
+                    if (Number(data.sku_expired_in_days) === 1000) {
+                        return '无SKU';
+                    }
                     if (data.sku_expired_in_days > 0) {
                         return '<span style="color: red;">' + data.sku_expired_in_days + '</span>';
                     }