Commit a9cacbe9 by 杨树贤

修改完成

parent 91144f10
...@@ -179,6 +179,21 @@ class SkuService extends BaseService ...@@ -179,6 +179,21 @@ class SkuService extends BaseService
return $item; return $item;
}, $list); }, $list);
$list = $this->transformInvalidSkuTag($list); $list = $this->transformInvalidSkuTag($list);
// 获取供应商数据维护员信息
$canalList = array_filter(array_unique(array_column($list, 'canal')));
if (!empty($canalList)) {
$suppliers = SupplierChannelModel::whereIn('supplier_code', $canalList)
->pluck('purchase_uid', 'supplier_code')
->toArray();
$intraCodeModel = new IntracodeModel();
$users = $intraCodeModel->getSampleEncode(true);
foreach ($list as &$item) {
$canal = array_get($item, 'canal');
$purchaseUid = array_get($suppliers, $canal, '');
$item['purchase_username'] = array_get($users, $purchaseUid, '');
}
unset($item);
}
} }
return [ return [
'list' => $list, 'list' => $list,
......
...@@ -89,6 +89,7 @@ ...@@ -89,6 +89,7 @@
} }
}, },
{field: 'encoded_user_name', title: '线上采购员', align: 'center', width: 100}, {field: 'encoded_user_name', title: '线上采购员', align: 'center', width: 100},
{field: 'purchase_username', title: '数据维护员', align: 'center', width: 100},
{field: 'spu_name', title: 'spu型号', align: 'center', width: 200}, {field: 'spu_name', title: 'spu型号', align: 'center', width: 200},
{ {
field: 'goods_name', title: '商品型号', align: 'center', width: 200, templet: function (data) { field: 'goods_name', title: '商品型号', align: 'center', width: 200, templet: function (data) {
......
...@@ -150,6 +150,11 @@ ...@@ -150,6 +150,11 @@
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
@inject('multiTransformableSelectPresenter','App\Presenters\Filter\MultiTransformableSelectPresenter') @inject('multiTransformableSelectPresenter','App\Presenters\Filter\MultiTransformableSelectPresenter')
{!! $multiTransformableSelectPresenter->render(['purchase_uid' => '数据维护员'],
['purchase_uid' => $userCodes]) !!}
</div>
<div class="layui-inline">
@inject('multiTransformableSelectPresenter','App\Presenters\Filter\MultiTransformableSelectPresenter')
{!! $multiTransformableSelectPresenter->render(['source' => 'SKU上传方式',], {!! $multiTransformableSelectPresenter->render(['source' => 'SKU上传方式',],
['source'=>config('field.SkuSource')]) !!} ['source'=>config('field.SkuSource')]) !!}
</div> </div>
...@@ -183,10 +188,6 @@ ...@@ -183,10 +188,6 @@
@inject('transformableSelectPresenter','App\Presenters\Filter\TransformableSelectPresenter') @inject('transformableSelectPresenter','App\Presenters\Filter\TransformableSelectPresenter')
{!! $transformableSelectPresenter->render(['channel_uid'=>'采购员'],$userCodes) !!} {!! $transformableSelectPresenter->render(['channel_uid'=>'采购员'],$userCodes) !!}
</div> </div>
{{-- <div class="layui-inline">
@inject('transformableSelectPresenter','App\Presenters\Filter\TransformableSelectPresenter')
{!! $transformableSelectPresenter->render(['purchase_uid'=>'开发员'],$userCodes) !!}
</div> --}}
<div class="layui-inline"> <div class="layui-inline">
@inject('transformableSelectPresenter','App\Presenters\Filter\TransformableSelectPresenter') @inject('transformableSelectPresenter','App\Presenters\Filter\TransformableSelectPresenter')
{!! $transformableSelectPresenter->render(['create_uid'=>'创建人'],$userCodes) !!} {!! $transformableSelectPresenter->render(['create_uid'=>'创建人'],$userCodes) !!}
......
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