diff --git a/app/Http/Controllers/Settings/Navigation.php b/app/Http/Controllers/Settings/Navigation.php index 2ded2fc8..c3d63f62 100644 --- a/app/Http/Controllers/Settings/Navigation.php +++ b/app/Http/Controllers/Settings/Navigation.php @@ -49,7 +49,7 @@ class Navigation extends Controller $titles['sections'][$sectionSlug] = $sectionTitle; } - foreach ($section['pages'] ?? [] as $page) { + foreach (collect($section['pages'] ?? [])->flatMap(fn (array $page) => [$page, ...($page['children'] ?? [])]) as $page) { $pageTitle = trim((string) ($pageTitles[$sectionSlug][$page['slug']] ?? '')); if ($pageTitle !== '') { diff --git a/app/Utilities/BusinessNavigation.php b/app/Utilities/BusinessNavigation.php index 6aeb952a..6aca5455 100644 --- a/app/Utilities/BusinessNavigation.php +++ b/app/Utilities/BusinessNavigation.php @@ -23,6 +23,13 @@ class BusinessNavigation $pageTitles[$sectionSlug][$page['slug']] ?? null, $page['title'] ); + + foreach ($page['children'] ?? [] as $childIndex => $child) { + $section['pages'][$pageIndex]['children'][$childIndex]['title'] = self::title( + $pageTitles[$sectionSlug][$child['slug']] ?? null, + $child['title'] + ); + } } } unset($section); diff --git a/config/business_navigation.php b/config/business_navigation.php index 787e2384..3a0d7ef3 100644 --- a/config/business_navigation.php +++ b/config/business_navigation.php @@ -701,9 +701,23 @@ $navigation = [ 'title' => '快递应付', 'icon' => 'local_shipping', 'pages' => [ - ['slug' => 'quote-management', 'title' => '报价管理'], - ['slug' => 'courier-information', 'title' => '快递资料'], - ['slug' => 'agreement-signing', 'title' => '协议签署'], + [ + 'slug' => 'courier-quote', + 'title' => '快递报价', + 'children' => [ + ['slug' => 'quote-management', 'title' => '报价管理'], + ['slug' => 'courier-information', 'title' => '快递资料'], + ['slug' => 'agreement-signing', 'title' => '协议签署'], + [ + 'slug' => 'courier-surcharge', + 'title' => '附加费报价维护', + 'tabs' => [ + ['slug' => 'quotes', 'title' => '附加费报价'], + ['slug' => 'settlement', 'title' => '附加费结算'], + ], + ], + ], + ], ['slug' => 'freight-reconciliation', 'title' => '运费对账'], ['slug' => 'shipping-data', 'title' => '发货数据'], ['slug' => 'return-pickup-management', 'title' => '退货取件管理'], @@ -712,14 +726,6 @@ $navigation = [ ['slug' => 'compensation-details', 'title' => '赔偿明细'], ['slug' => 'advance-details', 'title' => '借支明细'], ['slug' => 'other-adjustments', 'title' => '其他扣款补款'], - [ - 'slug' => 'courier-surcharge', - 'title' => '附加费报价维护', - 'tabs' => [ - ['slug' => 'quotes', 'title' => '附加费报价'], - ['slug' => 'settlement', 'title' => '附加费结算'], - ], - ], ['slug' => 'payable-cloud-warehouse-vehicle-fee', 'title' => '应付云仓车费'], ['slug' => 'courier-payables-report', 'title' => '快递应付表'], ['slug' => 'freight-difference', 'title' => '运费差'], diff --git a/resources/views/business/pages/courier-payables/final-workspace.blade.php b/resources/views/business/pages/courier-payables/final-workspace.blade.php index 0268f8dc..071beb8e 100644 --- a/resources/views/business/pages/courier-payables/final-workspace.blade.php +++ b/resources/views/business/pages/courier-payables/final-workspace.blade.php @@ -5,10 +5,26 @@