Merge branch 'ysx-CRM转化供应商流程-20260518' into Dev

app/Http/Services/CrmService.php

@@ -17,7 +17,7 @@ class CrmService
             return json_decode($cachedData, true);
             return json_decode($cachedData, true);
         }
         }
 
 
-        $url = env('CRM_URL') . '/open/signComs/getSignComs?use_scope=2';
+        $url = env('CRM_URL') . '/open/signComs/getSignComs';
         $client = new Client();
         $client = new Client();
         $response = $client->get($url);
         $response = $client->get($url);
         $result = json_decode($response->getBody()->getContents(), true);
         $result = json_decode($response->getBody()->getContents(), true);

app/Http/routes.php

@@ -104,5 +104,6 @@ Route::group(['middleware' => ['external'], 'namespace' => 'Sync'], function ()
 });
 });
 
 
 Route::match(['get', 'post'], '/test', function () {
 Route::match(['get', 'post'], '/test', function () {
-    DataService::exportUploadedSkuSupplier();
+    $result = CrmService::getSignCompanyList();
+    return response()->json($result);
 });
 });

storage/framework/views/587faa134dc1f8953abf61cb2995b8264ba36a12.php

@@ -296,18 +296,18 @@
                       <?php $statusPresenter = app('App\Presenters\StatusPresenter'); ?>
                       <?php $statusPresenter = app('App\Presenters\StatusPresenter'); ?>
                     <?php echo $statusPresenter->render('supplier_source', '供应商来源', 0, config('fixed.SupplierSource')); ?>
                     <?php echo $statusPresenter->render('supplier_source', '供应商来源', 0, config('fixed.SupplierSource')); ?>
 
 
+            </div>
+            <div class="layui-inline">
+                <label class="layui-form-label">代理品牌</label>
+                <div class="layui-input-inline">
+                    <div id="agency_brands_filter" style="width: 425px"></div>
+                    <input type="hidden" name="agency_brands" id="agency_brands_filter_value" value="">
                 </div>
                 </div>
-                <div class="layui-inline">
-                    <label class="layui-form-label">代理品牌</label>
-                    <div class="layui-input-inline">
-                        <div id="agency_brands_filter" style="width: 425px"></div>
-                        <input type="hidden" name="agency_brands" id="agency_brands_filter_value" value="">
-                    </div>
-                </div>
-                <div class="layui-row">
-                    <div class="layui-inline" style="width: 600px">
-                        <?php $transformableTimeIntervalPresenter = app('App\Presenters\Filter\TransformableTimeIntervalPresenter'); ?>
-                        <?php echo $transformableTimeIntervalPresenter->render(['update_time'=>'更新时间','create_time'=>'创建时间','sku_create_time' => '首次上传sku时间']); ?>
+            </div>
+            <div class="layui-row">
+                <div class="layui-inline" style="width: 600px">
+                    <?php $transformableTimeIntervalPresenter = app('App\Presenters\Filter\TransformableTimeIntervalPresenter'); ?>
+                    <?php echo $transformableTimeIntervalPresenter->render(['update_time'=>'更新时间','create_time'=>'创建时间','sku_create_time' => '首次上传sku时间']); ?>
 
 
                 </div>
                 </div>