merge: 带上筛选栏网格修复

This commit is contained in:
j.jiang 2026-10-26 17:57:28 +08:00
commit b53b077deb
4 changed files with 41 additions and 4 deletions

View File

@ -2042,7 +2042,7 @@
@endif
@endif
@if (($page['slug'] ?? '') === 'store-report' && ! $directoryUsesFieldQuery)
<form method="GET" action="{{ request()->url() }}" class="installation-filter-bar" aria-label="店铺维度报表筛选查询栏">
<form method="GET" action="{{ request()->url() }}" class="installation-filter-bar installation-filter-bar--grid" aria-label="店铺维度报表筛选查询栏">
@php
$storeFilterTextFields = [
['name' => 'store_name', 'label' => '店铺名称:'],
@ -2151,7 +2151,7 @@
.receipt-remark-tag--warn { background: #fdf3e3; color: #96690a; }
.receipt-remark-tag--info { background: #eaf1fb; color: #1f5fa8; }
</style>
<form method="GET" action="{{ request()->url() }}" class="installation-filter-bar" aria-label="业绩明细筛选查询栏">
<form method="GET" action="{{ request()->url() }}" class="installation-filter-bar installation-filter-bar--grid" aria-label="业绩明细筛选查询栏">
{{-- 查询时保留当前每页条数 --}}
<input type="hidden" name="per_page" value="{{ (int) ($receiptStats['per_page'] ?? 25) }}">
<div class="installation-filter-field cw-ms" id="rdPlatform" data-name="platform"
@ -2731,7 +2731,7 @@
})();
</script>
@elseif (in_array(($page['slug'] ?? ''), ['inventory-report', 'monthly-weighted-average-price'], true))
<form method="GET" action="{{ request()->url() }}" class="installation-filter-bar" aria-label="进销存报表筛选查询栏">
<form method="GET" action="{{ request()->url() }}" class="installation-filter-bar installation-filter-bar--grid" aria-label="进销存报表筛选查询栏">
<label class="installation-filter-field">
<span>月份:</span>
@php
@ -3120,7 +3120,7 @@
<span class="material-icons-outlined" aria-hidden="true">cloud_done</span>
<span>已从共享业务镜像读取 {{ $inboundTotal }} 条入库明细;可通过“导入”上传 Excel 整体更新。</span>
</div>
<form method="GET" action="{{ request()->url() }}" class="installation-filter-bar" aria-label="入库明细筛选查询栏">
<form method="GET" action="{{ request()->url() }}" class="installation-filter-bar installation-filter-bar--grid" aria-label="入库明细筛选查询栏">
<label class="installation-filter-field">
<span>月份:</span>
<select name="detail_month" aria-label="月份">

View File

@ -209,6 +209,33 @@
color: #595959;
}
/* 店铺维度报表 / 业绩明细 / 进销存报表 / 入库明细仍直接以字段为栅格项;
安装明细已改用 .installation-filter-primary 等内部容器排版,不受这里影响。 */
.installation-filter-bar--grid {
display: grid;
grid-template-columns: repeat(4, minmax(12rem, 1fr));
gap: 0.65rem 1rem;
align-items: center;
}
.installation-filter-bar--grid .installation-filter-actions {
align-items: center;
justify-content: flex-start;
gap: 0.5rem;
}
@media (max-width: 1100px) {
.installation-filter-bar--grid {
grid-template-columns: repeat(2, minmax(14rem, 1fr));
}
}
@media (max-width: 650px) {
.installation-filter-bar--grid {
grid-template-columns: minmax(0, 1fr);
}
}
.installation-filter-field {
display: flex;
align-items: center;

1
scripts/_cookie.txt Normal file
View File

@ -0,0 +1 @@
eyJpdiI6InVQMG9MMlNCYmxtNzB1K292djBaSHc9PSIsInZhbHVlIjoiTGxSQkJWVTRHQndCMnU4eHgxNDVQZ3V6OEozd2EzZE5ZV2UvNGpWcEtza0RBVm1XMThZV1lVSU82dmpIc2I4eCIsIm1hYyI6ImQwZTc3YzE4MzljOTY2MTMzN2IzM2RkM2IwNjY0OTcxNzM1NWU1NmJjZWZhOGE0MDZiN2MzMGI2Nzk0YmZhNDIiLCJ0YWciOiIifQ==

9
scripts/_diag_tmp.php Normal file
View File

@ -0,0 +1,9 @@
<?php
require '/var/www/html/vendor/autoload.php';
$app = require '/var/www/html/bootstrap/app.php';
$app->make(Illuminate\Contracts\Console\Kernel::class)->bootstrap();
$db = DB::connection('mysql');
foreach ($db->table('users')->select('id','email','company_id','enabled')->orderBy('id')->limit(8)->get() as $u) {
echo "id={$u->id} email={$u->email} company_id={$u->company_id} enabled={$u->enabled}\n";
}
echo "companies: " . $db->table('companies')->count() . "\n";