Merge branch 'ysx-供应商详情优化-20250825' into Dev

app/Http/Controllers/Filter/SkuListFilter.php

@@ -52,6 +52,14 @@ class SkuListFilter
             unset($map['update_time']);
         }
 
+        if (!empty($map['create_time'])) {
+            $times = explode('~', $map['create_time']);
+            $startTime = strtotime($times[0]) ?: 1420041600;
+            $endTime = strtotime($times[1]) ?: time();
+            $map['create_time/range'] = $startTime . ',' . $endTime;
+            unset($map['create_time']);
+        }
+
 
         if (!empty($map['source_type'])) {
             switch ($map['source_type']) {

app/Http/Controllers/SupplierController.php

@@ -156,6 +156,7 @@ class SupplierController extends Controller
                 'value' => $key,
             ];
         }
+        $this->data['nation'] = NationModel::where('nation_id', $supplier['nation_id'])->first();
         $this->data['sku_optional_batch_for_xm_select'] = $skuOptionalBatchXmSelect;
 
         return $this->view('供应商详情');

app/Http/Services/SkuService.php

@@ -165,6 +165,7 @@ class SkuService extends BaseService
                 $item['source_name'] = array_get(config('field.SkuSource'), @$skuDBData['source'], '');
                 $item['org_name'] = array_get(config('field.SkuOrgList'), @$skuDBData['org_id'], '');
                 $item['ability_level_name'] = (!empty($item['ability_level']) ? $item['ability_level'] : 0) == 2 ? '强履约' : '弱履约';
+                $item['create_time'] = $skuDBData['create_time'] ? date('Y-m-d H:i:s', $skuDBData['create_time']) : '';
                 return $item;
             }, $list);
             $list = $this->transformInvalidSkuTag($list);

app/Http/Services/SupplierService.php

@@ -600,16 +600,16 @@ class SupplierService
             ]);
             $supplier = SupplierChannelModel::where('supplier_id', $supplierId)->first()->toArray();
             //还要丢队列给批量修改sku的内部编码
-            $redisKey = 'lie_supplier_change_yunxin_user_' . $supplierId;
-            if ($redis->get($redisKey)) {
+            // $redisKey = 'lie_supplier_change_yunxin_user_' . $supplierId;
+            if (true) {
                 $data = [
                     'canal' => $supplier['supplier_code'],
                     "encoded" => $yunxinChannelUid,
                 ];
                 //改成队列
                 (new SkuService())->batchUpdateEncodedQueue($data);
-                $redis->set($redisKey, 1);
-                $redis->expire($redisKey, 60 * 60 * 3);
+                // $redis->set($redisKey, 1);
+                // $redis->expire($redisKey, 60 * 60 * 3);
             }
             $preYunxinChannelUserName = (new AdminUserService())->getAdminUserNameByCodeId($preYunxinChannelUid);
             $content = "将线上采购员由 [${preYunxinChannelUserName}] 改为 [${yunxinChannelUserName}]";

resources/views/script/SkuListScript.blade.php

@@ -177,6 +177,7 @@
             },
             {field: 'org_name', title: '所属组织', align: 'center', width: 100},
             {field: 'audit_user', title: '审核人', align: 'center', width: 100},
+            {field: 'create_time', title: '创建时间', align: 'center', width: 150},
             {field: 'update_time', title: '最近修改时间', align: 'center', width: 150},
             {field: 'audit_time', title: '上传时间', align: 'center', width: 150},
             {field: 'cp_time', title: '上架有效期', align: 'center', width: 180},

resources/views/web/AddSupplier.blade.php

@@ -350,7 +350,7 @@
                 <div class="layui-col-md4">
                     <div class="layui-form-item" id="receipt_nation_id_div">
                         @inject('statusPresenter','App\Presenters\StatusPresenter')
-                        {!! $statusPresenter->render('receipt_nation_id','国家/地区 : ',0,
+                        {!! $statusPresenter->render('receipt_nation_id','国家/地区 : ',36,
                          $nationList,['required'=>true]) !!}
                     </div>
                 </div>

resources/views/web/BatchUpdateSkuStatus.blade.php

@@ -15,7 +15,7 @@
                        lay-text="是|否">
             </div>
         </div>
-        <div class="layui-form-item" style="margin-left: 260px;padding-bottom: 30px;margin-top:220px;">
+        <div class="layui-form-item" style="padding-bottom: 30px;margin-top:220px;">
             <div class="layui-input-block">
                 <button type="button" class="layui-btn layui-btn-sm" lay-submit lay-filter="batchUpdateSkuStatus">确定
                 </button>

resources/views/web/SupplierDetail.blade.php

@@ -161,10 +161,13 @@
                                 <div class="layui-col-md2">
                                     <span class="required_field">*</span> 所在区域 ：{{$supplier['region_name']}}
                                 </div>
-                                <div class="layui-col-md3">
-                                    @if ($supplier['region']==2)
+                                @if ($supplier['region']==2)
+                                    <div class="layui-col-md3">
                                         所属省市 ：{{$province_city}}
-                                    @endif
+                                    </div>
+                                @endif
+                                <div class="layui-col-md3">
+                                    所在国家/地区 ：{{!empty($nation['name_cn'])?$nation['name_cn'].'('.$nation['international_code'].')':'未设置'}}
                                 </div>
                             </div>
                             <div class="layui-row">
@@ -509,7 +512,16 @@
                             </div>
                         </div>
                     </div>
-
+                    <div style="display: flex;align-items: center;">
+                        <div style="width: 130px">
+                            <label class="layui-form-label">SKU上架有效期 : </label>
+                        </div>
+                        <div style="display: flex;flex-direction: column;">
+                            <div>现货 : {{$supplier['cp_time_day'] == -1 ? '无限制' : $supplier['cp_time_day']}}天</div>
+                            <div>期货 : {{$supplier['futures_cp_time_day'] == -1 ? '无限制' : $supplier['futures_cp_time_day']}}天</div>
+                        </div>
+                    </div>
+                    <br>
                     <div class="layui-inline">
                            @inject('multiSelectorPresenter','App\Presenters\MultiSelectorPresenter')
                            {!! $multiSelectorPresenter->render('sku_optional_batch','SKU可选批次 : ',!empty($supplier)?$supplier['sku_optional_batch']:'',$sku_optional_batch_for_xm_select,['width'=>'350px','required'=>true,'disable'=>true]) !!}

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

@@ -156,7 +156,7 @@
             </div>
             <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'=>'创建时间','audit_time'=>'上传时间']) !!}
             </div>
 
         </div>