Commit bf1160c9 by 杨树贤

显示跟单采购员

parent 54c1cad7
...@@ -36,9 +36,6 @@ class SupplierService ...@@ -36,9 +36,6 @@ class SupplierService
if (!empty($map['is_export'])) { if (!empty($map['is_export'])) {
$list = $query->get()->toArray(); $list = $query->get()->toArray();
} else { } else {
// $sql = $query->toSql();
// $bindings = $query->getBindings();
// dd($sql, $bindings);
$list = $query->paginate($limit)->toArray(); $list = $query->paginate($limit)->toArray();
$transformer = new SupplierTransformer(); $transformer = new SupplierTransformer();
$list['data'] = $transformer->transformList($list['data']); $list['data'] = $transformer->transformList($list['data']);
......
...@@ -368,6 +368,7 @@ return [ ...@@ -368,6 +368,7 @@ return [
1 => '猎芯采购', 1 => '猎芯采购',
2 => '京东采购', 2 => '京东采购',
3 => '华云采购', 3 => '华云采购',
4 => '数据跟单员',
], ],
'SkuOptionalBatch' => [ 'SkuOptionalBatch' => [
......
...@@ -282,6 +282,19 @@ ...@@ -282,6 +282,19 @@
} }
} }
}, },
{
field: 'inventory_channel_username', title: '数据跟单员', align: 'center', width: 130, templet: function (data) {
if (data.inventory_resign_channel_username) {
if (data.inventory_on_job_channel_username) {
return `<span>${data.inventory_on_job_channel_username}</span>` + `,<span style="color: #D7D7D7">${data.inventory_resign_channel_username}</span>`;
} else {
return `<span style="color: #D7D7D7">${data.inventory_resign_channel_username}</span>`
}
} else {
return `<span>${data.inventory_on_job_channel_username}</span>`;
}
}
},
{field: 'has_sku', title: 'SKU上传', align: 'center', width: 80}, {field: 'has_sku', title: 'SKU上传', align: 'center', width: 80},
{ {
field: 'uploaded_sku', title: 'SKU合作', align: 'center', width: 80, templet: function (data) { field: 'uploaded_sku', title: 'SKU合作', align: 'center', width: 80, templet: function (data) {
......
...@@ -282,6 +282,19 @@ ...@@ -282,6 +282,19 @@
} }
} }
}, },
{
field: 'inventory_channel_username', title: '数据跟单员', align: 'center', width: 130, templet: function (data) {
if (data.inventory_resign_channel_username) {
if (data.inventory_on_job_channel_username) {
return `<span>${data.inventory_on_job_channel_username}</span>` + `,<span style="color: #D7D7D7">${data.inventory_resign_channel_username}</span>`;
} else {
return `<span style="color: #D7D7D7">${data.inventory_resign_channel_username}</span>`
}
} else {
return `<span>${data.inventory_on_job_channel_username}</span>`;
}
}
},
{field: 'has_sku', title: 'SKU上传', align: 'center', width: 80}, {field: 'has_sku', title: 'SKU上传', align: 'center', width: 80},
{ {
field: 'uploaded_sku', title: 'SKU合作', align: 'center', width: 80, templet: function (data) { field: 'uploaded_sku', title: 'SKU合作', align: 'center', width: 80, templet: function (data) {
......
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