feat(顾家过账): 发货明细仅展示指定字段
This commit is contained in:
parent
861bc4db71
commit
a256b9e7cd
@ -28,7 +28,15 @@ class KukaPostingBasePageData
|
||||
public function build(Request $request, int $companyId): array
|
||||
{
|
||||
$stores = array_values((array) config('kuka_posting.stores', []));
|
||||
$fields = array_values((array) config('kuka_posting.fields', []));
|
||||
$fieldDefinitions = collect((array) config('kuka_posting.fields', []))->keyBy('name');
|
||||
$displayFieldNames = array_values((array) config('kuka_posting.shipment_display_fields', []));
|
||||
$fields = $displayFieldNames === []
|
||||
? $fieldDefinitions->values()->all()
|
||||
: collect($displayFieldNames)
|
||||
->map(static fn (string $name): ?array => $fieldDefinitions->get($name))
|
||||
->filter()
|
||||
->values()
|
||||
->all();
|
||||
$available = $this->repository->available();
|
||||
$periods = $available ? $this->repository->periods($companyId) : [];
|
||||
$latest = $available ? $this->repository->latestImport($companyId) : null;
|
||||
|
||||
@ -138,6 +138,23 @@ return [
|
||||
['name' => 'specification_model', 'source' => '规格型号', 'label' => '规格型号'],
|
||||
['name' => 'material', 'source' => '材质', 'label' => '材质'],
|
||||
],
|
||||
'shipment_display_fields' => [
|
||||
'online_order_no',
|
||||
'order_status',
|
||||
'shipping_warehouse',
|
||||
'store_name',
|
||||
'shipping_date',
|
||||
'product_code',
|
||||
'style_code',
|
||||
'item_number',
|
||||
'material_number',
|
||||
'model',
|
||||
'cost',
|
||||
'product_material',
|
||||
'shipped_quantity',
|
||||
'shipping_amount',
|
||||
'posting_label',
|
||||
],
|
||||
'field_widths' => [
|
||||
'internal_order_no' => 120,
|
||||
'marked_labels' => 340,
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
@php
|
||||
$showDirectoryIntro = $showDirectoryIntro ?? true;
|
||||
$showDirectoryIndex = $showDirectoryIndex ?? true;
|
||||
$enableColumnResize = $enableColumnResize ?? false;
|
||||
$columnWidths = is_array($columnWidths ?? null) ? $columnWidths : [];
|
||||
$directoryRows = $rows ?? collect();
|
||||
@ -3302,7 +3303,7 @@
|
||||
<div class="directory-field-picker" data-directory-field-picker>
|
||||
<button type="button" aria-expanded="false" aria-controls="directory-fields-{{ $directoryTableKey ?? ($page['slug'] ?? 'page') }}" data-directory-field-toggle>列设置</button>
|
||||
<div class="directory-field-picker__panel" id="directory-fields-{{ $directoryTableKey ?? ($page['slug'] ?? 'page') }}" role="group" aria-label="选择展示字段" hidden>
|
||||
<span class="directory-field-picker__hint">{{ $directoryHasGroupedHeader ? '两层合并表头按固定列顺序渲染,仅可切换显示字段。' : '拖动字段调整顺序;固定序号列不可隐藏。' }}</span>
|
||||
<span class="directory-field-picker__hint">{{ $directoryHasGroupedHeader ? '两层合并表头按固定列顺序渲染,仅可切换显示字段。' : ($showDirectoryIndex ? '拖动字段调整顺序;固定序号列不可隐藏。' : '拖动字段调整顺序。') }}</span>
|
||||
@foreach ($directoryFields as $field)
|
||||
<label class="directory-field-picker__option" draggable="true" data-directory-field-option>
|
||||
<input type="checkbox" value="{{ $field['name'] }}" data-directory-field-check @checked(in_array($field['name'], $visibleDirectoryColumns, true))>
|
||||
@ -3351,9 +3352,9 @@
|
||||
>
|
||||
<thead>
|
||||
<tr>
|
||||
@unless ($directoryHasGroupedHeader)
|
||||
@if ($showDirectoryIndex && ! $directoryHasGroupedHeader)
|
||||
<th scope="col" data-directory-fixed="start" data-column-label="{{ $directory['index_label'] ?? '序号' }}">{{ $directory['index_label'] ?? '序号' }}</th>
|
||||
@endunless
|
||||
@endif
|
||||
@if ($directoryHasGroupedHeader)
|
||||
@php
|
||||
$groupedHeaderRuns = [];
|
||||
@ -3423,9 +3424,9 @@
|
||||
@if (($page['slug'] ?? '') === 'subject-operating-report') data-subject-row data-subject-details='@json($row->company_details ?? [])' tabindex="0" aria-label="查看主体详细资料" @endif
|
||||
@if ($isInternalFlowReportPage) data-internal-flow-row-id="{{ data_get($row, 'id') }}" @endif
|
||||
>
|
||||
@unless ($directoryHasGroupedHeader)
|
||||
@if ($showDirectoryIndex && ! $directoryHasGroupedHeader)
|
||||
<td data-directory-fixed="start">{{ $rowIndex + 1 + (($directoryCurrentPage - 1) * $directoryPerPage) }}</td>
|
||||
@endunless
|
||||
@endif
|
||||
@foreach ($directoryFields as $field)
|
||||
@php
|
||||
$source = array_key_exists('source', $field) ? $field['source'] : $field['name'];
|
||||
@ -3536,7 +3537,7 @@
|
||||
</tr>
|
||||
@empty
|
||||
<tr class="is-empty">
|
||||
<td colspan="{{ count($directoryFields) + ($directoryHasGroupedHeader ? 0 : 1) }}">
|
||||
<td colspan="{{ count($directoryFields) + ($showDirectoryIndex && ! $directoryHasGroupedHeader ? 1 : 0) }}">
|
||||
<div class="directory-table-empty">
|
||||
<span class="material-icons-outlined" aria-hidden="true">inbox</span>
|
||||
<span>{{ !empty($upstreamError) ? '资料暂时无法读取,请按上方提示检查连接;这不代表业务数据为 0。' : ($directory['empty'] ?? '尚未同步数据。') }}</span>
|
||||
|
||||
@ -255,8 +255,9 @@
|
||||
'page' => $page,
|
||||
'upstreamError' => $error,
|
||||
'showDirectoryIntro' => false,
|
||||
'showDirectoryIndex' => false,
|
||||
'enableColumnResize' => true,
|
||||
'columnWidths' => config('kuka_posting.field_widths', []),
|
||||
'columnPreferenceVersion' => 'kuka-shipment-columns-v2',
|
||||
'columnPreferenceVersion' => 'kuka-shipment-columns-v3',
|
||||
])
|
||||
</div>
|
||||
|
||||
@ -35,8 +35,8 @@ class KukaPostingBasePageTest extends FeatureTestCase
|
||||
'store_name' => '天猫-HX旗舰店101',
|
||||
]))
|
||||
->assertOk()
|
||||
->assertSeeText('内部订单号')
|
||||
->assertSeeText('实发金额')
|
||||
->assertDontSeeText('内部订单号')
|
||||
->assertDontSeeText('实发金额')
|
||||
->assertSeeText('灵珊店铺业绩')
|
||||
->assertSeeText('发货明细数据')
|
||||
->assertSeeText('顾家报价单')
|
||||
@ -50,7 +50,15 @@ class KukaPostingBasePageTest extends FeatureTestCase
|
||||
->assertSee('data-directory-resizable="true"', false)
|
||||
->assertSee('data-directory-column-resize', false)
|
||||
->assertSee('directory-column-widths', false)
|
||||
->assertSee('data-directory-column-preference-version="kuka-shipment-columns-v2"', false)
|
||||
->assertSee('data-directory-column-preference-version="kuka-shipment-columns-v3"', false)
|
||||
->assertSeeText('线上订单号')
|
||||
->assertSeeText('订单状态')
|
||||
->assertSeeText('发货仓')
|
||||
->assertSeeText('店铺')
|
||||
->assertSeeText('发货日期')
|
||||
->assertSeeText('商品编码')
|
||||
->assertSeeText('款式编码')
|
||||
->assertSeeText('货号')
|
||||
->assertSeeText('物料编号')
|
||||
->assertSeeText('物料描述')
|
||||
->assertSeeText('成本')
|
||||
@ -58,12 +66,14 @@ class KukaPostingBasePageTest extends FeatureTestCase
|
||||
->assertSeeText('实发数量')
|
||||
->assertSeeText('发货金额')
|
||||
->assertSeeText('过账标签')
|
||||
->assertSeeText('KUKA-00')
|
||||
->assertSeeText('ONLINE-00')
|
||||
->assertSeeText('STYLE-00')
|
||||
->assertSeeText('SKU-00')
|
||||
->assertSeeText('ITEM-00')
|
||||
->assertDontSeeText('MAT-00')
|
||||
->assertSeeText('POSTING-00')
|
||||
->assertDontSeeText('KUKA-01')
|
||||
->assertDontSeeText('KUKA-00')
|
||||
->assertDontSeeText('ONLINE-01')
|
||||
->assertDontSeeText('SKU-01');
|
||||
|
||||
$sourceValues = json_decode(
|
||||
@ -79,15 +89,19 @@ class KukaPostingBasePageTest extends FeatureTestCase
|
||||
@unlink($file);
|
||||
}
|
||||
|
||||
public function test_new_headers_follow_style_code_in_requested_order(): void
|
||||
public function test_shipment_display_fields_are_exactly_requested_columns(): void
|
||||
{
|
||||
$fields = array_values((array) config('kuka_posting.fields'));
|
||||
$names = array_column($fields, 'name');
|
||||
$styleIndex = array_search('style_code', $names, true);
|
||||
|
||||
$this->assertNotFalse($styleIndex);
|
||||
$this->assertSame(
|
||||
[
|
||||
'online_order_no',
|
||||
'order_status',
|
||||
'shipping_warehouse',
|
||||
'store_name',
|
||||
'shipping_date',
|
||||
'product_code',
|
||||
'style_code',
|
||||
'item_number',
|
||||
'material_number',
|
||||
'model',
|
||||
@ -97,9 +111,13 @@ class KukaPostingBasePageTest extends FeatureTestCase
|
||||
'shipping_amount',
|
||||
'posting_label',
|
||||
],
|
||||
array_slice($names, $styleIndex + 1, 8),
|
||||
array_values((array) config('kuka_posting.shipment_display_fields')),
|
||||
);
|
||||
$this->assertSame(count($names), count(array_unique($names)));
|
||||
$this->assertSame(
|
||||
[],
|
||||
array_values(array_diff(config('kuka_posting.shipment_display_fields'), $names)),
|
||||
);
|
||||
|
||||
$modelField = collect($fields)->firstWhere('name', 'model');
|
||||
$this->assertSame('型号', $modelField['source']);
|
||||
@ -109,6 +127,45 @@ class KukaPostingBasePageTest extends FeatureTestCase
|
||||
$this->assertSame([], array_values(array_diff($names, array_keys($widths))));
|
||||
}
|
||||
|
||||
public function test_shipment_page_renders_only_requested_headers_and_values(): void
|
||||
{
|
||||
$file = $this->workbook();
|
||||
|
||||
$this->artisan('business-mirror:import-kuka-posting-base', [
|
||||
'path' => $file,
|
||||
'--month' => '2026-10',
|
||||
'--company' => (string) $this->company->id,
|
||||
])->assertExitCode(0);
|
||||
|
||||
$html = $this->loginAs()
|
||||
->get(route('business.pages.show', [
|
||||
'section' => 'posting-data',
|
||||
'page' => 'kuka-basic-data',
|
||||
'store_name' => '天猫-HX旗舰店101',
|
||||
]))
|
||||
->assertOk()
|
||||
->getContent();
|
||||
|
||||
$panelStart = strpos($html, 'id="kuka-posting-panel-shipments"');
|
||||
$panelEnd = strpos($html, 'id="kuka-posting-panel-quotation"', $panelStart);
|
||||
$this->assertNotFalse($panelStart);
|
||||
$this->assertNotFalse($panelEnd);
|
||||
$shipmentHtml = substr($html, $panelStart, $panelEnd - $panelStart);
|
||||
|
||||
preg_match_all('/<th scope="col" data-column-key="([^"]+)"/', $shipmentHtml, $matches);
|
||||
$allFieldNames = array_column((array) config('kuka_posting.fields'), 'name');
|
||||
$renderedFieldNames = array_values(array_intersect($matches[1], $allFieldNames));
|
||||
|
||||
$this->assertSame(
|
||||
array_values((array) config('kuka_posting.shipment_display_fields')),
|
||||
$renderedFieldNames,
|
||||
);
|
||||
$this->assertStringNotContainsString('<th scope="col" data-directory-fixed="start"', $shipmentHtml);
|
||||
$this->assertStringNotContainsString('<td data-directory-fixed="start">', $shipmentHtml);
|
||||
|
||||
@unlink($file);
|
||||
}
|
||||
|
||||
public function test_shipment_rows_use_unique_material_mapping_and_quotation_values(): void
|
||||
{
|
||||
$file = $this->workbook();
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user