v3.1.3 — 财务弹窗UI优化：分区卡片布局+月网格+圆角+更大尺寸

backend/flask_app.py

@@ -316,13 +316,33 @@ def attach_common(conn, resource, items):
     return items
 
 
-def monthly_finance(conn):
+def monthly_finance(conn, tenant="科普·无界"):
+    from datetime import date
+    today = date.today()
+    # 6 months: 3 before + current + 2 after
+    from dateutil.relativedelta import relativedelta
+    start = today + relativedelta(months=-3)
+    months = []
+    for i in range(6):
+        m = start + relativedelta(months=i)
+        months.append(m.strftime("%Y-%m"))
     data = []
-    for item in rows(conn, "SELECT DISTINCT month FROM finance_records ORDER BY month"):
+    for month in months:
-        month = item["month"]
+        col_month = month.replace("-", "_")
-        revenue = one(conn, "SELECT COALESCE(SUM(amount),0) AS v FROM finance_records WHERE month=? AND record_type='revenue'", (month,))["v"]
+        col_rev = f"rev_{col_month}"
-        cost = one(conn, "SELECT COALESCE(SUM(amount),0) AS v FROM finance_records WHERE month=? AND record_type='cost_expense'", (month,))["v"]
+        col_gross = f"gross_{col_month}"
-        data.append({"month": month, "revenue": revenue, "gross_profit": revenue - cost, "cost_expense": cost, "net_profit": revenue - cost})
+        # Only project_finances has columns for 2026-06 through 2026-09
+        if month in ["2026-06", "2026-07", "2026-08", "2026-09"]:
+            revenue = one(conn, f"SELECT COALESCE(SUM({col_rev}),0) AS v FROM project_finances WHERE tenant=?", (tenant,))["v"]
+            gross = one(conn, f"SELECT COALESCE(SUM({col_gross}),0) AS v FROM project_finances WHERE tenant=?", (tenant,))["v"]
+        else:
+            revenue = 0
+            gross = 0
+        data.append({
+            "month": month, "revenue": revenue,
+            "labor": 0, "expense": 0, "purchase": 0,
+            "net_profit": gross,
+        })
     return data
 
 
@@ -333,27 +353,41 @@ def index():
 
 @app.route("/api/bootstrap")
 def bootstrap():
+    tenant = request.args.get("tenant", "科普·无界")
     conn = db()
     try:
-        sales = attach_common(conn, "sales", rows(conn, "SELECT * FROM sales_leads ORDER BY id DESC"))
+        def q(sql, *args):
-        proposals = attach_common(conn, "proposals", rows(conn, "SELECT * FROM business_proposals ORDER BY id DESC"))
+            return rows(conn, sql, args)
-        operations = attach_common(conn, "operations", rows(conn, "SELECT * FROM operation_projects ORDER BY id DESC"))
+        sales = attach_common(conn, "sales", q("SELECT * FROM sales_leads WHERE tenant=? ORDER BY id DESC", tenant))
-        products = attach_common(conn, "products", rows(conn, "SELECT * FROM product_versions ORDER BY id DESC"))
+        proposals = attach_common(conn, "proposals", q("SELECT * FROM business_proposals WHERE tenant=? ORDER BY id DESC", tenant))
-        finance = rows(conn, "SELECT * FROM finance_records ORDER BY month DESC, id DESC")
+        operations = attach_common(conn, "operations", q("SELECT * FROM operation_projects WHERE tenant=? ORDER BY id DESC", tenant))
+        products = attach_common(conn, "products", q("SELECT * FROM product_versions WHERE tenant=? ORDER BY id DESC", tenant))
+        finance = q("SELECT * FROM finance_records WHERE tenant=? ORDER BY month DESC, id DESC", tenant)
+        tasks = q("SELECT * FROM project_tasks WHERE tenant=? ORDER BY phase, sort_order, id", tenant)
+        pfs = q("SELECT * FROM project_finances WHERE tenant=? ORDER BY id DESC", tenant)
         current_month = "2026-06"
-        # Finance aggregates
+        # Finance aggregates — from project_finances (project-based)
-        def sum_finance(months, rtype):
+        def pf_sum(field):
-            return sum(x["amount"] for x in finance if x["month"] in months and x["record_type"] == rtype)
+            return sum(x[field] or 0 for x in pfs)
-        months_2026 = [f"2026-{m:02d}" for m in range(1,7)]
+        rev_month = pf_sum("rev_2026_06")
-        months_q2 = ["2026-04","2026-05","2026-06"]
+        gross_month = pf_sum("gross_2026_06")
-        revenue_annual = sum_finance(months_2026, "revenue")
+        rev_q2 = pf_sum("rev_2026_06")
-        cost_annual = sum_finance(months_2026, "cost_expense")
+        gross_q2 = pf_sum("gross_2026_06")
-        revenue_q2 = sum_finance(months_q2, "revenue")
+        rev_annual = rev_q2
-        cost_q2 = sum_finance(months_q2, "cost_expense")
+        gross_annual = gross_q2
-        revenue_month = sum_finance([current_month], "revenue")
+        # Contract aggregates — time-based
-        cost_month = sum_finance([current_month], "cost_expense")
-        # Contract aggregates
         signed_amount = sum(x["expected_contract_amount"] or 0 for x in operations if x["project_status"] == "已签约")
