字段调整

app/Http/Services/SkuService.php

@@ -81,6 +81,12 @@ class SkuService
                         }
                         }
                     }
                     }
                 }
                 }
+                $standardBrandId = array_get($spu,'s_brand_id');
+                if ($standardBrandId) {
+                    $standardBrand = $redis->hget('standard_brand',$standardBrandId);
+                    $standardBrand = json_decode($standardBrand, true);
+                    $sku['standard_brand_name'] = $standardBrand['brand_name'];
+                }
 
 
                 //获取价格
                 //获取价格
                 $moqPrice = [];
                 $moqPrice = [];

app/Http/Transformers/SupplierTransformer.php

@@ -66,9 +66,13 @@ class SupplierTransformer
                 $supplier['create_name'] = array_get($userInfo, 'name');
                 $supplier['create_name'] = array_get($userInfo, 'name');
             }
             }
 
 
-            $supplier['last_upload_sku_time'] = array_get($lastUploadSkuTimes,$supplier['supplier_code']) ? date('Y-m-d H:i:s',
+            $supplier['last_upload_sku_time'] = array_get($lastUploadSkuTimes, $supplier['supplier_code']) ? date('Y-m-d H:i:s',
                 $lastUploadSkuTimes[$supplier['supplier_code']]) : '';
                 $lastUploadSkuTimes[$supplier['supplier_code']]) : '';
 
 
+            //创建时间和最后上传时间互相补充
+            $supplier['last_upload_sku_time'] = $supplier['last_upload_sku_time'] ?: $supplier['sku_create_time'];
+            $supplier['sku_create_time'] = $supplier['sku_create_time'] ?: $supplier['last_upload_sku_time'];
+
             //获取最新修改人以及下级审核员
             //获取最新修改人以及下级审核员
             $log = LogModel::getLastLog($supplier['supplier_id']);
             $log = LogModel::getLastLog($supplier['supplier_id']);
             $supplier['last_update_name'] = $log ? $log['admin_name'] : '';
             $supplier['last_update_name'] = $log ? $log['admin_name'] : '';

resources/views/script/SkuListScript.blade.php

@@ -71,6 +71,9 @@
             {
             {
                 field: 'brand_name', title: '品牌', align: 'center', width: 120
                 field: 'brand_name', title: '品牌', align: 'center', width: 120
             },
             },
+            {
+                field: 'standard_brand_name', title: '标准品牌', align: 'center', width: 120
+            },
             {field: 'stock', title: '库存数量', align: 'center', width: 80},
             {field: 'stock', title: '库存数量', align: 'center', width: 80},
             {
             {
                 field: 'cn_price', title: '人民币成本价（￥）', align: 'left', width: 150, templet: function (data) {
                 field: 'cn_price', title: '人民币成本价（￥）', align: 'left', width: 150, templet: function (data) {