{dimension === "person" ? (
+ ) : dimension === "operatorApp" ? (
+
) : (
)}
@@ -341,6 +358,118 @@ function AttainmentBar({ rate }) {
);
}
+// App 总目标进度条：不分运营的全员共同目标（kpi.app_rows）。
+function AppTargetStrip({ appCodes, appRows, remainingDays }) {
+ return (
+
+ {appRows.map((row) => {
+ const gap = gapMinorOf(row.month_target_usd_minor, row.month_recharge_usd_minor);
+ return (
+
+
+
+
+ {row.app_name || row.app_code}
+
+ App 总目标
+ {row.data_error ? (
+
+ 数据异常
+
+ ) : null}
+
+
+ {formatMoneyMinor(row.month_recharge_usd_minor)}
+ / 目标 {row.month_target_usd_minor > 0 ? formatMoneyMinor(row.month_target_usd_minor) : "未设"}
+
+
+
+ {[
+ `${formatCount(row.operator_count)} 名运营`,
+ `区间充值 ${formatMoneyMinor(row.range_recharge_usd_minor)}`,
+ `需日均 ${dailyNeedText(gap, remainingDays)}`
+ ].join(" · ")}
+
+
+ );
+ })}
+
+ );
+}
+
+// 人员×App 小计表：该运营在此 App 下全部负责区域的合计与其 App 级目标。
+function OperatorAppTable({ appCodes, remainingDays, rows }) {
+ return (
+
+
+
+ | 名次 |
+ 运营人员 |
+ App |
+ 负责区域 |
+
+ 区间充值
+ |
+
+ 当月充值
+ |
+
+ App 月目标
+ |
+
+ 达成率
+ |
+
+ 需日均
+ |
+
+
+
+ {rows.map((row, index) => {
+ const item = row.item;
+ const gap = gapMinorOf(item.month_target_usd_minor, item.month_recharge_usd_minor);
+ return (
+
+ |
+
+ |
+
+
+
+ {operatorLabelOf(item)}
+ {item.data_error ? (
+
+ 数据异常
+
+ ) : null}
+
+ {[item.operator_account, item.team || "未分组"].filter(Boolean).join(" · ")}
+
+ |
+
+
+
+ {item.app_name || item.app_code}
+
+ |
+
+ {item.whole_app_scope ? "全部区域" : item.region_names || `${formatCount(item.region_count)} 个区域`}
+ |
+ {formatMoneyMinor(item.range_recharge_usd_minor)} |
+ {formatMoneyMinor(item.month_recharge_usd_minor)} |
+ {formatMoneyMinor(item.month_target_usd_minor)} |
+
+
+ |
+ {dailyNeedText(gap, remainingDays)} |
+
+ );
+ })}
+
+
+ );
+}
+
function PersonTable({ appCodes, remainingDays, rows }) {
return (
@@ -456,10 +585,53 @@ function TeamTable({ rows }) {
);
}
-// 配置目标抽屉：按 运营人员 × App × 区域 编辑当月/当日充值目标（美元），
-// 保存走 PUT /admin/databi/social/kpi-targets（replaceSocialBiKpiTargets），月/日目标填 0 表示清除。
+function draftInvalid(draft) {
+ return usdInputToMinor(draft.monthText) === null || usdInputToMinor(draft.dailyText) === null;
+}
+
+function TargetInputCell({ draft, label, onChange }) {
+ return (
+
+ );
+}
+
+// 配置目标抽屉：三级目标——
+// ① App 总目标（不分运营的全员共同目标） ② 运营×App 总目标（该运营在此 App 的总盘子）
+// ③ 运营×App×区域 明细目标。月/日目标同时填 0 表示清除该条。
function KpiTargetDrawer({ appCodes, kpi, onClose, onSaved }) {
- const [drafts, setDrafts] = useState(() =>
+ const [appDrafts, setAppDrafts] = useState(() =>
+ (kpi.app_rows || []).map((row) => ({
+ appCode: row.app_code,
+ appName: row.app_name || row.app_code,
+ dailyText: usdInputText(row.daily_target_usd_minor),
+ monthText: usdInputText(row.month_target_usd_minor)
+ }))
+ );
+ // 整 App 范围（region 0）的运营在明细区已有"全部区域"行（同一存储键），此处排除避免同键两处编辑。
+ const [groupDrafts, setGroupDrafts] = useState(() =>
+ (kpi.operator_app_rows || [])
+ .filter((row) => !row.whole_app_scope)
+ .map((row) => ({
+ appCode: row.app_code,
+ appName: row.app_name || row.app_code,
+ dailyText: usdInputText(row.daily_target_usd_minor),
+ monthText: usdInputText(row.month_target_usd_minor),
+ operatorAccount: row.operator_account || "",
+ operatorLabel: row.operator_name || row.operator_account || `#${row.operator_user_id}`,
+ regionNames: row.region_names || "",
+ userId: row.operator_user_id
+ }))
+ );
+ const [regionDrafts, setRegionDrafts] = useState(() =>
(kpi.items || []).map((item) => ({
appCode: item.app_code,
appName: item.app_name || item.app_code,
@@ -475,27 +647,45 @@ function KpiTargetDrawer({ appCodes, kpi, onClose, onSaved }) {
const [isSaving, setIsSaving] = useState(false);
const [saveError, setSaveError] = useState("");
- const hasInvalid = drafts.some(
- (draft) => usdInputToMinor(draft.monthText) === null || usdInputToMinor(draft.dailyText) === null
- );
+ const hasInvalid = [...appDrafts, ...groupDrafts, ...regionDrafts].some(draftInvalid);
+ const hasRows = appDrafts.length > 0 || groupDrafts.length > 0 || regionDrafts.length > 0;
- const updateDraft = (index, key, value) => {
+ const updateAt = (setDrafts) => (index, key, value) => {
setDrafts((current) => current.map((draft, draftIndex) => (draftIndex === index ? { ...draft, [key]: value } : draft)));
};
+ const updateAppDraft = updateAt(setAppDrafts);
+ const updateGroupDraft = updateAt(setGroupDrafts);
+ const updateRegionDraft = updateAt(setRegionDrafts);
const handleSave = async () => {
- const payload = drafts.map((draft) => ({
+ const items = [
+ ...groupDrafts.map((draft) => ({
+ appCode: draft.appCode,
+ dailyTargetUsdMinor: usdInputToMinor(draft.dailyText),
+ periodMonth: kpi.period_month,
+ regionId: 0,
+ targetUsdMinor: usdInputToMinor(draft.monthText),
+ userId: draft.userId
+ })),
+ ...regionDrafts.map((draft) => ({
+ appCode: draft.appCode,
+ dailyTargetUsdMinor: usdInputToMinor(draft.dailyText),
+ periodMonth: kpi.period_month,
+ regionId: draft.regionId,
+ targetUsdMinor: usdInputToMinor(draft.monthText),
+ userId: draft.userId
+ }))
+ ];
+ const appItems = appDrafts.map((draft) => ({
appCode: draft.appCode,
dailyTargetUsdMinor: usdInputToMinor(draft.dailyText),
periodMonth: kpi.period_month,
- regionId: draft.regionId,
- targetUsdMinor: usdInputToMinor(draft.monthText),
- userId: draft.userId
+ targetUsdMinor: usdInputToMinor(draft.monthText)
}));
setIsSaving(true);
setSaveError("");
try {
- await replaceSocialBiKpiTargets(payload);
+ await replaceSocialBiKpiTargets({ appItems, items });
onSaved();
} catch (error) {
setSaveError(error?.message || "保存失败，请稍后重试");
@@ -509,72 +699,164 @@ function KpiTargetDrawer({ appCodes, kpi, onClose, onSaved }) {
- {drafts.length ? (
-
+ {hasRows ? (
+ <>
+ {appDrafts.length ? (
+
+ App 总目标 不分运营的全员共同目标
+
+
+
+
+ | App |
+ 当月目标 ($) |
+ 当日目标 ($) |
+
+
+
+ {appDrafts.map((draft, index) => (
+
+ |
+
+
+ {draft.appName}
+
+ |
+
+ updateAppDraft(index, "monthText", event.target.value)}
+ />
+ |
+
+ updateAppDraft(index, "dailyText", event.target.value)}
+ />
+ |
+
+ ))}
+
+
+
+ ) : null}
+ {groupDrafts.length ? (
+
+ 运营 × App 总目标 该运营在此 App 全部负责区域的总盘子
+
+
+
+
+ | 运营人员 |
+ App |
+ 负责区域 |
+ 当月目标 ($) |
+ 当日目标 ($) |
+
+
+
+ {groupDrafts.map((draft, index) => (
+
+ |
+
+
+ {draft.operatorLabel}
+
+ {draft.operatorAccount ? {draft.operatorAccount} : null}
+
+ |
+
+
+
+ {draft.appName}
+
+ |
+ {draft.regionNames} |
+
+ updateGroupDraft(index, "monthText", event.target.value)}
+ />
+ |
+
+ updateGroupDraft(index, "dailyText", event.target.value)}
+ />
+ |
+
+ ))}
+
+
+
+ ) : null}
+ {regionDrafts.length ? (
+
+ 运营 × App × 区域 明细目标
+
+
+
+
+ | 运营人员 |
+ App |
+ 区域 |
+ 当月目标 ($) |
+ 当日目标 ($) |
+
+
+
+ {regionDrafts.map((draft, index) => (
+
+ |
+
+
+ {draft.operatorLabel}
+
+ {draft.operatorAccount ? {draft.operatorAccount} : null}
+
+ |
+
+
+
+ {draft.appName}
+
+ |
+ {draft.regionName} |
+
+ updateRegionDraft(index, "monthText", event.target.value)}
+ />
+ |
+
+ updateRegionDraft(index, "dailyText", event.target.value)}
+ />
+ |
+
+ ))}
+
+
+
+ ) : null}
+
) : (
暂无可配置的目标行
@@ -591,7 +873,7 @@ function KpiTargetDrawer({ appCodes, kpi, onClose, onSaved }) {
-
@@ -104,10 +105,12 @@ export function FinanceShell({
{loading ? : null}
-
-
{VIEW_TITLES[activeView] || "财务系统"}
- {subtitle ? {subtitle} : null}
-
+ {appBar || (
+
+
{VIEW_TITLES[activeView] || "财务系统"}
+ {subtitle ? {subtitle} : null}
+
+ )}
{toolbar ? {toolbar}
: null}
{children}
diff --git a/finance/src/styles/index.css b/finance/src/styles/index.css
index 525de58..e00d7b5 100644
--- a/finance/src/styles/index.css
+++ b/finance/src/styles/index.css
@@ -747,7 +747,7 @@ a {
flex-wrap: wrap;
align-items: center;
gap: var(--space-2);
- margin-bottom: var(--space-4);
+ margin-right: auto;
}
.finance-appchip {
diff --git a/src/shared/api/generated/schema.d.ts b/src/shared/api/generated/schema.d.ts
index 1dfd3a4..e834f85 100644
--- a/src/shared/api/generated/schema.d.ts
+++ b/src/shared/api/generated/schema.d.ts
@@ -7133,6 +7133,14 @@ export interface operations {
/** Format: int64 */
dailyTargetUsdMinor?: number;
}[];
+ appItems?: {
+ appCode?: string;
+ periodMonth?: string;
+ /** Format: int64 */
+ targetUsdMinor?: number;
+ /** Format: int64 */
+ dailyTargetUsdMinor?: number;
+ }[];
};
};
};