账单页签:总账备注下拉候选合并科目映射表的财务备注
- 之前候选只来自总账备注映射表,科目映射表里新加的备注在下拉里选不到 - 现在两个来源取并集,改完映射表下一次请求即可筛选
This commit is contained in:
parent
dd03037105
commit
951fde9c46
@ -162,6 +162,7 @@ class AccountLedgerRemarkMap
|
||||
{
|
||||
$map = $this->map();
|
||||
$remarks = [];
|
||||
$rulesByPlatform = $this->accountMappingRulesByPlatform();
|
||||
foreach ($this->platformsForTab($tab) as $platform) {
|
||||
foreach (array_values($map[$platform] ?? []) as $remark) {
|
||||
$remark = trim((string) $remark);
|
||||
@ -169,6 +170,16 @@ class AccountLedgerRemarkMap
|
||||
$remarks[$remark] = true;
|
||||
}
|
||||
}
|
||||
// 「财务规则 › 科目映射表」里的财务备注同样作为候选,
|
||||
// 否则新加的备注要等总账备注映射表同步后才能在下拉里选到。
|
||||
foreach ($rulesByPlatform[$this->normalizeKey($platform)] ?? [] as $rules) {
|
||||
foreach ($rules as $rule) {
|
||||
$memo = trim((string) ($rule['memo'] ?? ''));
|
||||
if ($memo !== '') {
|
||||
$remarks[$memo] = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$list = array_keys($remarks);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user