Commit 00b5aa2f by 杨树贤

优化

parent 2f18cce7
......@@ -34,7 +34,7 @@ class SupplierTransformer
$supplier['viewed'] = array_get($viewData, $supplier['supplier_id'], false);
$supplier = $this->getStockupType($supplier);
$supplier['supplier_group'] = array_get(config('fixed.SupplierGroup'), $supplier['supplier_group'], '未设置');
$supplier['purchase_type'] = array_get(config('field.PurchaseType'), $supplier['purchase_type'], '无');
$supplier['purchase_type_name'] = array_get(config('field.PurchaseType'), $supplier['purchase_type'], '无');
$supplier['region_name'] = array_get(config('fixed.Region'), $supplier['region']);
$supplier['create_time'] = $supplier['create_time'] ? date('Y-m-d H:i:s', $supplier['create_time']) : '';
$supplier['audit_time'] = $supplier['audit_time'] ? date('Y-m-d H:i:s', $supplier['audit_time']) : '';
......@@ -204,7 +204,8 @@ class SupplierTransformer
array_get($supplier, 'has_certification', ''), '');
$supplier['sku_tag_name'] = array_get(config('field.SkuTag'), array_get($supplier, 'sku_tag', ''), '无');
$supplier['sku_mode_name'] = array_get(config('field.SkuMode'), array_get($supplier, 'sku_mode', ''), '无');
$supplier['purchase_type'] = array_get(config('field.PurchaseType'), array_get($supplier, 'purchase_type', ''), '无');
// $supplier['purchase_type'] = array_get(config('field.PurchaseType'), array_get($supplier, 'purchase_type', ''), '无');
$supplier['purchase_type_name'] = array_get(config('field.PurchaseType'), $supplier['purchase_type'], '无');
return $supplier;
}
......
......@@ -120,7 +120,7 @@
return "<span title='" + data.stockup_type + "'>" + data.stockup_type + "</span>"
}
},
{field: 'purchase_type', title: '代购类型', align: 'center', width: 80},
{field: 'purchase_type_name', title: '代购类型', align: 'center', width: 80},
{
field: 'has_quality_assurance_agreement',
title: '品质协议',
......
......@@ -49,9 +49,8 @@
{{$supplier['stockup_type_name']}}
@endif
</div>
<div class="layui-col-md2">
代购类型 : {{$supplier['purchase_type']}}
</div>
{{-- <div class="layui-col-md2">--}}
{{-- </div>--}}
<div class="layui-col-md2">
线上采购员 : {{$supplier['yunxin_channel_username']}}
</div>
......@@ -201,6 +200,9 @@
<div class="layui-col-md3">
<span class="required_field">*</span> 合作类型 :{{$supplier['stockup_type_name']}}
</div>
<div class="layui-col-md2">
代购类型 : {{$supplier['purchase_type_name']}}
</div>
</div>
<div class="layui-row">
<div class="layui-col-md2">
......
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