Commit d8d89b94 by 杨树贤

页面修改

parent cd0534ed
...@@ -136,10 +136,11 @@ class SkuService ...@@ -136,10 +136,11 @@ class SkuService
$dbInfo = getSpuSkuDb($item['goods_id']); $dbInfo = getSpuSkuDb($item['goods_id']);
$connection = DB::connection($dbInfo["db"]); $connection = DB::connection($dbInfo["db"]);
$table = $dbInfo['table']; $table = $dbInfo['table'];
$selectFields = ['goods_id', 'create_time', 'eccn', 'source', 'encoded']; $selectFields = ['goods_id', 'create_time', 'eccn', 'source', 'encoded','org_id'];
$skuDBData = $connection->table($table)->select($selectFields)->where('goods_id', $item['goods_id'])->first(); $skuDBData = $connection->table($table)->select($selectFields)->where('goods_id', $item['goods_id'])->first();
$skuDBData = $skuDBData ? $skuDBData : []; $skuDBData = $skuDBData ? $skuDBData : [];
$item['source_name'] = array_get(config('field.SkuSource'), @$skuDBData['source'], ''); $item['source_name'] = array_get(config('field.SkuSource'), @$skuDBData['source'], '');
$item['org_name'] = array_get(config('field.SkuOrgList'), @$skuDBData['org_id'], '');
return $item; return $item;
}, $list); }, $list);
$list = $this->transformInvalidSkuTag($list); $list = $this->transformInvalidSkuTag($list);
......
...@@ -75,6 +75,13 @@ return [ ...@@ -75,6 +75,13 @@ return [
1 => '芯链商家' 1 => '芯链商家'
], ],
'SkuOrgList' => [
1 => '猎芯',
2 => '深贸',
3 => '华云',
6 => '华云香港'
],
'AttachmentFields' => [ 'AttachmentFields' => [
'business_license', 'business_license',
'billing_information', 'billing_information',
......
...@@ -137,6 +137,7 @@ ...@@ -137,6 +137,7 @@
{ {
field: 'source_name', title: '接入方式', align: 'center', width: 150 field: 'source_name', title: '接入方式', align: 'center', width: 150
}, },
{field: 'org_name', title: '所属组织', align: 'center', width: 100},
{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},
{field: 'audit_time', title: '上传时间', align: 'center', width: 150}, {field: 'audit_time', title: '上传时间', align: 'center', width: 150},
......
...@@ -146,6 +146,10 @@ ...@@ -146,6 +146,10 @@
@inject('statusPresenter','App\Presenters\StatusPresenter') @inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('has_price','有无价格',request()->get('has_price'),['1'=> '有','-1'=> '无']) !!} {!! $statusPresenter->render('has_price','有无价格',request()->get('has_price'),['1'=> '有','-1'=> '无']) !!}
</div> </div>
<div class="layui-inline">
@inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('org_id/eq','所属组织',request()->get('org_id/eq'),config('field.SkuOrgList')) !!}
</div>
<div class="layui-inline" style="width: 600px"> <div class="layui-inline" style="width: 600px">
@inject('transformableTimeIntervalPresenter','App\Presenters\Filter\TransformableTimeIntervalPresenter') @inject('transformableTimeIntervalPresenter','App\Presenters\Filter\TransformableTimeIntervalPresenter')
{!! $transformableTimeIntervalPresenter->render(['update_time'=>'更新时间','create_time'=>'上传时间']) !!} {!! $transformableTimeIntervalPresenter->render(['update_time'=>'更新时间','create_time'=>'上传时间']) !!}
......
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