Merge branch 'ysx-供应商需求0607-20230607' into ysx-供应商需求-20230602

app/Http/Controllers/Api/ExternalApiController.php

@@ -8,6 +8,7 @@ use App\Http\Services\AdminUserService;
 use App\Http\Services\MessageService;
 use App\Http\Services\MessageService;
 use App\Http\Services\SupplierApplyService;
 use App\Http\Services\SupplierApplyService;
 use App\Http\Services\SupplierService;
 use App\Http\Services\SupplierService;
+use App\Model\BigData\DataManageModel;
 use App\Model\SupplierAccountModel;
 use App\Model\SupplierAccountModel;
 use App\Model\SupplierChannelModel;
 use App\Model\SupplierChannelModel;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;

resources/views/web/SkuList.blade.php

-@include('web.sku.SkuListCommon')
+@include('web.sku.SkuListFilter')
 <style>
 <style>
     .custom .layui-layer-content .table-status {
     .custom .layui-layer-content .table-status {
         position: relative;
         position: relative;
@@ -25,19 +25,19 @@
             <button type="button" class="layui-btn layui-btn-sm" id="add_supplier">新增</button>
             <button type="button" class="layui-btn layui-btn-sm" id="add_supplier">新增</button>
         @endif
         @endif
         @if(checkPerm('OperateSku'))
         @if(checkPerm('OperateSku'))
-                <button type="button" class="layui-btn layui-btn-sm" id="batch_putaway">上架</button>
-                <button type="button" class="layui-btn layui-btn-sm" id="batch_off_shelf">下架</button>
-                <button type="button" class="layui-btn layui-btn-sm" id="remote_batch_off_shelf">批量下架</button>
-                @if (checkPerm('BatchUpdateEncoded'))
-                    <button type="button" class="layui-btn layui-btn-sm" id="batch_update_encoded">批量修改内部编码</button>
-                @endif
-                <button type="button" class="layui-btn layui-btn-sm" id="set_prefer">设置精选</button>
-                <button type="button" class="layui-btn layui-btn-sm" id="cancel_set_prefer">取消精选</button>
-                <button type="button" class="layui-btn layui-btn-sm" id="sync_erp_rate">同步ERP汇率</button>
-                <button type="button" class="layui-btn layui-btn-sm" id="set_sku_tag">设置标签</button>
-                @if (checkPerm('SetSupplierSkuCpTimeLimit'))
+            <button type="button" class="layui-btn layui-btn-sm" id="batch_putaway">上架</button>
+            <button type="button" class="layui-btn layui-btn-sm" id="batch_off_shelf">下架</button>
+            <button type="button" class="layui-btn layui-btn-sm" id="remote_batch_off_shelf">批量下架</button>
+            @if (checkPerm('BatchUpdateEncoded'))
+                <button type="button" class="layui-btn layui-btn-sm" id="batch_update_encoded">批量修改内部编码</button>
+            @endif
+            <button type="button" class="layui-btn layui-btn-sm" id="set_prefer">设置精选</button>
+            <button type="button" class="layui-btn layui-btn-sm" id="cancel_set_prefer">取消精选</button>
+            <button type="button" class="layui-btn layui-btn-sm" id="sync_erp_rate">同步ERP汇率</button>
+            <button type="button" class="layui-btn layui-btn-sm" id="set_sku_tag">设置标签</button>
+            @if (checkPerm('SetSupplierSkuCpTimeLimit'))
                 <button type="button" class="layui-btn layui-btn-sm" id="set_sku_cp_time_ruler">上架有效期配置</button>
                 <button type="button" class="layui-btn layui-btn-sm" id="set_sku_cp_time_ruler">上架有效期配置</button>
-                @endif
+            @endif
         @endif
         @endif
     </div>
     </div>
 
 

resources/views/web/sku/SkuListCommon.blade.php → resources/views/web/sku/SkuListFilter.blade.php

@@ -130,6 +130,10 @@
                            class="layui-input">
                            class="layui-input">
                 </div>
                 </div>
             </div>
             </div>
+            <div class="layui-inline">
+                @inject('statusPresenter','App\Presenters\StatusPresenter')
+                {!! $statusPresenter->render('source/eq','接入方式',request()->get('source/eq'),config('field.SkuSource')) !!}
+            </div>
             <div class="layui-inline" style="width: 600px">
             <div class="layui-inline" style="width: 600px">
                 @inject('transformableTimeIntervalPresenter','App\Presenters\Filter\TransformableTimeIntervalPresenter')
                 @inject('transformableTimeIntervalPresenter','App\Presenters\Filter\TransformableTimeIntervalPresenter')
                 {!! $transformableTimeIntervalPresenter->render(['update_time'=>'更新时间','create_time'=>'上传时间']) !!}
                 {!! $transformableTimeIntervalPresenter->render(['update_time'=>'更新时间','create_time'=>'上传时间']) !!}