地区
This commit is contained in:
parent
f6822d2411
commit
ea78619f5f
File diff suppressed because it is too large
Load Diff
@ -37,6 +37,7 @@ export function FinanceRechargeDetailList({
|
|||||||
onRefreshGooglePaid,
|
onRefreshGooglePaid,
|
||||||
onReload,
|
onReload,
|
||||||
regions,
|
regions,
|
||||||
|
regionsByApp,
|
||||||
summary,
|
summary,
|
||||||
}) {
|
}) {
|
||||||
const [expandedId, setExpandedId] = useState("");
|
const [expandedId, setExpandedId] = useState("");
|
||||||
@ -231,7 +232,7 @@ export function FinanceRechargeDetailList({
|
|||||||
</AmountText>
|
</AmountText>
|
||||||
</td>
|
</td>
|
||||||
<td className="r num">{taxDeductionText(item)}</td>
|
<td className="r num">{taxDeductionText(item)}</td>
|
||||||
<td>{regionText(item, regionNames)}</td>
|
<td>{regionText(item, regionsByApp, apps, !filters.appCode)}</td>
|
||||||
</tr>
|
</tr>
|
||||||
{expanded ? (
|
{expanded ? (
|
||||||
<tr className="finance-detailrow">
|
<tr className="finance-detailrow">
|
||||||
@ -445,12 +446,15 @@ function appName(appCode, apps) {
|
|||||||
return (apps || []).find((app) => app.appCode === appCode)?.appName || appCode || "-";
|
return (apps || []).find((app) => app.appCode === appCode)?.appName || appCode || "-";
|
||||||
}
|
}
|
||||||
|
|
||||||
function regionText(item, regionNames) {
|
// regionText 解析区域列:全部 App 视图下带上 App 前缀(如 “Lalu-南亚区”),单 App 视图只显示区域名。
|
||||||
|
function regionText(item, regionsByApp, apps, withAppPrefix) {
|
||||||
const regionId = item.targetRegionId || item.sellerRegionId;
|
const regionId = item.targetRegionId || item.sellerRegionId;
|
||||||
if (!regionId) {
|
if (!regionId) {
|
||||||
return "—";
|
return "—";
|
||||||
}
|
}
|
||||||
return regionNames.get(String(regionId)) || `区域 ${regionId}`;
|
const appRegions = (regionsByApp || {})[item.appCode] || [];
|
||||||
|
const name = appRegions.find((region) => String(region.regionId) === String(regionId))?.name || `区域 ${regionId}`;
|
||||||
|
return withAppPrefix ? `${appName(item.appCode, apps)}-${name}` : name;
|
||||||
}
|
}
|
||||||
|
|
||||||
function secondaryOrderNo(item) {
|
function secondaryOrderNo(item) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user