From af4ae1cbc3b1b6de0cd0cbf8f0eb30dd1db512f1 Mon Sep 17 00:00:00 2001
From: mac <mac@Qiukais-m1-macPro.local>
Date: Tue, 16 Jun 2026 15:47:04 +0800
Subject: [PATCH] =?UTF-8?q?v2.0.1=20=E2=80=94=20=E8=B4=A2=E5=8A=A1?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E7=AE=80=E5=8C=96=EF=BC=9A=E6=97=A5=E6=9C=88?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6+=E5=8E=BB=E7=B1=BB=E5=9E=8B+=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E5=90=AB=E7=AD=BE=E5=8D=95+=E6=97=A5=E5=8E=86?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/app.js | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/static/app.js b/static/app.js
index b40ca27..3a41652 100644
--- a/static/app.js
+++ b/static/app.js
@@ -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);
 }