v2.0.1 — 财务表单简化:日月合并+去类型+分类含签单+日历控件

This commit is contained in:
mac
2026-06-16 15:47:04 +08:00
parent c42abb05da
commit af4ae1cbc3

View File

@@ -230,7 +230,21 @@ window.submitTaskForm = async (event, projectId) => {
alert("保存失败:" + error.message);
}
};
window.createFinance = (event) => createResource(event, "finance");
window.createFinance = async (event) => {
event.preventDefault();
const data = Object.fromEntries(new FormData(event.currentTarget).entries());
// Map form: month(date)→month(YYYY-MM), category→category, amount, tenant
data.month = data.month.substring(0, 7);
data.project_name = state.tenant;
data.tenant = state.tenant;
data.record_type = "revenue"; // default, will be adjusted by category
try {
await api("/api/finance", { method: "POST", body: JSON.stringify({ data }) });
await load();
} catch (error) {
alert("新增失败:" + error.message);
}
};
window.switchTab = switchTab;
window.switchTenant = (tenant) => {
state.tenant = tenant;
@@ -405,17 +419,15 @@ function renderProducts() {
}
function renderFinance() {
const rows = state.data.finance.map((x) => [x.month, badge(x.record_type === "revenue" ? "收入" : "成本/费用"), x.category, money(x.amount), x.occurred_date, text(x.notes)]);
const rows = state.data.finance.map((x) => [x.month, x.category, money(x.amount), text(x.notes)]);
document.querySelector("#finance").innerHTML = `<div class="grid gap-4">
${card(`<h2 class="mb-4 text-lg font-bold">收入、毛利、成本/费用、净利月度曲线</h2><div style="position:relative;height:300px"><canvas id="financeChart2"></canvas></div>`, "p-5")}
${card(formHtml([
{ label: "月份", input: `<input name="month" required placeholder="YYYY-MM" pattern="\\d{4}-\\d{2}">` },
{ label: "类", input: `<select name="record_type"><option value="revenue">收入</option><option value="cost_expense">/</option></select>` },
{ label: "分类", input: `<input name="category" required>` },
{ label: "日期", input: `<input name="month" type="date" required>` },
{ label: "类", input: `<select name="category"><option>收入</option><option>/</option><option></option></select>` },
{ label: "金额/万", input: `<input name="amount" type="number" step="0.01" required>` },
{ label: "发生日期", input: `<input name="occurred_date" type="date">` },
], { handler: "createFinance", text: "新增明细" }), "p-4")}
${renderTable(["月份", "类型", "分类", "金额", "发生日期", "备注"], rows)}
${renderTable(["日期", "分类", "金额", "备注"], rows)}
</div>`;
renderChartOn("financeChart2", state.data.financeMonthly);
}