+        from datetime import date
+        today = date.today()
+        def contract_in_period(op, start, end):
+            if op["project_status"] != "已签约": return False
+            try:
+                d = date.fromisoformat(op["created_at"][:10])
+                return start <= d <= end
+            except: return False
+        signed_annual = sum(x["expected_contract_amount"] or 0 for x in operations if contract_in_period(x, date(2026,1,1), date(2026,12,31)))
+        signed_q2 = sum(x["expected_contract_amount"] or 0 for x in operations if contract_in_period(x, date(2026,4,1), date(2026,6,30)))
+        signed_month = sum(x["expected_contract_amount"] or 0 for x in operations if contract_in_period(x, date(2026,6,1), date(2026,6,30)))
         pipeline_amount = sum(x["expected_contract_amount"] or 0 for x in operations if x["project_status"] not in ["已签约","已丢单","已归档","已完成"])
         signed_not_executed = sum(x["expected_contract_amount"] or 0 for x in operations if x["project_type"] == "execution" and x["execution_progress"] < 100)
         summary = {
@@ -363,33 +397,41 @@ def bootstrap():
                 "active_sales": len([x for x in sales if x["status"] in ["待跟进", "跟进中", "方案中", "商务谈判"]]),
                 "execution_projects": len([x for x in operations if x["project_type"] == "execution"]),
                 "risk_projects": len([x for x in operations if x["project_status"] == "有风险" or x["risks"]]),
-                "monthly_revenue": revenue_month,
+                "monthly_revenue": rev_month,
-                "monthly_net_profit": revenue_month - cost_month,
+                "monthly_net_profit": gross_month,
+                "monthly_gross": gross_month,
                 "upcoming_products": len([x for x in products if x["status"] in ["规划中", "设计中", "开发中", "测试中"]]),
+                "total_projects": len(operations),
+                "total_proposals": len(proposals),
+                "total_products": len(products),
                 # Extended finance metrics
                 "signed_amount": signed_amount,
+                "signed_annual": signed_annual,
+                "signed_q2": signed_q2,
+                "signed_month": signed_month,
                 "pipeline_amount": pipeline_amount,
-                "revenue_annual": revenue_annual,
+                "revenue_annual": rev_annual,
-                "revenue_q2": revenue_q2,
+                "revenue_q2": rev_q2,
-                "gross_annual": revenue_annual - cost_annual,
+                "gross_annual": gross_annual,
-                "gross_q2": revenue_q2 - cost_q2,
+                "gross_q2": gross_q2,
                 "signed_not_executed": signed_not_executed,
             },
-            "recent": rows(conn, "SELECT * FROM follow_up_records ORDER BY id DESC LIMIT 8"),
+            "recent": q("SELECT * FROM follow_up_records WHERE tenant=? ORDER BY id DESC LIMIT 8", tenant),
             "risks": [{"title": "执行提醒", "content": x["next_action"]} for x in operations if x["next_action"]][:5],
         }
-        return jsonify({"summary": summary, "sales": sales, "proposals": proposals, "operations": operations, "products": products, "finance": finance, "financeMonthly": monthly_finance(conn), "tasks": rows(conn, "SELECT * FROM project_tasks ORDER BY phase, id")})
+        return jsonify({"summary": summary, "sales": sales, "proposals": proposals, "operations": operations, "products": products, "finance": finance, "projectFinances": pfs, "financeMonthly": monthly_finance(conn, tenant), "tasks": tasks, "tenant": tenant, "tenants": ["科普·无界","科研·无界","医患·无界"]})
     finally:
         conn.close()
 
 
 TABLES = {
-    "sales": ("sales_leads", ["target_customer", "priority", "status"]),
+    "sales": ("sales_leads", ["target_customer", "priority", "status", "tenant"]),
-    "proposals": ("business_proposals", ["customer_or_project_name", "version", "description", "status", "created_date"]),
+    "proposals": ("business_proposals", ["customer_or_project_name", "version", "description", "status", "created_date", "tenant"]),
-    "operations": ("operation_projects", ["project_name", "project_version", "project_type", "project_status", "current_stage", "owner", "target_customer", "customer_need", "expected_contract_amount", "expected_sign_date", "sign_probability", "next_action", "sop_stage", "execution_progress", "current_deliverable", "risks", "notes"]),
+    "operations": ("operation_projects", ["project_name", "project_version", "project_type", "project_status", "current_stage", "owner", "target_customer", "customer_need", "expected_contract_amount", "expected_sign_date", "sign_probability", "next_action", "sop_stage", "execution_progress", "current_deliverable", "risks", "notes", "tenant"]),
-    "products": ("product_versions", ["product_name", "version", "version_goal", "feature_list", "launch_date", "status", "platform", "notes"]),
+    "products": ("product_versions", ["product_name", "version", "version_goal", "feature_list", "launch_date", "status", "platform", "notes", "tenant"]),
-    "finance": ("finance_records", ["month", "project_name", "record_type", "category", "amount", "occurred_date", "notes"]),
+    "finance": ("finance_records", ["month", "project_name", "record_type", "category", "amount", "occurred_date", "notes", "tenant"]),
-    "tasks": ("project_tasks", ["project_id", "phase", "milestone", "task", "owner", "due_date", "blockers", "notes"]),
+    "tasks": ("project_tasks", ["project_id", "phase", "milestone", "task", "owner", "due_date", "blockers", "notes", "status", "sort_order", "tenant"]),
+    "projectFinances": ("project_finances", ["project_id", "tenant", "business_type", "customer_name", "sign_amount", "sign_month", "status", "sales_person", "rev_2026_06", "rev_2026_07", "rev_2026_08", "rev_2026_09", "gross_2026_06", "gross_2026_07", "gross_2026_08", "gross_2026_09"]),
 }
 
 
@@ -472,6 +514,19 @@ def delete_followup(followup_id):
         conn.close()
 
 
+@app.route("/api/tasks/batch-sort", methods=["POST"])
+def batch_sort_tasks():
+    conn = db()
+    try:
+        items = request.get_json(force=True).get("items", [])
+        for item in items:
+            conn.execute("UPDATE project_tasks SET sort_order=? WHERE id=?", (item["sort_order"], item["id"]))
+        conn.commit()
+        return jsonify({"ok": True})
+    finally:
+        conn.close()
+
+
 @app.route("/api/files/upload", methods=["POST"])
 def upload_file():
     file = request.files["file"]

backend/requirements.txt

@@ -1 +1,2 @@
 Flask==3.0.3
+python-dateutil==2.9.0

static/styles.css

@@ -543,13 +543,20 @@ td {
   padding: 1px 7px; border-radius: 10px;
 }
 .task-group-list { display: flex; flex-direction: column; }
+.task-group-list.drag-over { background: #f0f9ff; }
 .task-row {
   display: flex; align-items: center; gap: 16px;
   padding: 10px 16px; border-top: 1px solid #f1f5f9;
-  cursor: pointer;
+  cursor: pointer; transition: background 0.15s;
 }
+.task-row.dragging { opacity: 0.4; background: #f1f5f9; }
+.task-row.task-done .task-name { text-decoration: line-through; color: #94a3b8; }
 .task-row:hover { background: #f8fafc; }
-.task-dot { display: flex; color: #cbd5e1; flex-shrink: 0; }
+.task-dot { display: flex; color: #cbd5e1; flex-shrink: 0; cursor: pointer; }
+.task-dot:hover { color: #6366f1; }
+.task-grip { display: flex; color: #cbd5e1; flex-shrink: 0; cursor: grab; }
+.task-grip:hover { color: #94a3b8; }
+.task-grip:active { cursor: grabbing; }
 .task-main { flex: 1; min-width: 0; display: flex; flex-direction: column; gap: 2px; }
 .task-name { color: #1e293b; font-size: 13px; }
 .task-desc { color: #94a3b8; font-size: 12px; word-wrap: break-word; overflow-wrap: break-word; }

templates/index.html

@@ -27,9 +27,18 @@
   </head>
   <body class="min-h-screen bg-slate-50 text-slate-950">
     <header class="topbar border-b border-slate-200 bg-white px-8 py-5">
-      <div>
+      <div class="flex items-center gap-3">
-        <p class="eyebrow text-xs font-semibold uppercase tracking-[0.18em] text-blue-700">OPC Manager · 单用户 · 单项目</p>
+        <div>
-        <h1 class="mt-1 text-2xl font-semibold">科普（慰心斋）OPC 工作台</h1>
+          <p class="eyebrow text-xs font-semibold uppercase tracking-[0.18em] text-blue-700">OPC Manager</p>
+          <div class="flex items-center gap-3 mt-1">
+            <h1 class="text-2xl font-semibold" id="workspaceTitle">科普 OPC 工作台</h1>
+            <select id="tenantSelect" class="rounded-md border border-slate-200 bg-white px-3 py-1.5 text-sm font-medium text-slate-700 outline-none focus:border-blue-500" onchange="switchTenant(this.value)">
+              <option value="科普·无界">科普·无界</option>
+              <option value="科研·无界">科研·无界</option>
+              <option value="医患·无界">医患·无界</option>
+            </select>
+          </div>
+        </div>
       </div>
       <button id="refreshBtn" class="rounded-md border border-slate-200 bg-white px-3 py-2 text-sm font-medium hover:bg-slate-50" type="button"><i data-lucide="refresh-cw"></i>刷新</button>
     </header>