Commit 6c981f17 by 杨树贤

接入方式显示问题

parent f3b9996b
...@@ -1012,7 +1012,7 @@ class DataService ...@@ -1012,7 +1012,7 @@ class DataService
'purchase_amount', 'purchase_amount',
'exchange_rate', 'exchange_rate',
'currency' 'currency'
])->get()->toArray(); ])->where('status','!=',-3)->get()->toArray();
//计算出采购金额 //计算出采购金额
$totalAmount = 0; $totalAmount = 0;
foreach ($purchaseOrders as $purchaseOrder) { foreach ($purchaseOrders as $purchaseOrder) {
......
...@@ -106,6 +106,7 @@ class SkuService ...@@ -106,6 +106,7 @@ class SkuService
$goodsTag = $redis->hget('goods_tag', $item['goods_id']); $goodsTag = $redis->hget('goods_tag', $item['goods_id']);
$goodsTag = $goodsTag ? json_decode($goodsTag, true) : ''; $goodsTag = $goodsTag ? json_decode($goodsTag, true) : '';
$item['sku_tags'] = $goodsTag ? array_get($goodsTag, 'customer_tag') : ''; $item['sku_tags'] = $goodsTag ? array_get($goodsTag, 'customer_tag') : '';
$item['source_name'] = array_get(config('field.SkuSource'), $item['source'], '');
return $item; return $item;
}, $list); }, $list);
$list = $this->transformInvalidSkuTag($list); $list = $this->transformInvalidSkuTag($list);
......
...@@ -67,5 +67,5 @@ Route::group(['middleware' => ['external'], 'namespace' => 'Sync'], function () ...@@ -67,5 +67,5 @@ Route::group(['middleware' => ['external'], 'namespace' => 'Sync'], function ()
}); });
Route::match(['get', 'post'], '/test', function () { Route::match(['get', 'post'], '/test', function () {
(new \App\Http\Services\DataService())->exportNotUploadSkuSupplier(); // (new \App\Http\Services\DataService())->exportNotUploadSkuSupplier();
}); });
...@@ -105,9 +105,7 @@ ...@@ -105,9 +105,7 @@
} }
}, },
{ {
field: ' access_way', title: '接入方式', align: 'center', width: 150, templet: function (d) { field: ' source_name', title: '接入方式', align: 'center', width: 150
return "人工上传";
}
}, },
{field: 'audit_user', title: '审核人', align: 'center', width: 100}, {field: 'audit_user', title: '审核人', align: 'center', width: 100},
{field: 'update_time', title: '更新时间', align: 'center', width: 150}, {field: 'update_time', title: '更新时间', align: 'center', width: 150},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment