WuYongJie/CaiWuXiTong
1
0
Fork 0
Code Issues Pull Requests 8 Packages Projects Releases Wiki Activity

fix: 隐藏供应商应付表打款明细列 (#1136)

Browse Source 
Co-authored-by: 苏木 <594326199@qq.com>
Co-committed-by: 苏木 <594326199@qq.com>
This commit is contained in:
苏木 2026-11-12 15:44:30 +08:00 committed by sumu
parent eb983ecf76
commit e875656c66
2 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
resources/views/business/pages/supplier-payables/supplier-payables-report.blade.php
View File

@ -306,12 +306,8 @@
<col style="width: 8rem">
<col style="width: 8rem">
<col style="width: 8rem">
<col style="width: 9rem">
<col style="width: 9rem">
<col style="width: 9rem">
<col style="width: 11rem">
<col style="width: 11rem">
<col style="width: 12rem">
<col style="width: 9rem">
<col style="width: 8rem">
<col style="width: 9rem">
@ -333,10 +329,9 @@
<th colspan="3" class="group-purchase">本月采购金额</th>
<th colspan="5" class="group-deduction">减</th>
<th class="group-addition">加</th>
<th colspan="6" class="group-payment">单位：元</th>
<th colspan="3" class="group-payment">单位：元</th>
<th rowspan="2">备注</th>
<th rowspan="2">是否直接对私打款</th>
<th rowspan="2">对私原因</th>
<th rowspan="2">含税定价金额</th>
<th rowspan="2">押款金额</th>
<th rowspan="2">结款截图</th>
@ -360,9 +355,6 @@
<th class="group-payment">供应商余额</th>
<th class="group-payment">应付余额</th>
<th class="group-payment">预估金额</th>
<th class="group-payment">对公打款金额</th>
<th class="group-payment">对私打款金额</th>
<th class="group-payment">已销账金额</th>
</tr>
</thead>
<tbody>
@ -389,12 +381,8 @@
<td>{{ $money($row->supplier_balance) }}</td>
<td>{{ $money($row->should_pay) }}</td>
<td>{{ $money($row->estimated_price) }}</td>
<td>{{ $money($row->to_corporate) }}</td>
<td>{{ $money($row->to_private) }}</td>
<td>{{ $money($row->cashier_paid) }}</td>
<td>{{ $row->remarks ?: '-' }}</td>
<td>{{ (float) ($row->to_private ?? 0) !== 0.0 ? '是' : '否' }}</td>
<td>{{ $row->private_reason ?: '-' }}</td>
<td>-</td>
<td>{{ $money($row->deposit) }}</td>
<td>-</td>
@ -405,7 +393,7 @@
</tr>
@empty
<tr class="is-empty">
<td colspan="34">{{ $supplierPayableError ? '数据读取失败，请稍后重试。' : '暂无供应商应付数据' }}</td>
<td colspan="30">{{ $supplierPayableError ? '数据读取失败，请稍后重试。' : '暂无供应商应付数据' }}</td>
</tr>
@endforelse
</tbody>

39
tests/Feature/Business/SupplierPayablePagesTest.php
View File

@ -148,7 +148,7 @@ class SupplierPayablePagesTest extends FeatureTestCase
$this->assertCount(17, $headers[0]);
}
public function testSupplierPayablesReportPageUsesItsOwnThirtyFourColumnGroupedTable()
public function testSupplierPayablesReportPageUsesItsOwnThirtyColumnGroupedTable()
{
$this->grantAdminPermission();
@ -160,19 +160,36 @@ class SupplierPayablePagesTest extends FeatureTestCase
$response
->assertOk()
->assertSee('class="supplier-payables-report-table"', false)
->assertSee('<th colspan="2" class="group-closed freeze-column freeze-group">已销账供应商</th>', false)
->assertSee('<th rowspan="2" class="freeze-column freeze-supplier">供应商简称</th>', false)
->assertSee('已销账供应商')
->assertSee('本月采购金额')
->assertSee('<th class="group-addition">加</th>', false)
->assertSee('<th colspan="6" class="group-payment">单位：元</th>', false)
->assertSee('<th class="group-payment">供应商余额</th>', false)
->assertSee('最晚出账单时间（新执行标准）')
->assertDontSee('class="business-blank-page"', false);
preg_match_all('/<col(?:\s|>)/', $response->getContent(), $columns);
$this->assertSame(
1,
preg_match(
'/<table\b[^>]*class="[^"]*supplier-payables-report-table[^"]*"[^>]*>.*?<\/table>/s',
$response->getContent(),
$tableMatch
),
'供应商应付报表表格未找到。'
);
$this->assertCount(34, $columns[0]);
$table = $tableMatch[0];
$this->assertStringContainsString('<th colspan="2" class="group-closed freeze-column freeze-group">已销账供应商</th>', $table);
$this->assertStringContainsString('<th rowspan="2" class="freeze-column freeze-supplier">供应商简称</th>', $table);
$this->assertStringContainsString('已销账供应商', $table);
$this->assertStringContainsString('本月采购金额', $table);
$this->assertStringContainsString('<th class="group-addition">加</th>', $table);
$this->assertStringContainsString('<th colspan="3" class="group-payment">单位：元</th>', $table);
$this->assertStringContainsString('<th class="group-payment">供应商余额</th>', $table);
$this->assertStringNotContainsString('对公打款金额', $table);
$this->assertStringNotContainsString('对私打款金额', $table);
$this->assertStringNotContainsString('已销账金额', $table);
$this->assertStringNotContainsString('对私原因', $table);
$this->assertStringContainsString('最晚出账单时间（新执行标准）', $table);
preg_match_all('/<col(?:\s|>)/', $table, $columns);
$this->assertCount(30, $columns[0]);
}
public function testProductPricesPageUsesOperationsReplicaPriceLimitFields(): void