diff --git a/resources/views/business/pages/courier-payables/courier-information.blade.php b/resources/views/business/pages/courier-payables/courier-information.blade.php index 150ddbec..67d23d3f 100644 --- a/resources/views/business/pages/courier-payables/courier-information.blade.php +++ b/resources/views/business/pages/courier-payables/courier-information.blade.php @@ -205,13 +205,21 @@ color: var(--vip-danger, #b80000); } - .courier-information-table-wrap { - overflow-x: auto; + .courier-information-table-panel { + overflow: hidden; border: 1px solid var(--vip-border, #d8d2c7); border-radius: 12px; background: #fff; } + .courier-information-table-wrap { + overflow: auto; + } + + .courier-information-table-wrap.finance-table-scroll-owner { + max-height: max(12rem, calc(100vh - 27.75rem)); + } + .courier-information-table { width: 100%; min-width: 2260px; @@ -265,6 +273,7 @@ justify-content: space-between; gap: 12px; padding: 10px 12px; + border-top: 1px solid var(--vip-border, #d8d2c7); color: var(--vip-content-muted, #595959); font-size: 0.75rem; } @@ -399,8 +408,9 @@ @endif @if ($tab === 'logs') -
- +
+
+
@forelse ($rows ?? [] as $row) @@ -409,14 +419,16 @@ @endforelse -
ID快递代码操作时间创建时间修改时间
{{ $courierError ? '数据暂时不可用。' : '当前筛选条件下没有操作日志。' }}
+ +
@if ($rows && !$courierError) @endif @elseif ($tab === 'express') -
- +
+
+
@@ -449,7 +461,8 @@ @endforelse -
ID快递公司代码快递公司名称外部编码杉橙快递代码运费打款方式
{{ $courierError ? '数据暂时不可用。' : '当前筛选条件下没有快递资料。' }}
+ +
@if ($rows && !$courierError) @elseif ($tab === 'networks') -
- +
+
+
@forelse ($rows ?? [] as $row) @@ -471,14 +485,16 @@ @endforelse -
ID快递代码网点代码网点名称网点号省市区乡镇地址联系人联系电话是否启用接口平台创建时间剩余单号
{{ $courierError ? '数据暂时不可用。' : '当前筛选条件下没有网点资料。' }}
+ +
@if ($rows && !$courierError) @endif @else -
- +
+
+
@forelse ($rows ?? [] as $row) @@ -487,7 +503,8 @@ @endforelse -
ID快递代码快递名称账户类型账户账户名称开户行创建时间发票信息ERP账户ID
{{ $courierError ? '数据暂时不可用。' : '当前筛选条件下没有打款账户。' }}
+ +
@if ($rows && !$courierError) @endif diff --git a/tests/Feature/Business/CourierInformationPageTest.php b/tests/Feature/Business/CourierInformationPageTest.php index 56d6e3aa..c89afbbe 100644 --- a/tests/Feature/Business/CourierInformationPageTest.php +++ b/tests/Feature/Business/CourierInformationPageTest.php @@ -74,7 +74,7 @@ class CourierInformationPageTest extends FeatureTestCase ]); $this->app->instance(CourierInformationMirrorRepository::class, $repository); - $this->loginAs() + $response = $this->loginAs() ->get(route('business.pages.show', [ 'section' => 'courier-payables', 'page' => 'courier-information', @@ -86,6 +86,12 @@ class CourierInformationPageTest extends FeatureTestCase ->assertSeeText('SF') ->assertSeeText('同步正常') ->assertSeeText('可达服务') + ->assertSeeText('第 1 / 1 页,本页 1 条,共 1 条') ->assertSee('name="expcode"', false); + + $this->assertMatchesRegularExpression( + '/
\s*
.*?<\/table>\s*<\/div>\s*