Merge branch 'ysx-专项组需求0711-20230711' into ysx-供应商需求0717-20230717

app/Http/Controllers/Filter/SupplierFilter.php

@@ -127,6 +127,18 @@ class SupplierFilter
             $endTime = strtotime($times[1]);
             $query->whereBetween('update_time', [$startTime, $endTime]);
         }
+        if (!empty($map['sku_create_time'])) {
+            $times = explode('~', $map['sku_create_time']);
+            $startTime = strtotime($times[0]);
+            $endTime = strtotime($times[1]);
+            $query->whereBetween('sku_create_time', [$startTime, $endTime]);
+        }
+        if (!empty($map['sku_update_time'])) {
+            $times = explode('~', $map['sku_update_time']);
+            $startTime = strtotime($times[0]);
+            $endTime = strtotime($times[1]);
+            $query->whereBetween('sku_update_time', [$startTime, $endTime]);
+        }
 
         if (!empty($map['blacklist_uid'])) {
             $query = $query->whereHas('blacklist', function ($q) use ($map) {

app/Http/Controllers/SupplierApplyController.php

@@ -39,7 +39,7 @@ class SupplierApplyController extends Controller
     }
 
 
-    //操作日志列表
+    //芯链申请列表
     public function SupplierApplyList($request)
     {
         $this->data['auditUidList'] = SupplierApplyModel::pluck('audit_name', 'audit_uid')->toArray();

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

@@ -92,11 +92,11 @@
                             </a>
                         </div>
                     @endif
-{{--                    <div class="layui-row">--}}
-{{--                        <a title="公司性质为现货商性质的供应商没有上传品质协议" class="main_filter"--}}
-{{--                           id="no_quality_assurance_agreement">--}}
-{{--                        </a>--}}
-{{--                    </div>--}}
+                    {{--                    <div class="layui-row">--}}
+                    {{--                        <a title="公司性质为现货商性质的供应商没有上传品质协议" class="main_filter"--}}
+                    {{--                           id="no_quality_assurance_agreement">--}}
+                    {{--                        </a>--}}
+                    {{--                    </div>--}}
                     <div class="layui-row">
                         <a title="采购员全离职" class="main_filter" id="all_channel_user_resigned">
                         </a>
@@ -265,7 +265,7 @@
             <div class="layui-row">
                 <div class="layui-inline" style="width: 600px">
                     @inject('transformableTimeIntervalPresenter','App\Presenters\Filter\TransformableTimeIntervalPresenter')
-                    {!! $transformableTimeIntervalPresenter->render(['update_time'=>'更新时间','create_time'=>'创建时间']) !!}
+                    {!! $transformableTimeIntervalPresenter->render(['update_time'=>'更新时间','create_time'=>'创建时间','sku_create_time' => '首次上传sku时间','sku_update_time'=> '最新上传sku时间']) !!}
                 </div>
 
             </div>