feat: 计划模块 + 待签约迁移 + 表格排序 + 已签约→项目

- 新增计划模块(plan_finances/plan_expense_records, 侧边栏计划tab)
- 待签约项目自动迁移到计划模块(data_fixes 幂等)
- 已签约tab改名为项目(业务+计划两个模块)
- 业务模块表格点击列头排序(月度/季度/总视图)
- 计划与业务侧边栏位置对调
- plan模块CSS修复(使用finance-tab类)
- 版本号 v1.0.0.17

backend/migrations/__init__.py

@@ -17,7 +17,7 @@ def run_migrations():
     """
     from migrations.tables import migrate_create_tables
     from migrations.columns import migrate_add_columns
-    from migrations.data_fixes import migrate_fix_task_status, migrate_rename_tenant, migrate_drop_product_fields, migrate_fix_service_fee_standard
+    from migrations.data_fixes import migrate_fix_task_status, migrate_rename_tenant, migrate_drop_product_fields, migrate_fix_service_fee_standard, migrate_fix_expense_status, migrate_move_pending_to_plan
     from migrations.data_split import migrate_data_split
     from migrations.seed import migrate_seed_users, migrate_seed_demo_data
 
@@ -27,6 +27,8 @@ def run_migrations():
     migrate_rename_tenant()
     migrate_drop_product_fields()
     migrate_fix_service_fee_standard()
+    migrate_fix_expense_status()
+    migrate_move_pending_to_plan()
     migrate_data_split()
     migrate_seed_users()
     migrate_seed_demo_data()

backend/migrations/columns.py

@@ -105,6 +105,8 @@ def migrate_add_columns():
             "ALTER TABLE expense_records ADD COLUMN expense_month VARCHAR(20) NOT NULL DEFAULT ''")
         _add_column_if_missing(conn, "expense_records", "incurred_amount",
             "ALTER TABLE expense_records ADD COLUMN incurred_amount DOUBLE NOT NULL DEFAULT 0")
+        _add_column_if_missing(conn, "expense_records", "status",
+            "ALTER TABLE expense_records ADD COLUMN status VARCHAR(50) NOT NULL DEFAULT '计入费用'")
 
         # project_finances 费用明细 JSON 数据
         _add_column_if_missing(conn, "project_finances", "expense_data",

backend/migrations/data_fixes.py

@@ -92,3 +92,51 @@ def migrate_fix_service_fee_standard():
             print(f"[migrate] project_finances: {affected} 条记录 service_fee_standard 修正为 5")
     finally:
         conn.close()
+
+
+def migrate_fix_expense_status():
+    """修正 expense_records 中空的 status 为默认值「计入费用」"""
+    from db import db
+
+    conn = db()
+    try:
+        cur = conn.cursor()
+        cur.execute(
+            "UPDATE expense_records SET status='计入费用' "
+            "WHERE status IS NULL OR status='' OR status='待审批'"
+        )
+        affected = cur.rowcount
+        cur.close()
+        if affected:
+            conn.commit()
+            print(f"[migrate] expense_records: {affected} 条记录 status 修正为 '计入费用'")
+    finally:
+        conn.close()
+
+
+def migrate_move_pending_to_plan():
+    """迁移业务待签约项目到计划模块（幂等）"""
+    from db import db
+
+    conn = db()
+    try:
+        cur = conn.cursor()
+        # 仅迁移 id 不存在于计划表的待签约项目
+        cur.execute(
+            "INSERT INTO plan_finances "
+            "SELECT * FROM project_finances WHERE status='待签约' "
+            "AND id NOT IN (SELECT id FROM plan_finances)"
+        )
+        moved = cur.rowcount
+        if moved:
+            # 删除已迁移的原记录
+            cur.execute(
+                "DELETE FROM project_finances WHERE status='待签约' "
+                "AND id IN (SELECT id FROM plan_finances)"
+            )
+            deleted = cur.rowcount
+            conn.commit()
+            print(f"[migrate] 待签约项目迁移到计划: {moved} 条 (已删除 {deleted} 条)")
+        cur.close()
+    finally:
+        conn.close()

backend/migrations/seed_data.py

@@ -1,127 +1,285 @@
-# seed_data.py — 初始示例数据填充（仅在空库时执行一次）
-# 从 flask_app.py 搬迁，被 migrations/seed.py 调用
+# seed_data.py — 丰富示例数据填充（仅在空库时执行一次）
+# 为每个工作台生成 > 1 亿的总规模，覆盖万/十万/百万/千万量级
+
+import json
+import random
+random.seed(42)
 
 from datetime import date
-from pathlib import Path
-from db import db, _exec, one, WEIXIN_BASE
-from helpers import add_file_index
+from db import db, _exec, one
+
+TENANTS = ["科普·无界", "科研·无界", "医患·无界", "MCN·无界", "学会·无界"]
+
+# 每个工作台的差异化客户和项目模板
+TENANT_CUSTOMERS = {
+    "科普·无界": [
+        ("信达生物", ["肿瘤免疫科普年度框架", "信迪利单抗医生教育", "CSCO卫星会项目", "患者随访管理系统"]),
+        ("百利天恒", ["BL-B01D1上市前教育", "双抗药物科普专区", "数字人患教视频"]),
+        ("齐鲁制药", ["多产品线医生教育", "安可达学术推广", "基层医疗科普巡讲"]),
+        ("天广实生物", ["血液肿瘤科普项目", "CD20单抗学术推广"]),
+        ("复星医药", ["复宏汉霖学术年会", "CAR-T患者教育"]),
+    ],
+    "科研·无界": [
+        ("北京协和医院", ["临床研究数据采集系统", "罕见病队列研究", "AI辅助诊断验证"]),
+        ("中国人民解放军总医院", ["战场创伤数据平台", "远程会诊系统"]),
+        ("复旦大学附属华山医院", ["脑卒中AI预警系统", "神经内科临床研究"]),
+        ("中山大学肿瘤防治中心", ["鼻咽癌早筛项目", "真实世界研究平台"]),
+        ("四川大学华西医院", ["精准医学大数据平台", "基层科研能力提升"]),
+    ],
+    "医患·无界": [
+        ("平安好医生", ["在线问诊科普内容", "慢病管理专区", "随访SOP标准化"]),
+        ("微医集团", ["互联网医院患教系统", "云药房科普推送"]),
+        ("丁香园", ["医生社区运营升级", "用药助手科普专区"]),
+        ("圆心科技", ["药房患者教育", "DTP药房随访管理", "罕见病用药指导"]),
+        ("国药控股", ["国药患者管理平台", "肿瘤药房随访系统"]),
+    ],
+    "MCN·无界": [
+        ("抖音健康", ["医学IP孵化矩阵", "短视频科普内容制作", "健康直播运营"]),
+        ("快手健康", ["医生个人IP打造", "快手健康科普专区"]),
+        ("小红书医美", ["皮肤健康科普矩阵", "医美科普合规审核"]),
+        ("B站知识区", ["深度科普纪录片", "医学动画制作"]),
+        ("微信视频号", ["医生科普直播运营", "企业微信科普推送"]),
+    ],
+    "学会·无界": [
+        ("中华医学会", ["学术年会数字化平台", "继续教育学分系统", "基层医生培训"]),
+        ("中国医师协会", ["医师定考管理系统", "专科医师培训平台"]),
+        ("中国抗癌协会", ["肿瘤科普万里行", "CACA指南推广"]),
+        ("中国药学会", ["合理用药科普平台", "药师继续教育"]),
+        ("中华护理学会", ["护理科研能力提升", "专科护士培训系统"]),
+    ],
+}
+
+# 签约金额模板：每个工作台的千万/百万/十万/万级别项目的签约金额
+def generate_sign_amounts():
+    amounts = []
+    # 千万级：2个（4000-7000万）
+    amounts.append(random.randint(4500, 7000) * 10000)
+    amounts.append(random.randint(4000, 6500) * 10000)
+    # 百万级：4个（400-980万）
+    for _ in range(4):
+        amounts.append(random.randint(400, 980) * 10000)
+    # 十万级：4个（30-98万）
+    for _ in range(4):
+        amounts.append(random.randint(30, 98) * 10000)
+    # 万级：3个（3-10万）
+    for _ in range(3):
+        amounts.append(random.randint(3, 10) * 10000)
+    return sorted(amounts, reverse=True)
+
+
+# 生成 budget_data JSON（每月确收/毛利/回款）
+def make_budget_data(sign_amount, signed_month, status):
+    """生成12个月的预算数据"""
+    months = []
+    start_m = int(signed_month.split("-")[1]) if signed_month else 1
+    rev_total = sign_amount if status == "已签约" else int(sign_amount * random.uniform(0.3, 0.7))
+    gross_rate = random.uniform(0.25, 0.55)
+    payment_rate = random.uniform(0.7, 0.95)
+
+    for i in range(12):
+        m = (start_m + i - 1) % 12 + 1
+        yr = 2026 + (start_m + i - 1) // 12
+        month_key = f"{yr}-{m:02d}"
+
+        # 越往后确收越多
+        progress = min(1.0, (i + 1) / max(1, random.randint(3, 8)))
+        rev = round(rev_total * progress * random.uniform(0.85, 1.15))
+        gross = round(rev * gross_rate * random.uniform(0.9, 1.1))
+        payment = round(rev * payment_rate * random.uniform(0.85, 1.15))
+        cost = round(rev * random.uniform(0.3, 0.5))
+        paid = round(cost * random.uniform(0.8, 1.0))
+
+        months.append({
+            "month": month_key,
+            "rev": rev,
+            "gross": gross,
+            "payment": payment,
+            "cost": cost,
+            "paid": paid,
+        })
+    return json.dumps(months)
+
+
+# 生成 expense_data（平台费用）
+def make_expense_data():
+    """生成若干条费用记录"""
+    items = []
+    expense_types = ["平台采购", "人力成本", "研发费用", "通用费用", "奖金"]
+    for q in range(1, 7):
+        for et in random.sample(expense_types, random.randint(2, 4)):
+            month_str = f"2026-{q:02d}"
+            amount = random.randint(5000, 150000)
+            incurred = int(amount * random.uniform(0.6, 1.0))
+            items.append({"month": month_str, "expense_type": et, "amount": amount, "incurred": incurred})
+    return json.dumps(items)
 
 
 def seed_db():
-    """填充初始示例数据（仅在空库时执行一次）"""
+    """填充丰富示例数据"""
     conn = db()
     try:
         if one(conn, "SELECT id FROM sales_leads LIMIT 1"):
-            return  # 已有数据，跳过
+            return
 
-        sales = [
-            ("齐鲁制药", "P0", "跟进中", "多产品线科普年度框架，需推进高层沟通。"),
-            ("百利天恒", "P0", "方案中", "BL-B01D1 上市前医生教育机会，准备方案。"),
-            ("信达生物", "P0", "已签约", "现有科普项目升级/续约，重点保障执行。"),
-            ("三生制药", "P1", "待跟进", "多科室医生教育+患者科普机会。"),
-            ("天广实生物", "P1", "待跟进", "血液肿瘤医生教育机会。"),
+        today = date.today().isoformat()
+        pf_ids = {}  # tenant -> [project_finance_ids]
+
+        for tenant in TENANTS:
+            customers = TENANT_CUSTOMERS[tenant]
+            amounts = generate_sign_amounts()
+            cust_idx = 0
+
+            for i, sign_amount in enumerate(amounts):
+                cust_name, projects = customers[cust_idx % len(customers)]
+                proj_name = projects[i % len(projects)] if i < len(projects) else f"{cust_name} 项目{i+1}"
+                cust_idx += i % 3
+
+                # 70% 已签约, 30% 待签约
+                status = "已签约" if random.random() < 0.7 else "待签约"
+                sign_month = f"2026-{random.randint(1, 6):02d}" if status == "已签约" else ""
+                project_code = f"{tenant[:2]}-2026-{i+1:03d}"
+                business_type = random.choice(["学术推广", "医生教育", "患者管理", "科研合作", "科普内容"])
+
+                # 如果签约，总额 = 签约额；否则为0
+                total_rev = int(sign_amount * random.uniform(0.8, 1.0)) if status == "已签约" else 0
+                total_gross = int(total_rev * random.uniform(0.25, 0.5)) if status == "已签约" else 0
+                total_payment = int(total_rev * random.uniform(0.7, 0.9)) if status == "已签约" else 0
+                total_cost = int(total_rev * random.uniform(0.3, 0.5)) if status == "已签约" else 0
+                total_paid = int(total_cost * random.uniform(0.7, 0.95)) if status == "已签约" else 0
+
+                budget_data = make_budget_data(sign_amount, sign_month, status)
+                expense_data = make_expense_data() if status == "已签约" else "[]"
+                task_data = json.dumps([
+                    {"task": f"{proj_name} 项目启动", "due": f"2026-{min(12, 1+i//2):02d}-01", "status": "已完成" if i < 8 else "进行中"},
+                    {"task": f"方案评审与确认", "due": f"2026-{min(12, 2+i//2):02d}-15", "status": "已完成" if i < 6 else "进行中"},
+                    {"task": f"内容生产阶段", "due": f"2026-{min(12, 3+i//2):02d}-30", "status": "进行中"},
+                ])
+
+                cur = _exec(conn, """
+                    INSERT INTO project_finances
+                    (tenant, project_id, business_type, customer_name, sign_amount, sign_month, status,
+                     sales_person, total_rev, total_gross, total_payment, total_cost, total_paid,
+                     budget_data, expense_data, task_data,
+                     project_code, start_date, end_date, task_type, task_count,
+                     service_fee_standard, project_manager, contact_name, contact_phone, other_info,
+                     created_at, updated_at)
+                    VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+                """, (
+                    tenant, f"PF-{tenant[:2]}-{i+1:04d}", business_type, cust_name,
+                    sign_amount, sign_month, status,
+                    f"销售{random.choice(['A','B','C','D'])}", total_rev, total_gross,
+                    total_payment, total_cost, total_paid,
+                    budget_data, expense_data, task_data,
+                    project_code, f"2026-{random.randint(1,3):02d}-01", f"2026-{random.randint(9,12):02d}-30",
+                    random.choice(["内容生产", "视频制作", "专家访谈", "学术会议", "患者教育"]),
+                    random.randint(10, 100), random.choice([800, 1000, 1200, 1500, 2000]),
+                    f"经理{random.choice(['A','B','C'])}", f"联系人{random.randint(1,20)}",
+                    f"1380000{random.randint(1000,9999)}", f"备注信息 {i+1}",
+                    today, today,
+                ))
+                # Store for later use
+                pf_ids.setdefault(tenant, []).append((cur.lastrowid, proj_name, cust_name, status))
+
+            # operation_projects: 每个工作台 3-5 个
+            op_count = random.randint(3, 5)
+            for j in range(op_count):
+                pf_row = random.choice(pf_ids[tenant])
+                cur2 = _exec(conn, """
+                    INSERT INTO operation_projects
+                    (tenant, project_name, project_version, project_type, project_status,
+                     current_stage, owner, start_date, end_date, target_customer, customer_need,
+                     expected_contract_amount, expected_sign_date, sign_probability, next_action,
+                     sop_stage, execution_progress, current_deliverable, notes)
+                    VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+                """, (
+                    tenant, f"{pf_row[1]} 运营方案", "v1.0",
+                    "execution" if random.random() < 0.6 else "opportunity",
+                    "SOP 执行中" if random.random() < 0.6 else "方案已提交",
+                    random.choice(["商务推进", "内容生产", "渠道分发"]),
+                    f"OPC{random.randint(1,5)}", "2026-06-01", "2026-12-31",
+                    pf_row[2], "科普内容项目执行与管理",
+                    pf_row[0] if pf_row[3] == "已签约" else random.randint(50, 300) * 10000,
+                    "2026-06", 70 + random.randint(0, 30),
+                    "补齐版本要求文件并更新下一节点",
+                    "SOP 执行", random.randint(30, 80), "当前交付物 v1.0",
+                    "运营备注",
+                ))
+                _exec(conn, """
+                    INSERT INTO follow_up_records
+                    (target_type, target_id, followed_at, content, next_action, follower)
+                    VALUES (?,?,?,?,?,?)
+                """, (
+                    "operation", cur2.lastrowid, today,
+                    f"运营项目跟进：{pf_row[1]}，当前进度正常", "继续推进下一里程碑",
+                    f"销售{random.choice(['A','B'])}",
+                ))
+
+            # expense_records: 每个工作台 15-20 条
+            expense_count = random.randint(15, 20)
+            expense_types = ["通用费用", "平台采购", "人力成本", "研发费用", "奖金", "其他"]
+            for j in range(expense_count):
+                et = random.choice(expense_types)
+                month_str = f"2026-{random.randint(1, 6):02d}"
+                amount = random.randint(5000, 500000)
+                incurred = int(amount * random.uniform(0.5, 1.0))
+                _exec(conn, """
+                    INSERT INTO expense_records
+                    (tenant, expense_type, expense_month, amount, incurred_amount, notes, status)
+                    VALUES (?,?,?,?,?,?,?)
+                """, (
+                    tenant, et, month_str, amount, incurred,
+                    f"{et} - {random.choice(['季度预算', '紧急支出', '常规费用', '项目费用'])}",
+                    "计入费用",
+                ))
+
+            print(f"[seed] {tenant}: {len(amounts)} 项目, {op_count} 运营项目, {expense_count} 费用记录")
+
+        conn.commit()  # 提交所有工作台的核心数据
+
+        # 全域数据：sales_leads 对所有 tenant 可见
+        global_sales = [
+            ("齐鲁制药", "P0", "跟进中", "多产品线科普年度框架"),
+            ("百利天恒", "P0", "方案中", "BL-B01D1 上市前医生教育"),
+            ("信达生物", "P0", "已签约", "现有科普项目升级/续约"),
+            ("三生制药", "P1", "待跟进", "多科室医生教育+患者科普"),
+            ("天广实生物", "P1", "待跟进", "血液肿瘤医生教育机会"),
         ]
-        for customer, priority, status, note in sales:
+        for customer, priority, status, note in global_sales:
             cur = _exec(conn,
-                "INSERT INTO sales_leads (target_customer, priority, status) VALUES (?,?,?)",
-                (customer, priority, status),
+                "INSERT INTO sales_leads (target_customer, priority, status, created_at) VALUES (?,?,?,?)",
+                (customer, priority, status, today),
             )
             _exec(conn,
-                "INSERT INTO follow_up_records (target_type,target_id,followed_at,content,next_action) VALUES (?,?,?,?,?)",
-                ("sales", cur.lastrowid, date.today().isoformat(), note, "明确下一次沟通人和时间"),
+                "INSERT INTO follow_up_records (target_type,target_id,followed_at,content,next_action,follower) VALUES (?,?,?,?,?,?)",
+                ("sales", cur.lastrowid, today, note, "明确下一次沟通", "销售A"),
             )
 
+        # 全域 business_proposals
         cur = _exec(conn,
-            "INSERT INTO business_proposals (customer_or_project_name,version,description,status,created_date) VALUES (?,?,?,?,?)",
-            ("信达生物", "v1.5", "信达科普项目续约与报价方案", "已提交客户", "2026-05-28"),
+            "INSERT INTO business_proposals (customer_or_project_name,version,description,status,created_date, tenant) VALUES (?,?,?,?,?,?)",
+            ("信达生物", "v1.5", "信达科普项目续约与报价方案", "已提交客户", "2026-05-28", "科普·无界"),
         )
         proposal_id = cur.lastrowid
-        proposal_dir = WEIXIN_BASE / "2、业务方案/信达/v1.5"
-        for category, names in {
-            "方案": ["整体方案.pptx", "整体方案.pdf"],
-            "成本": ["业务报价-2亿方案.xlsx", "业务报价-5250万方案.xlsx", "5、最新报价.xlsx"],
-            "SOP": ["SOP.docx"],
-            "财务流程": ["财务流程.docx"],
-        }.items():
-            for name in names:
-                add_file_index(conn, "proposal", proposal_id, "v1.5", category, proposal_dir / name, external=True)
-
-        projects = [
-            ("圆心科技 科普文章项目", "v2026-文章", "execution", "SOP 执行中", "内容生产", 55, "文章内容生产与审核执行中"),
-            ("圆心科技 科普视频项目", "v2026-视频", "execution", "SOP 执行中", "内容生产", 45, "视频脚本、拍摄与审核推进"),
-            ("圆心科技 科普专访项目", "v2026-专访", "opportunity", "方案已提交", "商务推进", 0, "专访项目推动签约"),
-        ]
-        op_dir = WEIXIN_BASE / "3、运营方案"
-        for name, version, kind, status, stage, progress, note in projects:
-            cur = _exec(conn,
-                """INSERT INTO operation_projects
-                (project_name,project_version,project_type,project_status,current_stage,target_customer,customer_need,
-                 expected_contract_amount,expected_sign_date,sign_probability,next_action,sop_stage,execution_progress,current_deliverable)
-                VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)""",
-                (name, version, kind, status, stage, "圆心科技", "科普内容项目执行与管理", 0 if kind == "execution" else 200, "2026-06", 100 if kind == "execution" else 70, "补齐版本要求文件并更新下一节点", stage, progress, note),
-            )
-            _exec(conn,
-                "INSERT INTO follow_up_records (target_type,target_id,followed_at,content,next_action) VALUES (?,?,?,?,?)",
-                ("operation", cur.lastrowid, date.today().isoformat(), note, "补齐版本要求文件并更新下一节点"),
-            )
-
-        file_map = [
-            (1, "v2026-文章", "项目方案", "圆心科技--科普文章项目(1).pptx"),
-            (2, "v2026-视频", "项目方案", "圆心科技-科普视频项目(1).pptx"),
-            (3, "v2026-专访", "项目方案", "圆心科技-科普专访项目-2026年(1).pdf"),
-            (1, "v2026-文章", "项目管理手册", "圆心科技《项目管理手册》-2026年.pdf"),
-            (2, "v2026-视频", "审核标准", "科普项目-审核标准（文章-视频-音频）.pdf"),
-        ]
-        for project_id, version, category, filename in file_map:
-            add_file_index(conn, "operation", project_id, version, category, op_dir / filename, external=True)
 
+        # 全域 product_versions
         products = [
-            ("妙手医生服务小程序", "v1.1", "视频任务增强 + 积分商城", "草稿箱、批量上传、积分商城、消息通知", "2026-Q3", "规划中", "科普平台"),
-            ("数字化营销后台管理系统", "v1.2", "运营数据看板 + 智能审核", "医生活跃、任务完成率、AI 预审、渠道数据上报", "2026-Q3", "设计中", "真研平台"),
-            ("妙手患者服务", "v0.5", "科普浏览 + 医生主页 MVP", "科普文章/视频浏览、医生主页、搜索", "2026-Q3", "规划中", "科普平台"),
-            ("数字人内容平台", "v0.1", "基础数字人视频生成 MVP", "预设形象、AI 配音、脚本驱动、简单模板", "2026-Q3", "规划中", "科普平台"),
-            ("渠道分发引擎", "v1.0", "六渠道统一分发", "分发 API、内容适配、分发排期、效果追踪", "2027-Q1", "规划中", "科普平台"),
+            ("妙手医生服务小程序", "v1.1", "视频任务增强 + 积分商城", "2026-Q3", "规划中", "P1"),
+            ("数字化营销后台管理系统", "v1.2", "运营数据看板 + 智能审核", "2026-Q3", "设计中", "P0"),
+            ("妙手患者服务", "v0.5", "科普浏览 + 医生主页 MVP", "2026-Q3", "规划中", "P2"),
+            ("数字人内容平台", "v0.1", "基础数字人视频生成 MVP", "2026-Q3", "规划中", "P2"),
+            ("渠道分发引擎", "v1.0", "六渠道统一分发", "2027-Q1", "规划中", "P1"),
         ]
-        for product in products:
+        for p in products:
             cur = _exec(conn,
-                "INSERT INTO product_versions (product_name,version,version_goal,feature_list,launch_date,status,platform) VALUES (?,?,?,?,?,?,?)",
-                product,
+                "INSERT INTO product_versions (product_name,version,version_goal,launch_date,status,priority,tenant) VALUES (?,?,?,?,?,?,?)",
+                (*p, "科普·无界"),
             )
             _exec(conn,
-                "INSERT INTO follow_up_records (target_type,target_id,followed_at,content,next_action) VALUES (?,?,?,?,?)",
-                ("product", cur.lastrowid, date.today().isoformat(), f"{product[0]} {product[1]}：{product[2]}", "按路线图推进"),
-            )
-
-        for month, record_type, category, amount, notes in [
-            ("2026-05", "revenue", "信达生物续约确认收入", 120, "信达项目阶段确收"),
-            ("2026-06", "revenue", "信达生物续约确认收入", 80, "信达项目尾款预估"),
-            ("2026-05", "cost_expense", "内容生产", 32, "医生劳务与内容制作"),
-            ("2026-05", "cost_expense", "运营管理", 16, "项目管理与渠道协同"),
-            ("2026-06", "cost_expense", "渠道分发", 24, "投放与分发费用"),
-        ]:
-            _exec(conn,
-                "INSERT INTO finance_records (month,record_type,category,amount,occurred_date,notes) VALUES (?,?,?,?,?,?)",
-                (month, record_type, category, amount, f"{month}-01", notes),
-            )
-
-        tasks_seed = [
-            ("阶段1：渠道与商务确认", "商务对接", "合同签订", "Anna", "2026-06-30", "法务审核中", "合同签订后开始执行"),
-            ("阶段1：渠道与商务确认", "官媒渠道确认", "沟通官媒确定", "段丽华", "2026-06-30", "官媒尽力推，以先达成合作为准", "集团支持"),
-            ("阶段1：渠道与商务确认", "官媒渠道确认", "官媒合作签约", "段丽华", "2026-06-18", "", "官媒确认细节"),
-            ("阶段2：系统与标准搭建", "系统开发上线", "音频专访系统开发上线", "戴敏/梁军营", "2026-06-18", "客户比较着急执行，需要技术的资源", ""),
-            ("阶段2：系统与标准搭建", "系统开发上线", "精品视频系统开发上线", "戴敏/梁军营", "2026-06-25", "", ""),
-            ("阶段2：系统与标准搭建", "标准与培训", "业务执行手册SOP", "胡龙飞", "2026-06-12", "", "系统开发上线"),
-            ("阶段3：人员与审核入驻", "团队组建", "医学审核人员到位", "胡龙飞", "2026-06-15", "", "审核人员招聘"),
-            ("阶段3：人员与审核入驻", "团队组建", "视频制作人员到位", "胡龙飞", "2026-06-18", "", "项目经理招聘"),
-            ("阶段4：供应链与制作", "供应商准入", "准入拍摄/剪辑/主持人", "胡龙飞/侯亚凤", "2026-06-18", "", ""),
-            ("阶段2：系统与标准搭建", "脚本生产及审核", "生产脚本", "军营", "2026-06-12", "脚本目前生产比较机械，需要提前准备", "细分标签领域完成"),
-        ]
-        for phase, milestone, task, owner, due_date, blockers, notes in tasks_seed:
-            _exec(conn,
-                "INSERT INTO project_tasks (project_id,phase,milestone,task,owner,due_date,blockers,notes) VALUES (?,?,?,?,?,?,?,?)",
-                (1, phase, milestone, task, owner, due_date, blockers, notes),
+                "INSERT INTO follow_up_records (target_type,target_id,followed_at,content,next_action,follower) VALUES (?,?,?,?,?,?)",
+                ("product", cur.lastrowid, today, f"{p[0]} {p[1]}：{p[2]}", "按路线图推进", "产品经理"),
             )
 
         conn.commit()
+        print("[seed] 丰富示例数据已填充")
     finally:
         conn.close()

backend/migrations/tables.py

@@ -158,6 +158,8 @@ def migrate_create_tables():
   created_at VARCHAR(30) NOT NULL DEFAULT '',
   updated_at VARCHAR(30) NOT NULL DEFAULT ''
 )""",
+            """CREATE TABLE IF NOT EXISTS plan_finances LIKE project_finances""",
+            """CREATE TABLE IF NOT EXISTS plan_expense_records LIKE expense_records""",
         ]
 
         for ddl in tables:

backend/routes.py

@@ -24,7 +24,9 @@ TABLES = {
     "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", "status", "sort_order", "priority", "tenant"]),
     "projectFinances": ("project_finances", ["project_id", "tenant", "business_type", "customer_name", "sign_amount", "sign_month", "status", "sales_person", "owner", "total_rev", "total_gross", "total_payment", "total_cost", "total_paid", "budget_data", "expense_data", "start_date", "end_date", "task_type", "task_count", "service_fee_standard", "project_manager", "task_data", "project_code", "contact_name", "contact_phone", "other_info"]),
-    "expense": ("expense_records", ["expense_type", "expense_month", "amount", "incurred_amount", "notes", "tenant"]),
+    "expense": ("expense_records", ["expense_type", "expense_month", "amount", "incurred_amount", "notes", "status", "tenant"]),
+    "planFinances": ("plan_finances", ["project_id", "tenant", "business_type", "customer_name", "sign_amount", "sign_month", "status", "sales_person", "owner", "total_rev", "total_gross", "total_payment", "total_cost", "total_paid", "budget_data", "expense_data", "start_date", "end_date", "task_type", "task_count", "service_fee_standard", "project_manager", "task_data", "project_code", "contact_name", "contact_phone", "other_info"]),
+    "planExpense": ("plan_expense_records", ["expense_type", "expense_month", "amount", "incurred_amount", "notes", "status", "tenant"]),
 }
 
 # ---------- 鉴权装饰器 ----------
@@ -92,6 +94,30 @@ def auth_logout():
     return jsonify({"ok": True})
 
 
+@bp.route("/api/auth/change-password", methods=["POST"])
+@login_required
+def auth_change_password():
+    data = request.get_json(force=True) or {}
+    old_password = data.get("old_password", "")
+    new_password = data.get("new_password", "")
+    if not old_password or not new_password:
+        return jsonify({"error": "旧密码和新密码不能为空"}), 400
+    if len(new_password) < 6:
+        return jsonify({"error": "新密码至少需要6位"}), 400
+    user_id = session.get("user_id")
+    conn = db()
+    try:
+        user = one(conn, "SELECT * FROM users WHERE id=?", (user_id,))
+        if not user or not check_password_hash(user["password_hash"], old_password):
+            return jsonify({"error": "旧密码错误"}), 401
+        new_hash = generate_password_hash(new_password)
+        _exec(conn, "UPDATE users SET password_hash=? WHERE id=?", (new_hash, user_id))
+        conn.commit()
+        return jsonify({"ok": True})
+    finally:
+        conn.close()
+
+
 @bp.route("/api/auth/me")
 def auth_me():
     if "user_id" not in session:
@@ -331,6 +357,7 @@ def bootstrap():
                 def t_expense_sum(m_range):
                     total = 0
                     for r in t_expense:
+                        if (r.get("status") or "") == "暂不计入": continue
                         m = (r.get("expense_month") or "").strip()
                         if not m or "-" not in m: continue
                         try:
@@ -358,6 +385,27 @@ def bootstrap():
                 all_metrics[-1]["cashflow_month"] = all_metrics[-1]["payment_month"] - all_metrics[-1]["paid_month"]
                 all_metrics[-1]["cashflow_prev_q"] = all_metrics[-1]["payment_prev_q"] - all_metrics[-1]["paid_prev_q"]
                 all_metrics[-1]["cashflow_prev_month"] = all_metrics[-1]["payment_prev_month"] - all_metrics[-1]["paid_prev_month"]
+                def t_expense_paid_sum(m_range):
+                    total = 0
+                    for r in t_expense:
+                        if (r.get("status") or "") == "暂不计入": continue
+                        m = (r.get("expense_month") or "").strip()
+                        if not m or "-" not in m: continue
+                        try:
+                            if int(m.split("-")[1]) in m_range:
+                                total += float(r.get("incurred_amount") or 0)
+                        except: pass
+                    return total
+                all_metrics[-1]["expense_paid_annual"] = t_expense_paid_sum(range(1, 13))
+                all_metrics[-1]["expense_paid_q2"] = t_expense_paid_sum(_q_range)
+                all_metrics[-1]["expense_paid_month"] = t_expense_paid_sum([_now_month])
+                all_metrics[-1]["expense_paid_prev_q"] = t_expense_paid_sum(_prev_q_range)
+                all_metrics[-1]["expense_paid_prev_month"] = t_expense_paid_sum([_prev_month]) if _prev_month else 0
+                all_metrics[-1]["dept_cf_annual"] = all_metrics[-1]["cashflow_annual"] - all_metrics[-1]["expense_paid_annual"]
+                all_metrics[-1]["dept_cf_q2"] = all_metrics[-1]["cashflow_q2"] - all_metrics[-1]["expense_paid_q2"]
+                all_metrics[-1]["dept_cf_month"] = all_metrics[-1]["cashflow_month"] - all_metrics[-1]["expense_paid_month"]
+                all_metrics[-1]["dept_cf_prev_q"] = all_metrics[-1]["cashflow_prev_q"] - all_metrics[-1]["expense_paid_prev_q"]
+                all_metrics[-1]["dept_cf_prev_month"] = all_metrics[-1]["cashflow_prev_month"] - all_metrics[-1]["expense_paid_prev_month"]
                 all_metrics[-1]["profit_annual"] = all_metrics[-1]["gross_annual"] - all_metrics[-1]["proj_expense_annual"]
                 all_metrics[-1]["profit_q2"] = all_metrics[-1]["gross_q2"] - all_metrics[-1]["proj_expense_q2"]
                 all_metrics[-1]["profit_month"] = all_metrics[-1]["monthly_net_profit"] - all_metrics[-1]["proj_expense_month"]
@@ -366,7 +414,7 @@ def bootstrap():
                 all_monthly.append(monthly_finance(conn, t))
                 all_recent.extend(rows(conn, "SELECT * FROM follow_up_records WHERE tenant=? ORDER BY id DESC LIMIT 4", [t]))
             agg = {}
-            for key in ["total_projects","total_proposals","total_products","upcoming_products","signed_amount","signed_annual","signed_q2","signed_month","signed_prev_q","signed_prev_month","revenue_annual","revenue_q2","monthly_revenue","revenue_prev_q","revenue_prev_month","gross_annual","gross_q2","monthly_net_profit","gross_prev_q","gross_prev_month","payment_annual","payment_q2","payment_month","payment_prev_q","payment_prev_month","cost_annual","cost_q2","cost_month","cost_prev_q","cost_prev_month","expense_annual","expense_q2","expense_month","expense_prev_q","expense_prev_month","paid_annual","paid_q2","paid_month","paid_prev_q","paid_prev_month","cashflow_annual","cashflow_q2","cashflow_month","cashflow_prev_q","cashflow_prev_month","profit_annual","profit_q2","profit_month","profit_prev_q","profit_prev_month","proj_expense_annual","proj_expense_q2","proj_expense_month","proj_expense_prev_q","proj_expense_prev_month"]:
+            for key in ["total_projects","total_proposals","total_products","upcoming_products","signed_amount","signed_annual","signed_q2","signed_month","signed_prev_q","signed_prev_month","revenue_annual","revenue_q2","monthly_revenue","revenue_prev_q","revenue_prev_month","gross_annual","gross_q2","monthly_net_profit","gross_prev_q","gross_prev_month","payment_annual","payment_q2","payment_month","payment_prev_q","payment_prev_month","cost_annual","cost_q2","cost_month","cost_prev_q","cost_prev_month","expense_annual","expense_q2","expense_month","expense_prev_q","expense_prev_month","paid_annual","paid_q2","paid_month","paid_prev_q","paid_prev_month","cashflow_annual","cashflow_q2","cashflow_month","cashflow_prev_q","cashflow_prev_month","expense_paid_annual","expense_paid_q2","expense_paid_month","expense_paid_prev_q","expense_paid_prev_month","dept_cf_annual","dept_cf_q2","dept_cf_month","dept_cf_prev_q","dept_cf_prev_month","profit_annual","profit_q2","profit_month","profit_prev_q","profit_prev_month","proj_expense_annual","proj_expense_q2","proj_expense_month","proj_expense_prev_q","proj_expense_prev_month"]:
                 agg[key] = sum(m.get(key, 0) for m in all_metrics)
             merged_monthly = []
             for i in range(12):
@@ -380,7 +428,7 @@ def bootstrap():
                 "recent": sorted(all_recent, key=lambda x: x.get("id", 0), reverse=True)[:8],
                 "risks": [],
             }
-            return jsonify({"summary": summary, "sales": [], "proposals": [], "operations": [], "products": [], "finance": [], "projectFinances": [], "financeMonthly": merged_monthly, "tasks": [], "expense": [], "tenant": tenant, "tenants": allowed})
+            return jsonify({"summary": summary, "sales": [], "proposals": [], "operations": [], "products": [], "finance": [], "projectFinances": [], "financeMonthly": merged_monthly, "tasks": [], "expense": [], "planFinances": [], "planExpense": [], "tenant": tenant, "tenants": allowed})
 
         def q(sql, *args):
             return rows(conn, sql, args)
@@ -392,6 +440,8 @@ def bootstrap():
         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)
         expense = q("SELECT * FROM expense_records WHERE tenant=? ORDER BY id DESC", tenant)
+        planPfs = q("SELECT * FROM plan_finances WHERE tenant=? ORDER BY id DESC", tenant)
+        planExpense = q("SELECT * FROM plan_expense_records WHERE tenant=? ORDER BY id DESC", tenant)
         signed_pfs = [x for x in pfs if x["status"] == "已签约"]
 
         def parse_budget(pf):
@@ -459,6 +509,7 @@ def bootstrap():
         def expense_sum(month_range):
             total = 0
             for r in expense:
+                if (r.get("status") or "") == "暂不计入": continue
                 m = (r.get("expense_month") or "").strip()
                 if not m or "-" not in m: continue
                 try:
@@ -471,6 +522,22 @@ def bootstrap():
         expense_month_val = expense_sum([_now_month])
         expense_prev_q = expense_sum(_prev_q_range)
         expense_prev_month = expense_sum([_prev_month]) if _prev_month else 0
+        def expense_paid_sum(month_range):
+            total = 0
+            for r in expense:
+                if (r.get("status") or "") == "暂不计入": continue
+                m = (r.get("expense_month") or "").strip()
+                if not m or "-" not in m: continue
+                try:
+                    if int(m.split("-")[1]) in month_range:
+                        total += float(r.get("incurred_amount") or 0)
+                except: pass
+            return total
+        expense_paid_annual = expense_paid_sum(range(1, 13))
+        expense_paid_q2 = expense_paid_sum(_q_range)
+        expense_paid_month = expense_paid_sum([_now_month])
+        expense_paid_prev_q = expense_paid_sum(_prev_q_range)
+        expense_paid_prev_month = expense_paid_sum([_prev_month]) if _prev_month else 0
         paid_annual = sum_expense("paid", range(1, 13))
         paid_q2 = sum_expense("paid", _q_range)
         paid_month = sum_expense("paid", [_now_month])
@@ -486,6 +553,11 @@ def bootstrap():
         cashflow_month = payment_month - paid_month
         cashflow_prev_q = payment_prev_q - paid_prev_q
         cashflow_prev_month = payment_prev_month - paid_prev_month
+        dept_cf_annual = cashflow_annual - expense_paid_annual
+        dept_cf_q2 = cashflow_q2 - expense_paid_q2
+        dept_cf_month = cashflow_month - expense_paid_month
+        dept_cf_prev_q = cashflow_prev_q - expense_paid_prev_q
+        dept_cf_prev_month = cashflow_prev_month - expense_paid_prev_month
         profit_annual = gross_annual - proj_expense_annual
         profit_q2 = gross_q2 - proj_expense_q2
         profit_month = gross_month - proj_expense_month
@@ -557,6 +629,16 @@ def bootstrap():
                 "cashflow_month": cashflow_month,
                 "cashflow_prev_q": cashflow_prev_q,
                 "cashflow_prev_month": cashflow_prev_month,
+                "expense_paid_annual": expense_paid_annual,
+                "expense_paid_q2": expense_paid_q2,
+                "expense_paid_month": expense_paid_month,
+                "expense_paid_prev_q": expense_paid_prev_q,
+                "expense_paid_prev_month": expense_paid_prev_month,
+                "dept_cf_annual": dept_cf_annual,
+                "dept_cf_q2": dept_cf_q2,
+                "dept_cf_month": dept_cf_month,
+                "dept_cf_prev_q": dept_cf_prev_q,
+                "dept_cf_prev_month": dept_cf_prev_month,
                 "profit_annual": profit_annual,
                 "profit_q2": profit_q2,
                 "profit_month": profit_month,
@@ -572,7 +654,7 @@ def bootstrap():
             "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, "projectFinances": pfs, "financeMonthly": monthly_finance(conn, tenant), "tasks": tasks, "expense": expense, "tenant": tenant, "tenants": allowed})
+        return jsonify({"summary": summary, "sales": sales, "proposals": proposals, "operations": operations, "products": products, "finance": finance, "projectFinances": pfs, "financeMonthly": monthly_finance(conn, tenant), "tasks": tasks, "expense": expense, "planFinances": planPfs, "planExpense": planExpense, "tenant": tenant, "tenants": allowed})
     finally:
         conn.close()
 

static/modules/admin.js

@@ -166,3 +166,89 @@ window.deleteUser = async (uid, username) => {
     toast("删除失败：" + e.message, "error");
   }
 };
+
+// 修改密码弹窗
+window.openChangePwdModal = () => {
+  const overlay = document.createElement("div");
+  overlay.id = "changePwdOverlay";
+  overlay.className = "fixed inset-0 bg-black/40 z-[9999] flex items-center justify-center p-4";
+  overlay.innerHTML = `
+    <div class="bg-white rounded-xl shadow-2xl w-full max-w-sm">
+      <div class="flex items-center justify-between px-6 py-4 border-b border-slate-200">
+        <h2 class="text-lg font-semibold text-slate-800">修改密码</h2>
+        <button class="text-slate-400 hover:text-slate-700" onclick="closeChangePwdModal()"><i data-lucide="x"></i></button>
+      </div>
+      <form class="p-6 grid gap-4" onsubmit="doChangePwd(event)" novalidate>
+        <label class="block">
+          <span class="text-sm text-slate-500 mb-1 block">旧密码</span>
+          <div class="relative">
+            <input type="password" name="old_password" required class="form-ctrl pr-10" placeholder="输入旧密码">
+            <button type="button" class="absolute right-2 top-1/2 -translate-y-1/2 text-slate-400 hover:text-slate-600 p-1" onclick="togglePwdEye(this)"><i data-lucide="eye-off" style="width:16px;height:16px"></i></button>
+          </div>
+        </label>
+        <label class="block">
+          <span class="text-sm text-slate-500 mb-1 block">新密码</span>
+          <div class="relative">
+            <input type="password" name="new_password" required minlength="6" class="form-ctrl pr-10" placeholder="至少6位">
+            <button type="button" class="absolute right-2 top-1/2 -translate-y-1/2 text-slate-400 hover:text-slate-600 p-1" onclick="togglePwdEye(this)"><i data-lucide="eye-off" style="width:16px;height:16px"></i></button>
+          </div>
+        </label>
+        <label class="block">
+          <span class="text-sm text-slate-500 mb-1 block">确认新密码</span>
+          <div class="relative">
+            <input type="password" name="confirm_password" required minlength="6" class="form-ctrl pr-10" placeholder="再次输入新密码">
+            <button type="button" class="absolute right-2 top-1/2 -translate-y-1/2 text-slate-400 hover:text-slate-600 p-1" onclick="togglePwdEye(this)"><i data-lucide="eye-off" style="width:16px;height:16px"></i></button>
+          </div>
+        </label>
+        <div class="flex justify-end gap-3 pt-2">
+          <button type="button" class="btn btn-ghost btn-sm px-6" onclick="closeChangePwdModal()">取消</button>
+          <button type="submit" class="btn btn-primary btn-sm px-8">确认修改</button>
+        </div>
+      </form>
+    </div>`;
+  overlay.addEventListener("click", (e) => { if (e.target === overlay) closeChangePwdModal(); });
+  document.body.appendChild(overlay);
+  if (window.lucide) lucide.createIcons();
+};
+
+window.togglePwdEye = (btn) => {
+  const input = btn.parentElement.querySelector("input");
+  const icon = btn.querySelector("i");
+  if (input.type === "password") {
+    input.type = "text";
+    icon.setAttribute("data-lucide", "eye");
+  } else {
+    input.type = "password";
+    icon.setAttribute("data-lucide", "eye-off");
+  }
+  if (window.lucide) lucide.createIcons({ elements: [icon] });
+};
+
+window.closeChangePwdModal = () => {
+  const el = document.getElementById("changePwdOverlay");
+  if (el) el.remove();
+};
+
+window.doChangePwd = async (e) => {
+  e.preventDefault();
+  const form = e.target;
+  const fd = new FormData(form);
+  const oldPwd = fd.get("old_password");
+  const newPwd = fd.get("new_password");
+  const confirmPwd = fd.get("confirm_password");
+  if (newPwd !== confirmPwd) { toast("两次输入的新密码不一致", "error"); return; }
+  if (newPwd.length < 6) { toast("新密码至少需要6位", "error"); return; }
+  try {
+    const resp = await fetch("/api/auth/change-password", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ old_password: oldPwd, new_password: newPwd }),
+    });
+    const data = await resp.json();
+    if (!resp.ok) { toast(data.error || "修改失败", "error"); return; }
+    closeChangePwdModal();
+    toast("密码修改成功", "success");
+  } catch (err) {
+    toast("请求失败：" + err.message, "error");
+  }
+};

static/modules/expense.js

@@ -5,6 +5,12 @@ function renderExpense() {
   var money = function(v) { return '¥ ' + (Number(v || 0)).toLocaleString('zh-CN', { minimumFractionDigits: 0, maximumFractionDigits: 2 }); };
   var esc = function(s) { return (s || '').replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;'); };
   var EXPENSE_TYPES = ['通用费用','平台采购','人力成本','研发费用','奖金','其他'];
+  var STATUS_OPTIONS = ['计入费用','暂不计入'];
+
+  // 排序状态
+  if (!state.expenseSort) state.expenseSort = { key: 'expense_month', asc: true };
+  var sortKey = state.expenseSort.key;
+  var sortAsc = state.expenseSort.asc ? 1 : -1;
 
   // 筛选状态
   var view = state.expenseView || 'total';
@@ -35,71 +41,105 @@ function renderExpense() {
     });
   }
 
+  // 排序
+  filtered.sort(function(a, b) {
+    var va = a[sortKey] || '', vb = b[sortKey] || '';
+    if (sortKey === 'amount' || sortKey === 'incurred_amount') {
+      va = parseFloat(va) || 0; vb = parseFloat(vb) || 0;
+    }
+    if (va < vb) return -1 * sortAsc;
+    if (va > vb) return 1 * sortAsc;
+    return 0;
+  });
+
   var totalAmount = filtered.reduce(function(s, r) { return s + (r.amount || 0); }, 0);
   var totalIncurred = filtered.reduce(function(s, r) { return s + (r.incurred_amount || 0); }, 0);
 
   // 月份下拉选项（去年/今年/明年）
-  var monthOpts = '<option value="">请选择</option>';
+  var monthOpts = '';
   for (var yr = thisYear - 1; yr <= thisYear + 1; yr++)
     for (var m = 1; m <= 12; m++) {
       var mv = yr + '-' + String(m).padStart(2, '0');
-      monthOpts += '<option value="' + mv + '"' + (mv === state.expenseMonth ? ' selected' : '') + '>' + mv + '</option>';
+      monthOpts += '<option value="' + mv + '">' + mv + '</option>';
     }
 
   // 季度下拉
   var qLabels = ['Q1 (1-3月)','Q2 (4-6月)','Q3 (7-9月)','Q4 (10-12月)'];
   var quarterOpts = '';
   for (var qi = 0; qi < 4; qi++) {
-    quarterOpts += '<option value="' + qi + '"' + (String(qi) === state.expenseQuarter ? ' selected' : '') + '>' + qLabels[qi] + '</option>';
+    quarterOpts += '<option value="' + qi + '">' + qLabels[qi] + '</option>';
   }
 
   // 月份/季度日期选择器
   var dateSelect = '';
   if (view === 'monthly') {
-    dateSelect = '<span class="text-xs text-slate-500 ml-2">月份：</span><select onchange="setExpenseMonth(this.value)" class="text-xs font-medium py-1 px-2.5 cursor-pointer" style="appearance:none;-webkit-appearance:none;background-color:transparent;border:0;outline:none;background:url(&apos;data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2212%22 height=%2212%22 viewBox=%220 0 24 24%22 fill=%22none%22 stroke=%22%236b7280%22 stroke-width=%222%22 stroke-linecap=%22round%22 stroke-linejoin=%22round%22%3E%3Cpolyline points=%226 9 12 15 18 9%22%3E%3C/polyline%3E%3C/svg%3E&apos;) no-repeat right 4px center;padding-right:22px;min-height:30px">' + monthOpts + '</select>';
+    dateSelect = '<span class="text-sm text-slate-500 ml-2">月份：</span><select onchange="setExpenseMonth(this.value)" class="text-sm font-medium py-1 px-2.5 cursor-pointer" style="appearance:none;-webkit-appearance:none;background-color:transparent;border:0;outline:none;background:url(&apos;data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2212%22 height=%2212%22 viewBox=%220 0 24 24%22 fill=%22none%22 stroke=%22%236b7280%22 stroke-width=%222%22 stroke-linecap=%22round%22 stroke-linejoin=%22round%22%3E%3Cpolyline points=%226 9 12 15 18 9%22%3E%3C/polyline%3E%3C/svg%3E&apos;) no-repeat right 4px center;padding-right:22px;min-height:30px"><option value=""' + (!state.expenseMonth?' selected':'') + '>请选择</option>' + monthOpts.replace('value="' + state.expenseMonth + '"', 'value="' + state.expenseMonth + '" selected') + '</select>';
   } else if (view === 'quarterly') {
-    dateSelect = '<span class="text-xs text-slate-500 ml-2">季度：</span><select onchange="setExpenseQuarter(this.value)" class="text-xs font-medium py-1 px-2.5 cursor-pointer" style="appearance:none;-webkit-appearance:none;background-color:transparent;border:0;outline:none;background:url(&apos;data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2212%22 height=%2212%22 viewBox=%220 0 24 24%22 fill=%22none%22 stroke=%22%236b7280%22 stroke-width=%222%22 stroke-linecap=%22round%22 stroke-linejoin=%22round%22%3E%3Cpolyline points=%226 9 12 15 18 9%22%3E%3C/polyline%3E%3C/svg%3E&apos;) no-repeat right 4px center;padding-right:22px;min-height:30px">' + quarterOpts + '</select>';
+    dateSelect = '<span class="text-sm text-slate-500 ml-2">季度：</span><select onchange="setExpenseQuarter(this.value)" class="text-sm font-medium py-1 px-2.5 cursor-pointer" style="appearance:none;-webkit-appearance:none;background-color:transparent;border:0;outline:none;background:url(&apos;data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2212%22 height=%2212%22 viewBox=%220 0 24 24%22 fill=%22none%22 stroke=%22%236b7280%22 stroke-width=%222%22 stroke-linecap=%22round%22 stroke-linejoin=%22round%22%3E%3Cpolyline points=%226 9 12 15 18 9%22%3E%3C/polyline%3E%3C/svg%3E&apos;) no-repeat right 4px center;padding-right:22px;min-height:30px">' + quarterOpts.replace('value="' + state.expenseQuarter + '"', 'value="' + state.expenseQuarter + '" selected') + '</select>';
   }
 
   // Toolbar
-  var toolbar = '<span class="text-xs text-slate-500">视图：</span><select onchange="setExpenseView(this.value)" class="text-xs font-medium py-1 px-2.5 cursor-pointer" style="appearance:none;-webkit-appearance:none;background-color:transparent;border:0;outline:none;background:url(&apos;data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2212%22 height=%2212%22 viewBox=%220 0 24 24%22 fill=%22none%22 stroke=%22%236b7280%22 stroke-width=%222%22 stroke-linecap=%22round%22 stroke-linejoin=%22round%22%3E%3Cpolyline points=%226 9 12 15 18 9%22%3E%3C/polyline%3E%3C/svg%3E&apos;) no-repeat right 4px center;padding-right:22px;min-height:30px"><option value="total"' + (view==='total'?' selected':'') + '>总视图</option><option value="quarterly"' + (view==='quarterly'?' selected':'') + '>季度视图</option><option value="monthly"' + (view==='monthly'?' selected':'') + '>月度视图</option></select><span class="text-xs text-slate-500 ml-3">类型：</span><select onchange="setExpenseFilter(this.value)" class="text-xs font-medium py-1 px-2.5 cursor-pointer" style="appearance:none;-webkit-appearance:none;background-color:transparent;border:0;outline:none;background:url(&apos;data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2212%22 height=%2212%22 viewBox=%220 0 24 24%22 fill=%22none%22 stroke=%22%236b7280%22 stroke-width=%222%22 stroke-linecap=%22round%22 stroke-linejoin=%22round%22%3E%3Cpolyline points=%226 9 12 15 18 9%22%3E%3C/polyline%3E%3C/svg%3E&apos;) no-repeat right 4px center;padding-right:22px;min-height:30px"><option value="全部"' + (typeFilter==='全部'?' selected':'') + '>全部 (' + records.length + ')</option>';
+  var toolbar = '<span class="text-sm text-slate-500">视图：</span><select onchange="setExpenseView(this.value)" class="text-sm font-medium py-1 px-2.5 cursor-pointer" style="appearance:none;-webkit-appearance:none;background-color:transparent;border:0;outline:none;background:url(&apos;data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2212%22 height=%2212%22 viewBox=%220 0 24 24%22 fill=%22none%22 stroke=%22%236b7280%22 stroke-width=%222%22 stroke-linecap=%22round%22 stroke-linejoin=%22round%22%3E%3Cpolyline points=%226 9 12 15 18 9%22%3E%3C/polyline%3E%3C/svg%3E&apos;) no-repeat right 4px center;padding-right:22px;min-height:30px"><option value="total"' + (view==='total'?' selected':'') + '>总视图</option><option value="quarterly"' + (view==='quarterly'?' selected':'') + '>季度视图</option><option value="monthly"' + (view==='monthly'?' selected':'') + '>月度视图</option></select><span class="text-sm text-slate-500 ml-3">类型：</span><select onchange="setExpenseFilter(this.value)" class="text-sm font-medium py-1 px-2.5 cursor-pointer" style="appearance:none;-webkit-appearance:none;background-color:transparent;border:0;outline:none;background:url(&apos;data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2212%22 height=%2212%22 viewBox=%220 0 24 24%22 fill=%22none%22 stroke=%22%236b7280%22 stroke-width=%222%22 stroke-linecap=%22round%22 stroke-linejoin=%22round%22%3E%3Cpolyline points=%226 9 12 15 18 9%22%3E%3C/polyline%3E%3C/svg%3E&apos;) no-repeat right 4px center;padding-right:22px;min-height:30px"><option value="全部"' + (typeFilter==='全部'?' selected':'') + '>全部 (' + records.length + ')</option>';
   EXPENSE_TYPES.forEach(function(t) {
     toolbar += '<option value="' + t + '"' + (typeFilter===t?' selected':'') + '>' + t + ' (' + records.filter(function(r){return r.expense_type===t}).length + ')</option>';
   });
   toolbar += '</select>' + dateSelect;
 
+  // 排序箭头
+  var sortArrow = function(key) {
+    var arrow = key === sortKey ? (sortAsc === 1 ? ' ↑' : ' ↓') : '';
+    return '<span class="text-slate-400 text-xs cursor-pointer" onclick="toggleExpenseSort(\'' + key + '\')">' + arrow + '</span>';
+  };
+
   // 表格行
   var tableRows = '';
   if (filtered.length) {
     filtered.forEach(function(r) {
-      tableRows += '<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="openExpenseEdit(' + r.id + ')"><td class="p-2 font-medium text-center align-middle" style="width:200px">' + esc(r.expense_type) + '</td><td class="p-2 text-center align-middle" style="width:200px">' + (r.expense_month || '—') + '</td><td class="p-2 text-center align-middle font-medium" style="width:200px">' + money(r.amount) + '</td><td class="p-2 text-center align-middle font-medium" style="width:200px">' + money(r.incurred_amount) + '</td><td class="p-2 text-center align-middle text-slate-500" style="width:200px">' + (esc(r.notes) || '—') + '</td></tr>';
+      var statusCls = r.status === '暂不计入' ? 'text-amber-600' : 'text-green-600';
+      tableRows += '<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="openExpenseEdit(' + r.id + ')"><td class="p-2 text-center align-middle font-medium">' + (r.expense_month || '—') + '</td><td class="p-2 font-medium text-center align-middle">' + esc(r.expense_type) + '</td><td class="p-2 text-center align-middle font-semibold ' + statusCls + '">' + esc(r.status || '计入费用') + '</td><td class="p-2 text-center align-middle font-medium">' + money(r.amount) + '</td><td class="p-2 text-center align-middle font-medium">' + money(r.incurred_amount) + '</td><td class="p-2 text-center align-middle text-slate-500">' + (esc(r.notes) || '—') + '</td></tr>';
     });
   } else {
     var emptyMsg = view === 'monthly' ? '该月份暂无费用记录' : view === 'quarterly' ? '该季度暂无费用记录' : '暂无费用记录';
-    tableRows = '<tr><td colspan="5" class="p-6 text-center text-slate-400">' + emptyMsg + '</td></tr>';
+    tableRows = '<tr><td colspan="6" class="p-6 text-center text-slate-400">' + emptyMsg + '</td></tr>';
   }
 
-  // 模态框
-  var modal = '<div id="expenseModal" class="hidden fixed inset-0 z-50 flex items-center justify-center bg-black/40" onclick="closeExpenseModal()"><div class="bg-white rounded-2xl shadow-2xl w-full max-w-lg mx-4" onclick="event.stopPropagation()"><div class="sticky top-0 z-10 bg-white/95 backdrop-blur border-b border-slate-100 px-6 py-4 flex items-center justify-between"><h3 class="text-lg font-bold text-slate-800" id="expenseModalTitle">新增费用</h3><div class="flex items-center gap-2"><button class="btn btn-ghost btn-sm text-red-600 hidden" id="expenseDeleteBtn" onclick="deleteExpenseItem()">删除</button><button class="btn btn-ghost btn-sm rounded-full w-8 h-8 p-0" onclick="closeExpenseModal()"><i data-lucide="x"></i></button></div></div><form onsubmit="saveExpense(event)" class="p-6 grid gap-4" novalidate><input type="hidden" name="expense_id" value=""><div class="grid grid-cols-2 gap-3"><label class="block"><span class="text-xs text-slate-500 mb-1 block">费用类型 <span class="text-red-500">*</span></span><select name="expense_type" required class="form-ctrl bg-white"><option value="">请选择</option>';
+  // 模态框 monthOpts for form (with current value preselected)
+  var modalMonthOpts = '<option value="">请选择</option>';
+  for (var yr2 = thisYear - 1; yr2 <= thisYear + 1; yr2++)
+    for (var m2 = 1; m2 <= 12; m2++) {
+      var mv2 = yr2 + '-' + String(m2).padStart(2, '0');
+      modalMonthOpts += '<option value="' + mv2 + '">' + mv2 + '</option>';
+    }
+  var statusOpts = STATUS_OPTIONS.map(function(s) { return '<option value="' + s + '">' + s + '</option>'; }).join('');
+
+  var modal = '<div id="expenseModal" class="hidden fixed inset-0 z-50 flex items-center justify-center bg-black/40" onclick="closeExpenseModal()"><div class="bg-white rounded-2xl shadow-2xl w-full max-w-lg mx-4" onclick="event.stopPropagation()"><div class="sticky top-0 z-10 bg-white/95 backdrop-blur border-b border-slate-100 px-6 py-4 flex items-center justify-between"><h3 class="text-lg font-bold text-slate-800" id="expenseModalTitle">新增费用</h3><div class="flex items-center gap-2"><button class="btn btn-ghost btn-sm text-red-600 hidden" id="expenseDeleteBtn" onclick="deleteExpenseItem()">删除</button><button class="btn btn-ghost btn-sm rounded-full w-8 h-8 p-0" onclick="closeExpenseModal()"><i data-lucide="x"></i></button></div></div><form onsubmit="saveExpense(event)" class="p-6 grid gap-4" novalidate><input type="hidden" name="expense_id" value=""><div class="grid grid-cols-2 gap-3"><label class="block"><span class="text-sm text-slate-500 mb-1 block">费用类型 <span class="text-red-500">*</span></span><select name="expense_type" required class="form-ctrl bg-white"><option value="">请选择</option>';
   EXPENSE_TYPES.forEach(function(t) { modal += '<option>' + t + '</option>'; });
-  modal += '</select></label><label class="block"><span class="text-xs text-slate-500 mb-1 block">月份 <span class="text-red-500">*</span></span><select name="expense_month" required class="form-ctrl bg-white">' + monthOpts + '</select></label></div><div class="grid grid-cols-2 gap-3"><label class="block"><span class="text-xs text-slate-500 mb-1 block">金额（元）</span><input name="amount" type="number" step="0.01" class="form-ctrl" placeholder="0.00"></label><label class="block"><span class="text-xs text-slate-500 mb-1 block">已发生金额（元）</span><input name="incurred_amount" type="number" step="0.01" class="form-ctrl" placeholder="0.00"></label></div><label class="block"><span class="text-xs text-slate-500 mb-1 block">费用说明</span><textarea name="notes" class="form-ctrl" rows="3" placeholder="备注信息"></textarea></label><div class="flex justify-end gap-3 pt-2"><button type="button" class="btn btn-ghost btn-sm px-6" onclick="closeExpenseModal()">取消</button><button type="submit" class="btn btn-primary btn-sm px-8">保存</button></div></form></div></div>';
+  modal += '</select></label><label class="block"><span class="text-sm text-slate-500 mb-1 block">月份 <span class="text-red-500">*</span></span><select name="expense_month" required class="form-ctrl bg-white">' + modalMonthOpts + '</select></label></div><div class="grid grid-cols-2 gap-3"><label class="block"><span class="text-sm text-slate-500 mb-1 block">金额（元）</span><input name="amount" type="number" step="0.01" class="form-ctrl" placeholder="0.00"></label><label class="block"><span class="text-sm text-slate-500 mb-1 block">已发生金额（元）</span><input name="incurred_amount" type="number" step="0.01" class="form-ctrl" placeholder="0.00"></label></div><label class="block"><span class="text-sm text-slate-500 mb-1 block">状态</span><select name="status" class="form-ctrl bg-white">' + statusOpts + '</select></label><label class="block"><span class="text-sm text-slate-500 mb-1 block">费用说明</span><textarea name="notes" class="form-ctrl" rows="3" placeholder="备注信息"></textarea></label><div class="flex justify-end gap-3 pt-2"><button type="button" class="btn btn-ghost btn-sm px-6" onclick="closeExpenseModal()">取消</button><button type="submit" class="btn btn-primary btn-sm px-8">保存</button></div></form></div></div>';
 
   var target = document.querySelector("#financeExpense") || document.querySelector("#financeTabExpense") || document.querySelector("#expense");
   if (!target) return;
   target.innerHTML = '<div class="grid gap-4">' +
     '<div class="card p-3"><div class="flex justify-between items-center"><div class="flex items-center gap-2">' + toolbar + '</div><button class="btn btn-primary btn-sm" onclick="openExpenseModal()">新增费用</button></div></div>' +
     '<div class="grid grid-cols-3 gap-3">' +
-      '<div class="metric-card p-3"><span class="flex items-center gap-2 text-xs text-slate-500">费用记录</span><strong class="mt-2 block text-xl">' + filtered.length + '</strong></div>' +
-      '<div class="metric-card p-3"><span class="flex items-center gap-2 text-xs text-slate-500">总费用</span><strong class="mt-2 block text-xl">' + money(totalAmount) + '</strong></div>' +
-      '<div class="metric-card p-3"><span class="flex items-center gap-2 text-xs text-slate-500">已发生金额</span><strong class="mt-2 block text-xl">' + money(totalIncurred) + '</strong></div>' +
+      '<div class="metric-card p-3"><span class="flex items-center gap-2 text-sm text-slate-500">费用记录</span><strong class="mt-2 block text-xl">' + filtered.length + '</strong></div>' +
+      '<div class="metric-card p-3"><span class="flex items-center gap-2 text-sm text-slate-500">总费用</span><strong class="mt-2 block text-xl">' + money(totalAmount) + '</strong></div>' +
+      '<div class="metric-card p-3"><span class="flex items-center gap-2 text-sm text-slate-500">已发生金额</span><strong class="mt-2 block text-xl">' + money(totalIncurred) + '</strong></div>' +
     '</div>' +
     modal +
-    '<div class="card p-4"><div class="overflow-x-auto"><table class="w-full text-sm"><thead><tr class="bg-slate-50 border-b border-slate-200"><th class="p-2 text-center font-semibold" style="width:200px">费用类型</th><th class="p-2 text-center font-semibold" style="width:200px">月份</th><th class="p-2 text-center font-semibold" style="width:200px">金额</th><th class="p-2 text-center font-semibold" style="width:200px">已发生金额</th><th class="p-2 text-center font-semibold" style="width:200px">费用说明</th></tr></thead><tbody>' + tableRows + '</tbody></table></div></div>' +
+    '<div class="card p-4"><div class="overflow-x-auto"><table class="w-full text-sm"><thead><tr class="bg-slate-50 border-b border-slate-200"><th class="p-2 text-center font-semibold cursor-pointer select-none" onclick="toggleExpenseSort(\'expense_month\')">月份' + sortArrow('expense_month') + '</th><th class="p-2 text-center font-semibold cursor-pointer select-none" onclick="toggleExpenseSort(\'expense_type\')">费用类型' + sortArrow('expense_type') + '</th><th class="p-2 text-center font-semibold cursor-pointer select-none" onclick="toggleExpenseSort(\'status\')">状态' + sortArrow('status') + '</th><th class="p-2 text-center font-semibold cursor-pointer select-none" onclick="toggleExpenseSort(\'amount\')">金额' + sortArrow('amount') + '</th><th class="p-2 text-center font-semibold cursor-pointer select-none" onclick="toggleExpenseSort(\'incurred_amount\')">已发生金额' + sortArrow('incurred_amount') + '</th><th class="p-2 text-center font-semibold">费用说明</th></tr></thead><tbody>' + tableRows + '</tbody></table></div></div>' +
   '</div>';
 
   if (window.lucide) window.lucide.createIcons();
 }
 
+window.toggleExpenseSort = function(key) {
+  var cur = state.expenseSort || {};
+  if (cur.key === key) { cur.asc = !cur.asc; }
+  else { cur.key = key; cur.asc = true; }
+  state.expenseSort = cur;
+  renderExpense();
+};
+
 window.setExpenseView = function(v) { state.expenseView = v; renderExpense(); };
 window.setExpenseFilter = function(v) { state.expenseFilter = v; renderExpense(); };
 window.setExpenseMonth = function(v) { state.expenseMonth = v; renderExpense(); };
@@ -109,6 +149,7 @@ window.openExpenseModal = function() {
   var form = document.querySelector("#expenseModal form");
   form.reset();
   form.querySelector('[name="expense_id"]').value = "";
+  form.querySelector('[name="status"]').value = "计入费用";
   document.querySelector("#expenseModalTitle").textContent = "新增费用";
   document.querySelector("#expenseDeleteBtn").classList.add("hidden");
   document.querySelector("#expenseModal").classList.remove("hidden");
@@ -130,6 +171,7 @@ window.openExpenseEdit = function(id) {
   setVal("amount", r.amount);
   setVal("incurred_amount", r.incurred_amount);
   setVal("notes", r.notes);
+  setVal("status", r.status || "计入费用");
   document.querySelector("#expenseModalTitle").textContent = "编辑费用";
   document.querySelector("#expenseDeleteBtn").classList.remove("hidden");
   document.querySelector("#expenseModal").classList.remove("hidden");
@@ -139,9 +181,9 @@ window.saveExpense = async function(event) {
   event.preventDefault();
   var form = event.target;
   var data = Object.fromEntries(new FormData(form).entries());
-  // 数字字段空值转 0，避免线上 MySQL 严格模式报错
   if (data.amount === '' || data.amount === undefined) data.amount = 0;
   if (data.incurred_amount === '' || data.incurred_amount === undefined) data.incurred_amount = 0;
+  if (!data.status) data.status = '计入费用';
   var isEdit = !!data.expense_id;
   delete data.expense_id;
 

static/modules/finance.js

@@ -111,16 +111,16 @@ function renderFinance() {
   const qLabels2 = ["Q1 (1-3月)","Q2 (4-6月)","Q3 (7-9月)","Q4 (10-12月)"];
   const toolMonthSelect = allMonths.map(m => '<option value="'+m+'" '+(m===state.finMonth?'selected':'')+'>'+m+'</option>').join("");
   const toolQuarterSelect = qLabels2.map((l,i) => '<option value="'+i+'" '+(i===state.finQuarter?'selected':'')+'>'+l+'</option>').join("");
-  const toolDateSelect = state.finView==='monthly'?'<span class="text-xs text-slate-500 ml-2">月份：</span><select onchange="state.finMonth=this.value;renderFinance()" class="text-xs font-medium py-1 px-2.5 cursor-pointer" style="appearance:none;-webkit-appearance:none;background-color:transparent;border:0;outline:none;background:url(&apos;data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2212%22 height=%2212%22 viewBox=%220 0 24 24%22 fill=%22none%22 stroke=%22%236b7280%22 stroke-width=%222%22 stroke-linecap=%22round%22 stroke-linejoin=%22round%22%3E%3Cpolyline points=%226 9 12 15 18 9%22%3E%3C/polyline%3E%3C/svg%3E&apos;) no-repeat right 4px center;padding-right:22px;min-height:30px">'+toolMonthSelect+'</select>':state.finView==='quarterly'?'<span class="text-xs text-slate-500 ml-2">季度：</span><select onchange="state.finQuarter=parseInt(this.value);localStorage.setItem(\'opc-fin-quarter\',this.value);renderFinance()" class="text-xs font-medium py-1 px-2.5 cursor-pointer" style="appearance:none;-webkit-appearance:none;background-color:transparent;border:0;outline:none;background:url(&apos;data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2212%22 height=%2212%22 viewBox=%220 0 24 24%22 fill=%22none%22 stroke=%22%236b7280%22 stroke-width=%222%22 stroke-linecap=%22round%22 stroke-linejoin=%22round%22%3E%3Cpolyline points=%226 9 12 15 18 9%22%3E%3C/polyline%3E%3C/svg%3E&apos;) no-repeat right 4px center;padding-right:22px;min-height:30px">'+toolQuarterSelect+'</select>':'';
+  const toolDateSelect = state.finView==='monthly'?'<span class="text-sm text-slate-500 ml-2">月份：</span><select onchange="state.finMonth=this.value;renderFinance()" class="text-sm font-medium py-1 px-2.5 cursor-pointer" style="appearance:none;-webkit-appearance:none;background-color:transparent;border:0;outline:none;background:url(&apos;data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2212%22 height=%2212%22 viewBox=%220 0 24 24%22 fill=%22none%22 stroke=%22%236b7280%22 stroke-width=%222%22 stroke-linecap=%22round%22 stroke-linejoin=%22round%22%3E%3Cpolyline points=%226 9 12 15 18 9%22%3E%3C/polyline%3E%3C/svg%3E&apos;) no-repeat right 4px center;padding-right:22px;min-height:30px">'+toolMonthSelect+'</select>':state.finView==='quarterly'?'<span class="text-sm text-slate-500 ml-2">季度：</span><select onchange="state.finQuarter=parseInt(this.value);localStorage.setItem(\'opc-fin-quarter\',this.value);renderFinance()" class="text-sm font-medium py-1 px-2.5 cursor-pointer" style="appearance:none;-webkit-appearance:none;background-color:transparent;border:0;outline:none;background:url(&apos;data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2212%22 height=%2212%22 viewBox=%220 0 24 24%22 fill=%22none%22 stroke=%22%236b7280%22 stroke-width=%222%22 stroke-linecap=%22round%22 stroke-linejoin=%22round%22%3E%3Cpolyline points=%226 9 12 15 18 9%22%3E%3C/polyline%3E%3C/svg%3E&apos;) no-repeat right 4px center;padding-right:22px;min-height:30px">'+toolQuarterSelect+'</select>':'';
 
-  const finHeaderBase = `<span class="text-xs text-slate-500">视图：</span><select onchange="setFinView(this.value)" class="text-xs font-medium py-1 px-2.5 cursor-pointer" style="appearance:none;-webkit-appearance:none;background-color:transparent;border:0;outline:none;background:url(&apos;data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2212%22 height=%2212%22 viewBox=%220 0 24 24%22 fill=%22none%22 stroke=%22%236b7280%22 stroke-width=%222%22 stroke-linecap=%22round%22 stroke-linejoin=%22round%22%3E%3Cpolyline points=%226 9 12 15 18 9%22%3E%3C/polyline%3E%3C/svg%3E&apos;) no-repeat right 4px center;padding-right:22px;min-height:30px"><option value="overview" ${state.finView==='overview'?'selected':''}>总视图</option><option value="quarterly" ${state.finView==='quarterly'?'selected':''}>季度视图</option><option value="monthly" ${state.finView==='monthly'?'selected':''}>月度视图</option></select>${toolDateSelect}`;
+  const finHeaderBase = `<span class="text-sm text-slate-500">视图：</span><select onchange="setFinView(this.value)" class="text-sm font-medium py-1 px-2.5 cursor-pointer" style="appearance:none;-webkit-appearance:none;background-color:transparent;border:0;outline:none;background:url(&apos;data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2212%22 height=%2212%22 viewBox=%220 0 24 24%22 fill=%22none%22 stroke=%22%236b7280%22 stroke-width=%222%22 stroke-linecap=%22round%22 stroke-linejoin=%22round%22%3E%3Cpolyline points=%226 9 12 15 18 9%22%3E%3C/polyline%3E%3C/svg%3E&apos;) no-repeat right 4px center;padding-right:22px;min-height:30px"><option value="overview" ${state.finView==='overview'?'selected':''}>总视图</option><option value="quarterly" ${state.finView==='quarterly'?'selected':''}>季度视图</option><option value="monthly" ${state.finView==='monthly'?'selected':''}>月度视图</option></select>${toolDateSelect}`;
   const finAddBtn = `<button class="btn btn-primary btn-sm" onclick="openFinanceModal()">新增财务项目</button>`;
 
-  const finFilterTabs = `<div class="finance-tabs" style="padding:0;border-bottom:1px solid #e2e8f0;margin-bottom:0"><button onclick="switchFinFilter('已签约')" class="finance-tab${state.finFilter==='已签约'?' active':''}" style="font-size:14px;font-weight:600">已签约 (${pfs.filter(x=>x.status==='已签约').length})</button><button onclick="switchFinFilter('待签约')" class="finance-tab${state.finFilter==='待签约'?' active':''}" style="font-size:14px;font-weight:600">待签约 (${pfs.filter(x=>x.status==='待签约').length})</button><button onclick="switchFinFilter('expense')" class="finance-tab${state.finFilter==='expense'?' active':''}" style="font-size:14px;font-weight:600">平台费用</button></div>`;
+  const finFilterTabs = `<div class="finance-tabs" style="padding:0;border-bottom:1px solid #e2e8f0;margin-bottom:0"><button onclick="switchFinFilter('overview')" class="finance-tab${state.finFilter==='overview'?' active':''}" style="font-size:14px;font-weight:600">总览</button><button onclick="switchFinFilter('已签约')" class="finance-tab${state.finFilter==='已签约'?' active':''}" style="font-size:14px;font-weight:600">项目 (${pfs.filter(x=>x.status==='已签约').length})</button><button onclick="switchFinFilter('待签约')" class="finance-tab${state.finFilter==='待签约'?' active':''}" style="font-size:14px;font-weight:600">待签约 (${pfs.filter(x=>x.status==='待签约').length})</button><button onclick="switchFinFilter('expense')" class="finance-tab${state.finFilter==='expense'?' active':''}" style="font-size:14px;font-weight:600">平台费用</button></div>`;
 
   document.querySelector("#finance").innerHTML = `<div class="grid gap-4">
     ${finFilterTabs}
-    ${state.finFilter !== 'expense' ? card(`<div class="flex justify-between items-center"><div class="flex items-center gap-2">${finHeaderBase}</div>${finAddBtn}</div>`, "p-4") : ''}
+    ${state.finFilter !== 'expense' && state.finFilter !== 'overview' ? card(`<div class="flex justify-between items-center"><div class="flex items-center gap-2">${finHeaderBase}</div>${finAddBtn}</div>`, "p-4") : ''}
     <div id="financeModal" class="hidden fixed inset-0 z-50 flex items-center justify-center bg-black/40" onclick="closeFinanceModal()"><div class="bg-white rounded-2xl shadow-2xl w-full max-w-6xl mx-4 max-h-[92vh] overflow-y-auto" onclick="event.stopPropagation()"><div class="sticky top-0 z-10 bg-white/95 backdrop-blur border-b border-slate-100 px-8 py-5 flex items-center justify-between"><div><h3 class="text-xl font-bold text-slate-800" id="financeModalTitle">新增项目财务</h3><p class="text-xs text-slate-400 mt-0.5">填写项目财务信息与月度预算</p></div><div class="flex items-center gap-2"><button class="btn btn-ghost btn-sm text-red-600 hidden" id="financeDeleteBtn" onclick="deleteFinanceItem()"><i data-lucide="trash-2"></i>删除</button><button class="btn btn-ghost btn-sm rounded-full w-8 h-8 p-0" onclick="closeFinanceModal()"><i data-lucide="x"></i></button></div></div>
   <div class="finance-tabs">
     <button class="finance-tab active" data-tab="info" onclick="switchFinanceTab('info')"><i data-lucide="info" style="width:14px;height:14px;display:inline-block;vertical-align:-2px;margin-right:4px"></i>基本信息</button>
@@ -237,6 +237,10 @@ function renderFinance() {
 </div>
 </div><div class="flex justify-end gap-3 pt-2 finance-form-actions"><button type="button" class="btn btn-ghost btn-sm px-6" onclick="closeFinanceModal()">取消</button><button type="submit" class="btn btn-primary btn-sm px-8">保存</button></div></form></div></div>
     ${(() => {
+      if (state.finFilter === 'overview') {
+        setTimeout(() => renderFinanceOverview(), 10);
+        return `<div id="financeOverview"></div>`;
+      }
       if (state.finFilter === 'expense') {
         setTimeout(() => renderExpense(), 10);
         return `<div id="financeExpense"></div>`;
@@ -257,38 +261,49 @@ function renderFinance() {
         { label: '付款率', hideUnsigned: true, value: ctx => ctx.sumCost && ctx.sumPaid ? Math.round(ctx.sumPaid / ctx.sumCost * 100) + '%' : '—', color: 'text-slate-500' },
       ].filter(c => state.finFilter !== '待签约' || !c.hideUnsigned);
 
+      // 列排序
+      if (!state.finSort) state.finSort = { key: null, asc: true };
+      const sortData = (data, key) => {
+        if (!key || !state.finSort.key) return data;
+        var asc = state.finSort.asc ? 1 : -1;
+        return data.slice().sort(function(a, b) {
+          var va = a[key], vb = b[key];
+          if (typeof va === 'string') va = va || '', vb = vb || '';
+          else { va = parseFloat(va) || 0; vb = parseFloat(vb) || 0; }
+          if (va < vb) return -1 * asc;
+          if (va > vb) return 1 * asc;
+          return 0;
+        });
+      };
+      const buildThead = (cols, sortKey) => {
+        var h = '<thead><tr class="bg-slate-50 border-b border-slate-200">';
+        cols.forEach(function(c) {
+          var arrow = sortKey ? (sortKey === c.key ? (state.finSort.asc ? ' ↑' : ' ↓') : '') : '';
+          h += '<th class="p-2 text-center font-semibold align-middle cursor-pointer select-none" onclick="setFinSort(\'' + sortKey + '|' + c.key + '\')">' + c.label + arrow + '</th>';
+        });
+        h += '</tr></thead>';
+        return h;
+      };
+      const SIGNED_COLS = [
+        { key: 'customer_name', label: '项目名称' }, { key: 'status', label: '状态' }, { key: 'sign_amount', label: '签约金额' },
+        { key: 'rev', label: '已确收' }, { key: 'gross', label: '毛利' }, { key: 'cost', label: '成本' },
+        { key: 'profit', label: '项目利润' }, { key: 'payment', label: '已回款' }, { key: 'paid', label: '已付' },
+        { key: 'cashflow', label: '现金流' }, { key: 'exe_rate', label: '执行率' }, { key: 'gross_rate', label: '毛利率' },
+        { key: 'pay_rate', label: '回款率' }, { key: 'paid_rate', label: '付款率' },
+      ];
+      const UNSIGNED_COLS = [
+        { key: 'customer_name', label: '项目名称' }, { key: 'status', label: '状态' }, { key: 'sign_amount', label: '签约金额' },
+        { key: 'sign_month', label: '签约月份' }, { key: 'gross', label: '毛利' }, { key: 'cost', label: '成本' },
+        { key: 'profit', label: '项目利润' },
+      ];
+
       const renderView = (rows, sumRev, sumPay, sumCost, sumPaid, sumGross, signTotal, signCnt, emptyText) => {
         const ctx = { sumRev, sumPay, sumCost, sumPaid, sumGross, signTotal, signCnt };
         const cards = METRIC_CARDS.map(c => {
           const v = c.value(ctx);
           return typeof v === 'object' ? [c.label, v.val, v.cls] : [c.label, v, c.color];
         });
-        const thead = isUnsigned
-          ? '<thead><tr class="bg-slate-50 border-b border-slate-200">' +
-            '<th class="p-2 text-center font-semibold align-middle">项目名称</th>' +
-            '<th class="p-2 text-center font-semibold align-middle">状态</th>' +
-            '<th class="p-2 text-center font-semibold align-middle">签约金额</th>' +
-            '<th class="p-2 text-center font-semibold align-middle">签约月份</th>' +
-            '<th class="p-2 text-center font-semibold align-middle">毛利</th>' +
-            '<th class="p-2 text-center font-semibold align-middle text-rose-600">成本</th>' +
-            '<th class="p-2 text-center font-semibold align-middle">项目利润</th>' +
-            '</tr></thead>'
-          : '<thead><tr class="bg-slate-50 border-b border-slate-200">' +
-            '<th class="p-2 text-center font-semibold align-middle">项目名称</th>' +
-            '<th class="p-2 text-center font-semibold align-middle">状态</th>' +
-            '<th class="p-2 text-center font-semibold align-middle">签约金额</th>' +
-            '<th class="p-2 text-center font-semibold align-middle text-blue-600">已确收</th>' +
-            '<th class="p-2 text-center font-semibold align-middle">毛利</th>' +
-            '<th class="p-2 text-center font-semibold align-middle text-rose-600">成本</th>' +
-            '<th class="p-2 text-center font-semibold align-middle">项目利润</th>' +
-            '<th class="p-2 text-center font-semibold align-middle text-amber-600">已回款</th>' +
-            '<th class="p-2 text-center font-semibold align-middle text-purple-600">已付</th>' +
-            '<th class="p-2 text-center font-semibold align-middle text-slate-700">现金流</th>' +
-            '<th class="p-2 text-center font-semibold align-middle">执行率</th>' +
-            '<th class="p-2 text-center font-semibold align-middle">毛利率</th>' +
-            '<th class="p-2 text-center font-semibold align-middle">回款率</th>' +
-            '<th class="p-2 text-center font-semibold align-middle">付款率</th>' +
-            '</tr></thead>';
+        const thead = isUnsigned ? buildThead(UNSIGNED_COLS, 'uns') : buildThead(SIGNED_COLS, 'sig');
         const theadCols = isUnsigned ? 7 : 14;
         const tbody = rows.length ? `<tbody>${rows.join("")}</tbody>` : `<tr><td colspan="${theadCols}" class="p-6 text-center text-slate-400">${emptyText}</td></tr>`;
 
@@ -296,7 +311,7 @@ function renderFinance() {
         const subtitle = isUnsigned
           ? '合同 → 毛利 → 成本 → 项目利润'
           : '合同 → 确收 → 毛利 → 成本 → 项目利润 → 回款 → 已付 → 现金流 → 执行率 → 毛利率 → 回款率 → 付款率';
-        return card(`<div class="grid ${cardGrid} gap-3 mb-3">${cards.map(([l, v, c]) => '<div class="metric-card p-3"><span class="flex items-center gap-2 text-xs text-slate-500">' + l + '</span><strong class="mt-2 block text-xl ' + c + '">' + v + '</strong></div>').join("")}</div>`, "p-4") +
+        return card(`<div class="grid ${cardGrid} gap-3 mb-3">${cards.map(([l, v, c]) => '<div class="metric-card p-3"><span class="flex items-center gap-2 text-sm text-slate-500">' + l + '</span><strong class="mt-2 block text-xl ' + c + '">' + v + '</strong></div>').join("")}</div>`, "p-4") +
                card(`<h3 class="text-sm font-bold text-slate-700">项目财务明细</h3><p class="text-xs text-slate-400 mb-3">${subtitle}</p><div class="overflow-x-auto"><table class="w-full text-sm">${thead}${tbody}</table></div>`, "p-4");
       };
 
@@ -304,7 +319,9 @@ function renderFinance() {
       const tdRow = (pf, rev, payment, cost, paid, gross) => {
         const cashflow = payment - paid;
         const exe = rev && pf.sign_amount ? Math.round(rev / pf.sign_amount * 100) + '%' : '<span class="text-slate-300">—</span>';
-        const payR = rev && payment ? Math.round(payment / rev * 100) + '%' : '<span class="text-slate-300">—</span>';
+        const payRVal = rev && payment ? Math.round(payment / rev * 100) : null;
+        const payRCls = payRVal === null ? '' : payRVal < 30 ? 'text-red-600' : payRVal < 80 ? 'text-amber-600' : 'text-green-600';
+        const payR = payRVal !== null ? '<span class="' + payRCls + ' font-semibold">' + payRVal + '%</span>' : '<span class="text-slate-300">—</span>';
         const paidR = cost && paid ? Math.round(paid / cost * 100) + '%' : '<span class="text-slate-300">—</span>';
         const grossR = rev && gross ? Math.round(gross / rev * 100) + '%' : '<span class="text-slate-300">—</span>';
         const st = pf.status === '已签约' ? '<span class="text-green-600">已签约</span>' : '<span class="text-amber-600">待签约</span>';
@@ -330,8 +347,7 @@ function renderFinance() {
         const defaultMonth = now.getFullYear() + "-" + String(now.getMonth() + 1).padStart(2, "0");
         if (!state.finMonth) state.finMonth = defaultMonth;
         const selMonth = state.finMonth;
-        const rows = [];
-        let sumRev = 0, sumPay = 0, sumCost = 0, sumPaid = 0, sumGross = 0;
+        var dataItems = [];
         allPfs.forEach(pf => {
           let bd = []; try { bd = JSON.parse(pf.budget_data || "[]"); } catch (e) {}
           let ed = []; try { ed = JSON.parse(pf.expense_data || "[]"); } catch (e) {}
@@ -343,8 +359,24 @@ function renderFinance() {
           const cost = Math.round(parseFloat(e.cost || 0) || 0);
           const paid = Math.round(parseFloat(e.paid || 0) || 0);
           if (!rev && !payment && !cost && !paid && !gross) return;
-          sumRev += rev; sumPay += payment; sumCost += cost; sumPaid += paid; sumGross += gross;
-          rows.push(isUnsigned ? tdRowUnsigned(pf, cost, gross) : tdRow(pf, rev, payment, cost, paid, gross));
+          dataItems.push({
+            pf: pf, customer_name: pf.customer_name || '', status: pf.status || '',
+            sign_amount: pf.sign_amount || 0, sign_month: pf.sign_month || '',
+            rev: rev, gross: gross, cost: cost, profit: gross, payment: payment, paid: paid,
+            cashflow: payment - paid,
+            exe_rate: rev && pf.sign_amount ? Math.round(rev / pf.sign_amount * 100) : 0,
+            gross_rate: rev && gross ? Math.round(gross / rev * 100) : 0,
+            pay_rate: rev && payment ? Math.round(payment / rev * 100) : 0,
+            paid_rate: cost && paid ? Math.round(paid / cost * 100) : 0,
+          });
+        });
+        var sortK = state.finSort && state.finSort.key ? state.finSort.key.split('|')[1] : null;
+        dataItems = sortData(dataItems, sortK);
+        const rows = [];
+        let sumRev = 0, sumPay = 0, sumCost = 0, sumPaid = 0, sumGross = 0;
+        dataItems.forEach(d => {
+          sumRev += d.rev; sumPay += d.payment; sumCost += d.cost; sumPaid += d.paid; sumGross += d.gross;
+          rows.push(isUnsigned ? tdRowUnsigned(d.pf, d.cost, d.gross) : tdRow(d.pf, d.rev, d.payment, d.cost, d.paid, d.gross));
         });
         const signTotal = Math.round(allPfs.filter(x => (x.sign_month || "").substring(0, 7) === selMonth).reduce((a, p) => a + (p.sign_amount || 0), 0));
         const signCnt = allPfs.filter(x => x.status === "已签约" && (x.sign_month || "").substring(0, 7) === selMonth).length;
@@ -371,16 +403,32 @@ function renderFinance() {
           try { JSON.parse(pf.expense_data || "[]").forEach(e => { const m = parseInt((e.month || "").substring(5)) || 0; if (qRange.includes(m)) total += parseFloat(e[field] || 0); }); } catch (e) {}
           return total;
         };
-        let sumRev = 0, sumPay = 0, sumCost = 0, sumPaid = 0, sumGross = 0;
-        const rows = [];
+        var dataItems = [];
         allPfs.forEach(pf => {
           const rev = sumBudget(pf, "rev");
           const payment = sumBudget(pf, "payment");
           const gross = sumBudget(pf, "gross");
           const cost = sumExpense(pf, "cost");
           const paid = sumExpense(pf, "paid");
-          sumRev += rev; sumPay += payment; sumCost += cost; sumPaid += paid; sumGross += gross;
-          rows.push(isUnsigned ? tdRowUnsigned(pf, cost, gross) : tdRow(pf, rev, payment, cost, paid, gross));
+          if (!rev && !payment && !cost && !paid && !gross) return;
+          dataItems.push({
+            pf: pf, customer_name: pf.customer_name || '', status: pf.status || '',
+            sign_amount: pf.sign_amount || 0, sign_month: pf.sign_month || '',
+            rev: rev, gross: gross, cost: cost, profit: gross, payment: payment, paid: paid,
+            cashflow: payment - paid,
+            exe_rate: rev && pf.sign_amount ? Math.round(rev / pf.sign_amount * 100) : 0,
+            gross_rate: rev && gross ? Math.round(gross / rev * 100) : 0,
+            pay_rate: rev && payment ? Math.round(payment / rev * 100) : 0,
+            paid_rate: cost && paid ? Math.round(paid / cost * 100) : 0,
+          });
+        });
+        var sortK = state.finSort && state.finSort.key ? state.finSort.key.split('|')[1] : null;
+        dataItems = sortData(dataItems, sortK);
+        let sumRev = 0, sumPay = 0, sumCost = 0, sumPaid = 0, sumGross = 0;
+        const rows = [];
+        dataItems.forEach(d => {
+          sumRev += d.rev; sumPay += d.payment; sumCost += d.cost; sumPaid += d.paid; sumGross += d.gross;
+          rows.push(isUnsigned ? tdRowUnsigned(d.pf, d.cost, d.gross) : tdRow(d.pf, d.rev, d.payment, d.cost, d.paid, d.gross));
         });
         const signTotal = Math.round(allPfs.filter(x => { const m = parseInt((x.sign_month || "0").substring(5)) || 0; return qRange.includes(m); }).reduce((a, p) => a + (p.sign_amount || 0), 0));
         const signCnt = allPfs.filter(x => x.status === "已签约" && qRange.includes(parseInt((x.sign_month || "0").substring(5)) || 0)).length;
@@ -398,12 +446,26 @@ function renderFinance() {
         return { rev: Math.round(rev), payment: Math.round(payment), cost: Math.round(cost), paid: Math.round(paid), gross: Math.round(gross) };
       };
       const allPfs = pfs.filter(x => x.status === state.finFilter);
+      var dataItems = allPfs.map(pf => {
+        var t = calcTotals(pf);
+        return {
+          pf: pf, customer_name: pf.customer_name || '', status: pf.status || '',
+          sign_amount: pf.sign_amount || 0, sign_month: pf.sign_month || '',
+          rev: t.rev, gross: t.gross, cost: t.cost, profit: t.gross,
+          payment: t.payment, paid: t.paid, cashflow: t.payment - t.paid,
+          exe_rate: t.rev && pf.sign_amount ? Math.round(t.rev / pf.sign_amount * 100) : 0,
+          gross_rate: t.rev && t.gross ? Math.round(t.gross / t.rev * 100) : 0,
+          pay_rate: t.rev && t.payment ? Math.round(t.payment / t.rev * 100) : 0,
+          paid_rate: t.cost && t.paid ? Math.round(t.paid / t.cost * 100) : 0,
+        };
+      });
+      var sortK = state.finSort && state.finSort.key ? state.finSort.key.split('|')[1] : null;
+      dataItems = sortData(dataItems, sortK);
       let sumRev = 0, sumPay = 0, sumCost = 0, sumPaid = 0, sumGross = 0;
       const rows = [];
-      allPfs.forEach(pf => {
-        const t = calcTotals(pf);
-        sumRev += t.rev; sumPay += t.payment; sumCost += t.cost; sumPaid += t.paid; sumGross += t.gross;
-        rows.push(isUnsigned ? tdRowUnsigned(pf, t.cost, t.gross) : tdRow(pf, t.rev, t.payment, t.cost, t.paid, t.gross));
+      dataItems.forEach(d => {
+        sumRev += d.rev; sumPay += d.payment; sumCost += d.cost; sumPaid += d.paid; sumGross += d.gross;
+        rows.push(isUnsigned ? tdRowUnsigned(d.pf, d.cost, d.gross) : tdRow(d.pf, d.rev, d.payment, d.cost, d.paid, d.gross));
       });
       const signTotal = Math.round(allPfs.reduce((a, p) => a + (p.sign_amount || 0), 0));
       const signCnt = allPfs.filter(x => x.status === "已签约").length;
@@ -873,4 +935,95 @@ window.deleteFinanceItem = async () => {
   } catch (error) {
     toast("删除失败：" + error.message, "error");
   }
+}
+
+// 总览渲染
+function renderFinanceOverview() {
+  const { summary, financeMonthly } = state.data;
+  if (!summary) return;
+  const m = summary.metrics;
+  const moneyIntL = (v) => `${Math.round(Number(v || 0)).toLocaleString("zh-CN")} 元`;
+  const moneyWan = (v) => {
+    const n = Number(v || 0);
+    return n >= 10000 ? (n / 10000).toFixed(0) + "万" : n.toLocaleString("zh-CN");
+  };
+  const card = (body, cls) => '<div class="card ' + (cls || 'p-4') + '">' + body + '</div>';
+
+  const rows1 = [["年度累计", moneyIntL(m.signed_annual || m.signed_amount)], ["本季度累计", moneyIntL(m.signed_q2 || 0)], ["本月累计", moneyIntL(m.signed_month || 0)], ["上本季度累计", moneyIntL(m.signed_prev_q || 0)], ["上月累计", moneyIntL(m.signed_prev_month || 0)]];
+  const rows2 = [["年度累计", moneyIntL(m.revenue_annual || 0)], ["本季度累计", moneyIntL(m.revenue_q2 || 0)], ["本月累计", moneyIntL(m.monthly_revenue || 0)], ["上本季度累计", moneyIntL(m.revenue_prev_q || 0)], ["上月累计", moneyIntL(m.revenue_prev_month || 0)]];
+  const rows3 = [["年度累计", moneyIntL(m.gross_annual || 0)], ["本季度累计", moneyIntL(m.gross_q2 || 0)], ["本月累计", moneyIntL(m.monthly_net_profit || 0)], ["上本季度累计", moneyIntL(m.gross_prev_q || 0)], ["上月累计", moneyIntL(m.gross_prev_month || 0)]];
+  const rows4 = [["年度累计", moneyIntL(m.cost_annual || 0)], ["本季度累计", moneyIntL(m.cost_q2 || 0)], ["本月累计", moneyIntL(m.cost_month || 0)], ["上本季度累计", moneyIntL(m.cost_prev_q || 0)], ["上月累计", moneyIntL(m.cost_prev_month || 0)]];
+  const rows5 = [["年度累计", moneyIntL(m.profit_annual || 0)], ["本季度累计", moneyIntL(m.profit_q2 || 0)], ["本月累计", moneyIntL(m.profit_month || 0)], ["上本季度累计", moneyIntL(m.profit_prev_q || 0)], ["上月累计", moneyIntL(m.profit_prev_month || 0)]];
+  const rows7 = [["年度累计", moneyIntL(m.payment_annual || 0)], ["本季度累计", moneyIntL(m.payment_q2 || 0)], ["本月累计", moneyIntL(m.payment_month || 0)], ["上本季度累计", moneyIntL(m.payment_prev_q || 0)], ["上月累计", moneyIntL(m.payment_prev_month || 0)]];
+  const rows8 = [["年度累计", moneyIntL(m.paid_annual || 0)], ["本季度累计", moneyIntL(m.paid_q2 || 0)], ["本月累计", moneyIntL(m.paid_month || 0)], ["上本季度累计", moneyIntL(m.paid_prev_q || 0)], ["上月累计", moneyIntL(m.paid_prev_month || 0)]];
+  const rows9 = [["年度累计", moneyIntL(m.cashflow_annual || 0)], ["本季度累计", moneyIntL(m.cashflow_q2 || 0)], ["本月累计", moneyIntL(m.cashflow_month || 0)], ["上本季度累计", moneyIntL(m.cashflow_prev_q || 0)], ["上月累计", moneyIntL(m.cashflow_prev_month || 0)]];
+
+  const qoq = (cur, prev) => { if (!prev) return '<span class="text-slate-300">—</span>'; const pct = Math.round((cur - prev) / prev * 100); const cls = pct >= 0 ? 'text-green-600' : 'text-red-600'; const sign = pct >= 0 ? '+' : ''; return '<span class="' + cls + '">' + sign + pct + '%</span>'; };
+  const LABELS = ['合同金额','确收金额','确收毛利','成本','项目利润','回款金额','已付','现金流'];
+  const Q_FIELDS = [m.signed_q2||0, m.revenue_q2, m.gross_q2, m.cost_q2||0, m.profit_q2||0, m.payment_q2||0, m.paid_q2||0, m.cashflow_q2||0];
+  const Q_PREV = [m.signed_prev_q||0, m.revenue_prev_q||0, m.gross_prev_q||0, m.cost_prev_q||0, m.profit_prev_q||0, m.payment_prev_q||0, m.paid_prev_q||0, m.cashflow_prev_q||0];
+  const M_FIELDS = [m.signed_month||0, m.monthly_revenue, m.monthly_net_profit, m.cost_month||0, m.profit_month||0, m.payment_month||0, m.paid_month||0, m.cashflow_month||0];
+  const M_PREV = [m.signed_prev_month||0, m.revenue_prev_month||0, m.gross_prev_month||0, m.cost_prev_month||0, m.profit_prev_month||0, m.payment_prev_month||0, m.paid_prev_month||0, m.cashflow_prev_month||0];
+  const ROWS = [rows1, rows2, rows3, rows4, rows5, rows7, rows8, rows9];
+  const CF_RAW = [m.cashflow_annual||0, m.cashflow_q2||0, m.cashflow_month||0, m.cashflow_prev_q||0, m.cashflow_prev_month||0];
+  const PF_RAW = [m.profit_annual||0, m.profit_q2||0, m.profit_month||0, m.profit_prev_q||0, m.profit_prev_month||0];
+
+  var tdVal = function(ri, col, val) {
+    if (ri === 4) return '<td class="py-2 text-right font-semibold ' + (PF_RAW[col] >= 0 ? 'text-green-600' : 'text-red-600') + '">' + val + '</td>';
+    if (ri === 7) return '<td class="py-2 text-right font-semibold ' + (CF_RAW[col] >= 0 ? 'text-green-600' : 'text-red-600') + '">' + val + '</td>';
+    return '<td class="py-2 text-right font-semibold text-slate-800">' + val + '</td>';
+  };
+  var thead = '<tr class="border-b border-slate-200"><th class="py-2 text-left text-slate-500">指标</th><th class="py-2 text-right font-semibold text-slate-700">年度累计</th><th class="py-2 text-right font-semibold text-slate-700">上季度累计</th><th class="py-2 text-right font-semibold text-slate-700">上月累计</th><th class="py-2 text-right font-semibold text-slate-700">本季度累计</th><th class="py-2 text-right font-semibold text-slate-400">季环比</th><th class="py-2 text-right font-semibold text-slate-700">本月累计</th><th class="py-2 text-right font-semibold text-slate-400">月环比</th></tr>';
+  var tbody = '';
+  for (var ri = 0; ri < 8; ri++) {
+    var vals = ROWS[ri];
+    tbody += '<tr class="border-b border-slate-100 last:border-0"><td class="py-2 text-left font-semibold text-slate-700">' + LABELS[ri] + '</td>' +
+      tdVal(ri, 0, vals[0][1]) + tdVal(ri, 3, vals[3][1]) + tdVal(ri, 4, vals[4][1]) + tdVal(ri, 1, vals[1][1]) +
+      '<td class="py-2 text-right">' + qoq(Q_FIELDS[ri], Q_PREV[ri]) + '</td>' +
+      tdVal(ri, 2, vals[2][1]) +
+      '<td class="py-2 text-right">' + qoq(M_FIELDS[ri], M_PREV[ri]) + '</td></tr>';
+  }
+
+  document.querySelector("#financeOverview").innerHTML = '<div class="grid gap-5">' +
+    card('<h3 class="text-sm font-bold text-slate-700">业务（项目）财务概览</h3><p class="text-xs text-slate-400 mb-3">合同 → 确收 → 毛利 → 成本 → 项目利润 → 回款 → 已付 → 现金流</p><div class="overflow-x-auto"><table class="w-full text-sm"><thead>' + thead + '</thead><tbody>' + tbody + '</tbody></table></div>', 'p-4') +
+    '<div class="grid grid-cols-4 gap-5">' +
+      card('<div class="mb-3 flex items-center justify-between"><h2 class="text-sm font-bold text-slate-600">月度签约趋势</h2><span class="text-xs text-slate-400">2026</span></div><div style="position:relative;height:200px"><canvas id="finChartSign"></canvas></div>', 'p-4') +
+      card('<div class="mb-3 flex items-center justify-between"><h2 class="text-sm font-bold text-slate-600">月度确收与毛利</h2><span class="text-xs text-slate-400">2026</span></div><div style="position:relative;height:200px"><canvas id="finChartRev"></canvas></div>', 'p-4') +
+      card('<div class="mb-3 flex items-center justify-between"><h2 class="text-sm font-bold text-slate-600">月度回款与已付</h2><span class="text-xs text-slate-400">2026</span></div><div style="position:relative;height:200px"><canvas id="finChartCash"></canvas></div>', 'p-4') +
+      card('<div class="mb-3 flex items-center justify-between"><h2 class="text-sm font-bold text-slate-600">月度项目利润</h2><span class="text-xs text-slate-400">2026</span></div><div style="position:relative;height:200px"><canvas id="finChartProfit"></canvas></div>', 'p-4') +
+    '</div></div>';
+
+  if (window.lucide) window.lucide.createIcons();
+  // 渲染图表（复用 home.js 的 moneyTick / chartOptions / monthLabels）
+  if (financeMonthly && window.Chart) {
+    renderOverviewCharts(financeMonthly);
+  }
+}
+
+function renderOverviewCharts(data) {
+  if (typeof monthLabels !== 'function') return;
+  const labels = monthLabels(data);
+  const baseOpts = typeof chartOptions === 'function' ? chartOptions(moneyTick) : { responsive: true, maintainAspectRatio: false };
+  var iconf = { type: "line", options: baseOpts, data: { labels: labels } };
+
+  var c1 = document.querySelector("#finChartSign");
+  if (c1 && window.Chart) {
+    if (state.finChart1) state.finChart1.destroy();
+    state.finChart1 = new Chart(c1, Object.assign({}, iconf, { data: { labels: labels, datasets: [{ label: "签约金额", data: data.map(function(x) { return x.sign || 0; }), borderColor: "#6366f1", backgroundColor: "rgba(99,102,241,0.06)", fill: true, tension: 0.3 }] } }));
+  }
+  var c2 = document.querySelector("#finChartRev");
+  if (c2 && window.Chart) {
+    if (state.finChart2) state.finChart2.destroy();
+    state.finChart2 = new Chart(c2, Object.assign({}, iconf, { data: { labels: labels, datasets: [{ label: "确收", data: data.map(function(x) { return x.revenue || 0; }), borderColor: "#2563eb", backgroundColor: "rgba(37,99,235,0.06)", fill: true, tension: 0.3 }, { label: "毛利", data: data.map(function(x) { return x.gross || 0; }), borderColor: "#059669", backgroundColor: "rgba(5,150,105,0.06)", fill: true, tension: 0.3 }] } }));
+  }
+  var c3 = document.querySelector("#finChartCash");
+  if (c3 && window.Chart) {
+    if (state.finChart3) state.finChart3.destroy();
+    state.finChart3 = new Chart(c3, Object.assign({}, iconf, { data: { labels: labels, datasets: [{ label: "回款", data: data.map(function(x) { return x.payment || 0; }), borderColor: "#d97706", backgroundColor: "rgba(217,119,6,0.06)", fill: true, tension: 0.3 }, { label: "已付", data: data.map(function(x) { return x.cost || 0; }), borderColor: "#7c3aed", backgroundColor: "rgba(124,58,237,0.06)", fill: true, tension: 0.3 }] } }));
+  }
+  var c4 = document.querySelector("#finChartProfit");
+  if (c4 && window.Chart) {
+    if (state.finChart4) state.finChart4.destroy();
+    state.finChart4 = new Chart(c4, Object.assign({}, iconf, { data: { labels: labels, datasets: [{ label: "利润", data: data.map(function(x) { return x.gross || 0; }), borderColor: "#6366f1", backgroundColor: "rgba(99,102,241,0.06)", fill: true, tension: 0.3 }] } }));
+  }
 };

static/modules/home.js

@@ -4,6 +4,18 @@ function renderHome() {
   const { summary, financeMonthly } = state.data;
   const m = summary.metrics;
   const moneyInt = (v) => `${Math.round(Number(v || 0)).toLocaleString("zh-CN")} 元`;
+  // 回款提醒
+  const yrRev = m.revenue_annual || 0, yrPay = m.payment_annual || 0, yrUnpaid = yrRev - yrPay;
+  const yrPayRate = yrRev > 0 ? Math.round(yrPay / yrRev * 100) : 0;
+  const yrUnpaidWan = Math.round(Math.abs(yrUnpaid) / 10000);
+  const payRateCls = yrPayRate < 30 ? 'text-red-600' : yrPayRate < 80 ? 'text-amber-600' : 'text-green-600';
+  const unpaidLabel = yrUnpaid >= 0
+    ? '你还有 <strong class=\"text-red-600\">' + yrUnpaidWan + '万</strong> 未回款'
+    : '超额回款 <strong class=\"text-green-600\">' + yrUnpaidWan + '万</strong>';
+  const payReminder = yrRev > 0 ? '<div class=\"flex items-center gap-3 px-4 py-3 rounded-lg border\" style=\"background:linear-gradient(135deg,#fef3c7,#fde68a);border-color:#f59e0b\">' +
+    '<i data-lucide=\"bell-ring\" class=\"text-amber-600 flex-shrink-0\" style=\"width:18px;height:18px\"></i>' +
+    '<span class=\"text-sm text-amber-900\"><strong>回款提醒：</strong>本年度确收 <strong>' + moneyInt(yrRev) + '</strong>，回款 <strong>' + moneyInt(yrPay) + '</strong>，' + unpaidLabel + '，当前回款率：<strong class=\"' + payRateCls + '\">' + yrPayRate + '%</strong></span>' +
+    '</div>' : '';
   const rows1 = [
     ["年度累计", moneyInt(m.signed_annual || m.signed_amount)],
     ["本季度累计", moneyInt(m.signed_q2 || 0)],
@@ -105,19 +117,18 @@ function renderHome() {
   }
   document.querySelector("#home").innerHTML = `
     <div class="grid gap-5">
-      <div class="flex items-center gap-2">
-        <span class="text-xs text-slate-500">筛选：</span>
-        <select id="homeFilter" class="text-xs font-medium py-1.5 px-3 rounded border border-slate-200 bg-white cursor-pointer" onchange="renderHomeCards()" style="appearance:none;-webkit-appearance:none;padding-right:28px;background:url(&apos;data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2212%22 height=%2212%22 viewBox=%220 0 24 24%22 fill=%22none%22 stroke=%22%236b7280%22 stroke-width=%222%22 stroke-linecap=%22round%22 stroke-linejoin=%22round%22%3E%3Cpolyline points=%226 9 12 15 18 9%22%3E%3C/polyline%3E%3C/svg%3E&apos;) no-repeat right 8px center">
-          <option value="all">全部时间</option>
-          <option value="year">本年度</option>
-          <option value="quarter">本季度</option>
-          <option value="month">本月</option>
-        </select>
-      </div>
-      ${card(`<h3 class="text-sm font-bold text-slate-700 mb-3">部门经营情况</h3><div class="overflow-x-auto"><table class="w-full text-sm"><thead><tr class="border-b border-slate-200"><th class="py-2 text-left text-slate-500">指标</th><th class="py-2 text-right font-semibold text-slate-700">年度累计</th><th class="py-2 text-right font-semibold text-slate-700">上季度累计</th><th class="py-2 text-right font-semibold text-slate-700">上月累计</th><th class="py-2 text-right font-semibold text-slate-700">本季度累计</th><th class="py-2 text-right font-semibold text-slate-400">季环比</th><th class="py-2 text-right font-semibold text-slate-700">本月累计</th><th class="py-2 text-right font-semibold text-slate-400">月环比</th></tr></thead><tbody>
-        ${(() => {
+      ${state.tenant === "总工作台" ? "" : `<div class="grid grid-cols-4 gap-3">
+        ${[
+          ["项目管理", m.total_projects, "finance"],
+          ["重点工作与台账", m.total_proposals, "projects"],
+          ["业务方案", m.total_products, "proposals"],
+          ["产品迭代", m.upcoming_products, "products"],
+        ].map(([label, value, tab]) => `<button class="metric-card" onclick="switchTab('${tab}')"><span class="flex items-center gap-2 text-xs text-slate-500"><i data-lucide="gauge"></i>${label}</span><strong class="mt-2 block text-2xl">${value}</strong></button>`).join("")}
+      </div>`}
+      ${payReminder}
+      ${(() => {
           var d = [
-            ['部门毛利', [m.profit_annual||0, m.profit_q2||0, m.profit_month||0, m.profit_prev_q||0, m.profit_prev_month||0],
+            ['项目毛利', [m.profit_annual||0, m.profit_q2||0, m.profit_month||0, m.profit_prev_q||0, m.profit_prev_month||0],
               [m.profit_q2||0,m.profit_prev_q||0], [m.profit_month||0,m.profit_prev_month||0]],
             ['部门费用', [m.expense_annual||0, m.expense_q2||0, (m.expense_month||0), m.expense_prev_q||0, m.expense_prev_month||0],
               [m.expense_q2||0,m.expense_prev_q||0], [(m.expense_month||0),m.expense_prev_month||0]],
@@ -128,35 +139,38 @@ function renderHome() {
               (m.profit_q2||0)-(m.expense_q2||0), (m.profit_prev_q||0)-(m.expense_prev_q||0)
             ], [
               (m.profit_month||0)-(m.expense_month||0), (m.profit_prev_month||0)-(m.expense_prev_month||0)
-            ]]
+            ]],
+            ['项目现金流', [m.cashflow_annual||0, m.cashflow_q2||0, m.cashflow_month||0, m.cashflow_prev_q||0, m.cashflow_prev_month||0],
+              [m.cashflow_q2||0,m.cashflow_prev_q||0], [m.cashflow_month||0,m.cashflow_prev_month||0]],
+            ['部门费用流出', [m.expense_paid_annual||0, m.expense_paid_q2||0, m.expense_paid_month||0, m.expense_paid_prev_q||0, m.expense_paid_prev_month||0],
+              [m.expense_paid_q2||0,m.expense_paid_prev_q||0], [m.expense_paid_month||0,m.expense_paid_prev_month||0]],
+            ['部门现金流', [m.dept_cf_annual||0, m.dept_cf_q2||0, m.dept_cf_month||0, m.dept_cf_prev_q||0, m.dept_cf_prev_month||0],
+              [m.dept_cf_q2||0,m.dept_cf_prev_q||0], [m.dept_cf_month||0,m.dept_cf_prev_month||0]]
           ];
-          var h = '';
-          var netCls = function(di, raw) { return di === 2 ? (raw >= 0 ? 'text-green-600' : 'text-red-600') : 'text-slate-800'; };
-          for (var di = 0; di < 3; di++) {
-            var r = d[di];
-            h += '<tr class="border-b border-slate-100 last:border-0"><td class="py-2 text-left font-semibold text-slate-700">' + r[0] + '</td>' +
-              '<td class="py-2 text-right font-semibold ' + netCls(di, r[1][0]) + '">' + moneyInt(r[1][0]) + '</td>' +
-              '<td class="py-2 text-right font-semibold ' + netCls(di, r[1][3]) + '">' + moneyInt(r[1][3]) + '</td>' +
-              '<td class="py-2 text-right font-semibold ' + netCls(di, r[1][4]) + '">' + moneyInt(r[1][4]) + '</td>' +
-              '<td class="py-2 text-right font-semibold ' + netCls(di, r[1][1]) + '">' + moneyInt(r[1][1]) + '</td>' +
-              '<td class="py-2 text-right">' + qoq(r[2][0], r[2][1]) + '</td>' +
-              '<td class="py-2 text-right font-semibold ' + netCls(di, r[1][2]) + '">' + moneyInt(r[1][2]) + '</td>' +
-              '<td class="py-2 text-right">' + qoq(r[3][0], r[3][1]) + '</td></tr>';
-          }
-          return h;
+          var buildDeptTable = function(title, dataRows) {
+            var h = '';
+            for (var di = 0; di < dataRows.length; di++) {
+              var r = dataRows[di];
+              var rawNet = r[1][0];
+              var isNet = r[0] === '部门净利' || r[0] === '部门现金流';
+              var isCF = r[0] === '项目现金流';
+              var cls = isNet ? (rawNet >= 0 ? 'text-green-600' : 'text-red-600') : isCF ? (rawNet >= 0 ? 'text-green-600' : 'text-red-600') : 'text-slate-800';
+              h += '<tr class="border-b border-slate-100 last:border-0"><td class="py-2 text-left font-semibold text-slate-700">' + r[0] + '</td>' +
+                '<td class="py-2 text-right font-semibold ' + cls + '">' + moneyInt(r[1][0]) + '</td>' +
+                '<td class="py-2 text-right font-semibold ' + cls + '">' + moneyInt(r[1][3]) + '</td>' +
+                '<td class="py-2 text-right font-semibold ' + cls + '">' + moneyInt(r[1][4]) + '</td>' +
+                '<td class="py-2 text-right font-semibold ' + cls + '">' + moneyInt(r[1][1]) + '</td>' +
+                '<td class="py-2 text-right">' + qoq(r[2][0], r[2][1]) + '</td>' +
+                '<td class="py-2 text-right font-semibold ' + cls + '">' + moneyInt(r[1][2]) + '</td>' +
+                '<td class="py-2 text-right">' + qoq(r[3][0], r[3][1]) + '</td></tr>';
+            }
+            return card('<h3 class="text-sm font-bold text-slate-700 mb-3">' + title + '</h3><div class="overflow-x-auto"><table class="w-full text-sm"><thead><tr class="border-b border-slate-200"><th class="py-2 text-left text-slate-500">指标</th><th class="py-2 text-right font-semibold text-slate-700">年度累计</th><th class="py-2 text-right font-semibold text-slate-700">上季度累计</th><th class="py-2 text-right font-semibold text-slate-700">上月累计</th><th class="py-2 text-right font-semibold text-slate-700">本季度累计</th><th class="py-2 text-right font-semibold text-slate-400">季环比</th><th class="py-2 text-right font-semibold text-slate-700">本月累计</th><th class="py-2 text-right font-semibold text-slate-400">月环比</th></tr></thead><tbody>' + h + '</tbody></table></div>', 'p-4');
+          };
+          return buildDeptTable('部门经营情况', d.slice(0, 3)) + buildDeptTable('部门现金流', d.slice(3, 6));
         })()}
-      </tbody></table></div>`, "p-4")}
-      ${card(`<h3 class="text-sm font-bold text-slate-700">业务（项目）财务概览</h3><p class="text-xs text-slate-400 mb-3">合同 → 确收 → 毛利 → 成本 → 项目利润 → 回款 → 已付 → 现金流</p><div class="overflow-x-auto"><table class="w-full text-sm"><thead>${thead}</thead><tbody>${tbody}</tbody></table></div>`, "p-4")}
-      <div class="grid grid-cols-4 gap-5">
-        ${card(`<div class="mb-3 flex items-center justify-between"><h2 class="text-sm font-bold text-slate-600">月度签约趋势</h2><span class="text-xs text-slate-400">2026</span></div><div style="position:relative;height:200px"><canvas id="chartSign"></canvas></div>`, "p-4")}
-        ${card(`<div class="mb-3 flex items-center justify-between"><h2 class="text-sm font-bold text-slate-600">月度确收与毛利</h2><span class="text-xs text-slate-400">2026</span></div><div style="position:relative;height:200px"><canvas id="chartRev"></canvas></div>`, "p-4")}
-        ${card(`<div class="mb-3 flex items-center justify-between"><h2 class="text-sm font-bold text-slate-600">月度回款与已付</h2><span class="text-xs text-slate-400">2026</span></div><div style="position:relative;height:200px"><canvas id="chartCash"></canvas></div>`, "p-4")}
-        ${card(`<div class="mb-3 flex items-center justify-between"><h2 class="text-sm font-bold text-slate-600">月度项目利润</h2><span class="text-xs text-slate-400">2026</span></div><div style="position:relative;height:200px"><canvas id="chartProfit"></canvas></div>`, "p-4")}
-      </div>
       ${card(`<h2 class="text-lg font-bold">近期动态</h2><div class="mt-4 grid gap-2">${summary.recent.map((r) => `<div class="flex items-start justify-between rounded-md bg-slate-50 px-3 py-2 text-sm group"><span class="break-words">${r.content}</span><div class="flex items-center gap-2 flex-shrink-0 ml-2"><span class="text-xs text-slate-400">${r.followed_at}</span><button class="btn btn-ghost btn-sm text-red-400 opacity-0 group-hover:opacity-100 p-0 w-5 h-5" onclick="event.preventDefault();deleteActivity(${r.id})" title="删除动态"><i data-lucide="trash-2" style="width:14px;height:14px"></i></button></div></div>`).join("")}</div>`, "p-5")}
     </div>
   `;
-  renderCharts(financeMonthly);
 }
 
 function chartOptions(yCallback) {

static/modules/plan_expense.js

@@ -0,0 +1,219 @@
+// expense.js — 费用管理模块
+
+function renderPlanExpense() {
+  var records = state.data.planExpense || [];
+  var money = function(v) { return '¥ ' + (Number(v || 0)).toLocaleString('zh-CN', { minimumFractionDigits: 0, maximumFractionDigits: 2 }); };
+  var esc = function(s) { return (s || '').replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;'); };
+  var EXPENSE_TYPES = ['通用费用','平台采购','人力成本','研发费用','奖金','其他'];
+  var STATUS_OPTIONS = ['计入费用','暂不计入'];
+
+  // 排序状态
+  if (!state.planExpSort) state.planExpSort = { key: 'expense_month', asc: true };
+  var sortKey = state.planExpSort.key;
+  var sortAsc = state.planExpSort.asc ? 1 : -1;
+
+  // 筛选状态
+  var view = state.planExpView || 'total';
+  var typeFilter = state.planExpFilter || '全部';
+  var filtered = typeFilter === '全部' ? records : records.filter(function(r) { return r.expense_type === typeFilter; });
+
+  // 视图数据预处理
+  var now = new Date();
+  var thisYear = now.getFullYear();
+  var defaultMonth = thisYear + '-' + String(now.getMonth() + 1).padStart(2, '0');
+
+  if (!state.planExpMonth) state.planExpMonth = defaultMonth;
+  if (state.planExpQuarter === '') state.planExpQuarter = String(Math.floor(now.getMonth() / 3));
+
+  // 月度筛选
+  if (view === 'monthly') {
+    filtered = filtered.filter(function(r) { return r.expense_month === state.planExpMonth; });
+  }
+
+  // 季度筛选
+  if (view === 'quarterly') {
+    var q = parseInt(state.planExpQuarter) || 0;
+    var qRanges = [[1,2,3],[4,5,6],[7,8,9],[10,11,12]];
+    var qRange = qRanges[q];
+    filtered = filtered.filter(function(r) {
+      var m = parseInt((r.expense_month || '0').substring(5)) || 0;
+      return qRange.indexOf(m) >= 0;
+    });
+  }
+
+  // 排序
+  filtered.sort(function(a, b) {
+    var va = a[sortKey] || '', vb = b[sortKey] || '';
+    if (sortKey === 'amount' || sortKey === 'incurred_amount') {
+      va = parseFloat(va) || 0; vb = parseFloat(vb) || 0;
+    }
+    if (va < vb) return -1 * sortAsc;
+    if (va > vb) return 1 * sortAsc;
+    return 0;
+  });
+
+  var totalAmount = filtered.reduce(function(s, r) { return s + (r.amount || 0); }, 0);
+  var totalIncurred = filtered.reduce(function(s, r) { return s + (r.incurred_amount || 0); }, 0);
+
+  // 月份下拉选项（去年/今年/明年）
+  var monthOpts = '';
+  for (var yr = thisYear - 1; yr <= thisYear + 1; yr++)
+    for (var m = 1; m <= 12; m++) {
+      var mv = yr + '-' + String(m).padStart(2, '0');
+      monthOpts += '<option value="' + mv + '">' + mv + '</option>';
+    }
+
+  // 季度下拉
+  var qLabels = ['Q1 (1-3月)','Q2 (4-6月)','Q3 (7-9月)','Q4 (10-12月)'];
+  var quarterOpts = '';
+  for (var qi = 0; qi < 4; qi++) {
+    quarterOpts += '<option value="' + qi + '">' + qLabels[qi] + '</option>';
+  }
+
+  // 月份/季度日期选择器
+  var dateSelect = '';
+  if (view === 'monthly') {
+    dateSelect = '<span class="text-sm text-slate-500 ml-2">月份：</span><select onchange="setPlanExpMonth(this.value)" class="text-sm font-medium py-1 px-2.5 cursor-pointer" style="appearance:none;-webkit-appearance:none;background-color:transparent;border:0;outline:none;background:url(&apos;data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2212%22 height=%2212%22 viewBox=%220 0 24 24%22 fill=%22none%22 stroke=%22%236b7280%22 stroke-width=%222%22 stroke-linecap=%22round%22 stroke-linejoin=%22round%22%3E%3Cpolyline points=%226 9 12 15 18 9%22%3E%3C/polyline%3E%3C/svg%3E&apos;) no-repeat right 4px center;padding-right:22px;min-height:30px"><option value=""' + (!state.planExpMonth?' selected':'') + '>请选择</option>' + monthOpts.replace('value="' + state.planExpMonth + '"', 'value="' + state.planExpMonth + '" selected') + '</select>';
+  } else if (view === 'quarterly') {
+    dateSelect = '<span class="text-sm text-slate-500 ml-2">季度：</span><select onchange="setPlanExpQuarter(this.value)" class="text-sm font-medium py-1 px-2.5 cursor-pointer" style="appearance:none;-webkit-appearance:none;background-color:transparent;border:0;outline:none;background:url(&apos;data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2212%22 height=%2212%22 viewBox=%220 0 24 24%22 fill=%22none%22 stroke=%22%236b7280%22 stroke-width=%222%22 stroke-linecap=%22round%22 stroke-linejoin=%22round%22%3E%3Cpolyline points=%226 9 12 15 18 9%22%3E%3C/polyline%3E%3C/svg%3E&apos;) no-repeat right 4px center;padding-right:22px;min-height:30px">' + quarterOpts.replace('value="' + state.planExpQuarter + '"', 'value="' + state.planExpQuarter + '" selected') + '</select>';
+  }
+
+  // Toolbar
+  var toolbar = '<span class="text-sm text-slate-500">视图：</span><select onchange="setPlanExpView(this.value)" class="text-sm font-medium py-1 px-2.5 cursor-pointer" style="appearance:none;-webkit-appearance:none;background-color:transparent;border:0;outline:none;background:url(&apos;data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2212%22 height=%2212%22 viewBox=%220 0 24 24%22 fill=%22none%22 stroke=%22%236b7280%22 stroke-width=%222%22 stroke-linecap=%22round%22 stroke-linejoin=%22round%22%3E%3Cpolyline points=%226 9 12 15 18 9%22%3E%3C/polyline%3E%3C/svg%3E&apos;) no-repeat right 4px center;padding-right:22px;min-height:30px"><option value="total"' + (view==='total'?' selected':'') + '>总视图</option><option value="quarterly"' + (view==='quarterly'?' selected':'') + '>季度视图</option><option value="monthly"' + (view==='monthly'?' selected':'') + '>月度视图</option></select><span class="text-sm text-slate-500 ml-3">类型：</span><select onchange="setPlanExpFilter(this.value)" class="text-sm font-medium py-1 px-2.5 cursor-pointer" style="appearance:none;-webkit-appearance:none;background-color:transparent;border:0;outline:none;background:url(&apos;data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2212%22 height=%2212%22 viewBox=%220 0 24 24%22 fill=%22none%22 stroke=%22%236b7280%22 stroke-width=%222%22 stroke-linecap=%22round%22 stroke-linejoin=%22round%22%3E%3Cpolyline points=%226 9 12 15 18 9%22%3E%3C/polyline%3E%3C/svg%3E&apos;) no-repeat right 4px center;padding-right:22px;min-height:30px"><option value="全部"' + (typeFilter==='全部'?' selected':'') + '>全部 (' + records.length + ')</option>';
+  EXPENSE_TYPES.forEach(function(t) {
+    toolbar += '<option value="' + t + '"' + (typeFilter===t?' selected':'') + '>' + t + ' (' + records.filter(function(r){return r.expense_type===t}).length + ')</option>';
+  });
+  toolbar += '</select>' + dateSelect;
+
+  // 排序箭头
+  var sortArrow = function(key) {
+    var arrow = key === sortKey ? (sortAsc === 1 ? ' ↑' : ' ↓') : '';
+    return '<span class="text-slate-400 text-xs cursor-pointer" onclick="togglePlanExpSort(\'' + key + '\')">' + arrow + '</span>';
+  };
+
+  // 表格行
+  var tableRows = '';
+  if (filtered.length) {
+    filtered.forEach(function(r) {
+      var statusCls = r.status === '暂不计入' ? 'text-amber-600' : 'text-green-600';
+      tableRows += '<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="openPlanExpEdit(' + r.id + ')"><td class="p-2 text-center align-middle font-medium">' + (r.expense_month || '—') + '</td><td class="p-2 font-medium text-center align-middle">' + esc(r.expense_type) + '</td><td class="p-2 text-center align-middle font-semibold ' + statusCls + '">' + esc(r.status || '计入费用') + '</td><td class="p-2 text-center align-middle font-medium">' + money(r.amount) + '</td><td class="p-2 text-center align-middle font-medium">' + money(r.incurred_amount) + '</td><td class="p-2 text-center align-middle text-slate-500">' + (esc(r.notes) || '—') + '</td></tr>';
+    });
+  } else {
+    var emptyMsg = view === 'monthly' ? '该月份暂无费用记录' : view === 'quarterly' ? '该季度暂无费用记录' : '暂无费用记录';
+    tableRows = '<tr><td colspan="6" class="p-6 text-center text-slate-400">' + emptyMsg + '</td></tr>';
+  }
+
+  // 模态框 monthOpts for form (with current value preselected)
+  var modalMonthOpts = '<option value="">请选择</option>';
+  for (var yr2 = thisYear - 1; yr2 <= thisYear + 1; yr2++)
+    for (var m2 = 1; m2 <= 12; m2++) {
+      var mv2 = yr2 + '-' + String(m2).padStart(2, '0');
+      modalMonthOpts += '<option value="' + mv2 + '">' + mv2 + '</option>';
+    }
+  var statusOpts = STATUS_OPTIONS.map(function(s) { return '<option value="' + s + '">' + s + '</option>'; }).join('');
+
+  var modal = '<div id="planExpenseModal" class="hidden fixed inset-0 z-50 flex items-center justify-center bg-black/40" onclick="closePlanExpModal()"><div class="bg-white rounded-2xl shadow-2xl w-full max-w-lg mx-4" onclick="event.stopPropagation()"><div class="sticky top-0 z-10 bg-white/95 backdrop-blur border-b border-slate-100 px-6 py-4 flex items-center justify-between"><h3 class="text-lg font-bold text-slate-800" id="planExpenseModalTitle">新增费用</h3><div class="flex items-center gap-2"><button class="btn btn-ghost btn-sm text-red-600 hidden" id="planExpDeleteBtn" onclick="deletePlanExpItem()">删除</button><button class="btn btn-ghost btn-sm rounded-full w-8 h-8 p-0" onclick="closePlanExpModal()"><i data-lucide="x"></i></button></div></div><form onsubmit="savePlanExpense(event)" class="p-6 grid gap-4" novalidate><input type="hidden" name="expense_id" value=""><div class="grid grid-cols-2 gap-3"><label class="block"><span class="text-sm text-slate-500 mb-1 block">费用类型 <span class="text-red-500">*</span></span><select name="expense_type" required class="form-ctrl bg-white"><option value="">请选择</option>';
+  EXPENSE_TYPES.forEach(function(t) { modal += '<option>' + t + '</option>'; });
+  modal += '</select></label><label class="block"><span class="text-sm text-slate-500 mb-1 block">月份 <span class="text-red-500">*</span></span><select name="expense_month" required class="form-ctrl bg-white">' + modalMonthOpts + '</select></label></div><div class="grid grid-cols-2 gap-3"><label class="block"><span class="text-sm text-slate-500 mb-1 block">金额（元）</span><input name="amount" type="number" step="0.01" class="form-ctrl" placeholder="0.00"></label><label class="block"><span class="text-sm text-slate-500 mb-1 block">已发生金额（元）</span><input name="incurred_amount" type="number" step="0.01" class="form-ctrl" placeholder="0.00"></label></div><label class="block"><span class="text-sm text-slate-500 mb-1 block">状态</span><select name="status" class="form-ctrl bg-white">' + statusOpts + '</select></label><label class="block"><span class="text-sm text-slate-500 mb-1 block">费用说明</span><textarea name="notes" class="form-ctrl" rows="3" placeholder="备注信息"></textarea></label><div class="flex justify-end gap-3 pt-2"><button type="button" class="btn btn-ghost btn-sm px-6" onclick="closePlanExpModal()">取消</button><button type="submit" class="btn btn-primary btn-sm px-8">保存</button></div></form></div></div>';
+
+  var target = document.querySelector("#planExpenseModule") || document.querySelector("#planExpenseModule") || document.querySelector("#planExpenseContent");
+  if (!target) return;
+  target.innerHTML = '<div class="grid gap-4">' +
+    '<div class="card p-3"><div class="flex justify-between items-center"><div class="flex items-center gap-2">' + toolbar + '</div><button class="btn btn-primary btn-sm" onclick="openPlanExpModal()">新增费用</button></div></div>' +
+    '<div class="grid grid-cols-3 gap-3">' +
+      '<div class="metric-card p-3"><span class="flex items-center gap-2 text-sm text-slate-500">费用记录</span><strong class="mt-2 block text-xl">' + filtered.length + '</strong></div>' +
+      '<div class="metric-card p-3"><span class="flex items-center gap-2 text-sm text-slate-500">总费用</span><strong class="mt-2 block text-xl">' + money(totalAmount) + '</strong></div>' +
+      '<div class="metric-card p-3"><span class="flex items-center gap-2 text-sm text-slate-500">已发生金额</span><strong class="mt-2 block text-xl">' + money(totalIncurred) + '</strong></div>' +
+    '</div>' +
+    modal +
+    '<div class="card p-4"><div class="overflow-x-auto"><table class="w-full text-sm"><thead><tr class="bg-slate-50 border-b border-slate-200"><th class="p-2 text-center font-semibold cursor-pointer select-none" onclick="togglePlanExpSort(\'expense_month\')">月份' + sortArrow('expense_month') + '</th><th class="p-2 text-center font-semibold cursor-pointer select-none" onclick="togglePlanExpSort(\'expense_type\')">费用类型' + sortArrow('expense_type') + '</th><th class="p-2 text-center font-semibold cursor-pointer select-none" onclick="togglePlanExpSort(\'status\')">状态' + sortArrow('status') + '</th><th class="p-2 text-center font-semibold cursor-pointer select-none" onclick="togglePlanExpSort(\'amount\')">金额' + sortArrow('amount') + '</th><th class="p-2 text-center font-semibold cursor-pointer select-none" onclick="togglePlanExpSort(\'incurred_amount\')">已发生金额' + sortArrow('incurred_amount') + '</th><th class="p-2 text-center font-semibold">费用说明</th></tr></thead><tbody>' + tableRows + '</tbody></table></div></div>' +
+  '</div>';
+
+  if (window.lucide) window.lucide.createIcons();
+}
+
+window.togglePlanExpSort = function(key) {
+  var cur = state.planExpSort || {};
+  if (cur.key === key) { cur.asc = !cur.asc; }
+  else { cur.key = key; cur.asc = true; }
+  state.planExpSort = cur;
+  renderPlanExpense();
+};
+
+window.setPlanExpView = function(v) { state.planExpView = v; renderPlanExpense(); };
+window.setPlanExpFilter = function(v) { state.planExpFilter = v; renderPlanExpense(); };
+window.setPlanExpMonth = function(v) { state.planExpMonth = v; renderPlanExpense(); };
+window.setPlanExpQuarter = function(v) { state.planExpQuarter = v; renderPlanExpense(); };
+
+window.openPlanExpModal = function() {
+  var form = document.querySelector("#planExpenseModal form");
+  form.reset();
+  form.querySelector('[name="expense_id"]').value = "";
+  form.querySelector('[name="status"]').value = "计入费用";
+  document.querySelector("#planExpenseModalTitle").textContent = "新增费用";
+  document.querySelector("#planExpDeleteBtn").classList.add("hidden");
+  document.querySelector("#planExpenseModal").classList.remove("hidden");
+};
+
+window.closePlanExpModal = function() {
+  document.querySelector("#planExpenseModal").classList.add("hidden");
+};
+
+window.openPlanExpEdit = function(id) {
+  var r = (state.data.planExpense || []).find(function(x) { return x.id === id; });
+  if (!r) return;
+  var form = document.querySelector("#planExpenseModal form");
+  form.reset();
+  var setVal = function(name, val) { var el = form.querySelector('[name="' + name + '"]'); if (el) el.value = val || ""; };
+  setVal("expense_id", r.id);
+  setVal("expense_type", r.expense_type);
+  setVal("expense_month", r.expense_month);
+  setVal("amount", r.amount);
+  setVal("incurred_amount", r.incurred_amount);
+  setVal("notes", r.notes);
+  setVal("status", r.status || "计入费用");
+  document.querySelector("#planExpenseModalTitle").textContent = "编辑费用";
+  document.querySelector("#planExpDeleteBtn").classList.remove("hidden");
+  document.querySelector("#planExpenseModal").classList.remove("hidden");
+};
+
+window.savePlanExpense = async function(event) {
+  event.preventDefault();
+  var form = event.target;
+  var data = Object.fromEntries(new FormData(form).entries());
+  if (data.amount === '' || data.amount === undefined) data.amount = 0;
+  if (data.incurred_amount === '' || data.incurred_amount === undefined) data.incurred_amount = 0;
+  if (!data.status) data.status = '计入费用';
+  var isEdit = !!data.expense_id;
+  delete data.expense_id;
+
+  var id = form.querySelector('[name="expense_id"]').value;
+  var url = isEdit ? "/api/planExpense/" + id : "/api/planExpense";
+  var method = isEdit ? "PUT" : "POST";
+
+  var resp = await fetch(url, { method: method, headers: { "Content-Type": "application/json" }, body: JSON.stringify({ data: Object.assign({}, data, { tenant: state.tenant }) }) });
+  if (!resp.ok) { var err = await resp.text(); alert("保存失败：" + err); return; }
+
+  var bResp = await fetch("/api/bootstrap?tenant=" + encodeURIComponent(state.tenant));
+  if (bResp.ok) {
+    var bd = await bResp.json();
+    state.data = bd;
+    applyUserTenants();
+    renderPlanExpense();
+  }
+  closePlanExpModal();
+};
+
+window.deletePlanExpItem = async function() {
+  var id = document.querySelector("#planExpenseModal form [name='expense_id']").value;
+  if (!id || !confirm("确定删除？")) return;
+  var resp = await fetch("/api/planExpense/" + id, { method: "DELETE" });
+  if (!resp.ok) { alert("删除失败"); return; }
+  var bResp = await fetch("/api/bootstrap?tenant=" + encodeURIComponent(state.tenant));
+  if (bResp.ok) {
+    var bd = await bResp.json();
+    state.data = bd;
+    applyUserTenants();
+    renderPlanExpense();
+  }
+};

static/modules/projects.js

@@ -82,6 +82,9 @@ window.toggleUserMenu = (user) => {
     ${user.role === 'admin' ? `<button class="w-full text-left px-4 py-2 text-sm text-slate-700 hover:bg-slate-50 transition-colors flex items-center gap-2" onclick="closeUserMenu();openAdminUsers()">
       <i data-lucide="users" style="width:14px;height:14px"></i>账号管理
     </button>` : ''}
+    <button class="w-full text-left px-4 py-2 text-sm text-slate-700 hover:bg-slate-50 transition-colors flex items-center gap-2" onclick="closeUserMenu();openChangePwdModal()">
+      <i data-lucide="lock" style="width:14px;height:14px"></i>修改密码
+    </button>
     <button class="w-full text-left px-4 py-2 text-sm text-red-600 hover:bg-red-50 transition-colors flex items-center gap-2" onclick="doLogout()">
       <i data-lucide="log-out" style="width:14px;height:14px"></i>退出登录
     </button>`;

static/modules/utils.js

@@ -9,7 +9,11 @@ const state = {
   selectedProject: null,
   taskQuery: "",
   taskView: localStorage.getItem("opc-task-view") || "detail",
-  finView: localStorage.getItem("opc-fin-view") || "overview",
+  finView: "overview",
+  finSort: null, // { key: 'col', asc: true }
+  planFilter: "已签约",
+  planView: "overview",
+  planSort: null,
   proposalTab: "standard",
   chart: null,
   chart2: null,
@@ -132,7 +136,7 @@ function switchTab(tab) {
   document.querySelectorAll(".panel").forEach((panel) => panel.classList.toggle("active", panel.id === tab));
 
   // 更新顶部标题
-  const titles = { home: 'OPC 工作台', finance: '业务管理', projects: '重点工作台账', proposals: '业务方案', products: '版本与运营', performance: '季度绩效考核' };
+  const titles = { home: 'OPC 工作台', finance: '业务管理', plan: '计划管理', projects: '重点工作台账', proposals: '业务方案', products: '版本与运营', performance: '季度绩效考核' };
   const titleEl = document.querySelector('#workspaceTitle');
   if (titleEl) titleEl.textContent = titles[tab] || state.tenant + ' OPC 工作台';
 
@@ -159,6 +163,7 @@ function render() {
   renderProducts();
   renderPerformance();
   renderFinance();
+  renderPlan();
   if (window.lucide) window.lucide.createIcons();
 }
 
@@ -171,6 +176,7 @@ function renderActive() {
   else if (tab === "products") renderProducts();
   else if (tab === "performance") renderPerformance();
   else if (tab === "finance") renderFinance();
+  else if (tab === "plan") renderPlan();
   if (window.lucide) window.lucide.createIcons();
 }
 
@@ -196,13 +202,35 @@ window.switchTab = switchTab;
 
 window.setFinView = (view) => {
   state.finView = view;
-  localStorage.setItem("opc-fin-view", view);
   renderFinance();
 };
 window.switchFinFilter = (filter) => {
   state.finFilter = filter;
+  state.finSort = null;
   renderFinance();
 };
+
+window.setFinSort = (key) => {
+  if (!state.finSort) state.finSort = { key: null, asc: true };
+  if (state.finSort.key === key) { state.finSort.asc = !state.finSort.asc; }
+  else { state.finSort.key = key; state.finSort.asc = true; }
+  renderFinance();
+};
+window.setPlanView = (view) => {
+  state.planView = view;
+  renderPlan();
+};
+window.switchPlanFilter = (filter) => {
+  state.planFilter = filter;
+  state.planSort = null;
+  renderPlan();
+};
+window.setPlanSort = (key) => {
+  if (!state.planSort) state.planSort = { key: null, asc: true };
+  if (state.planSort.key === key) { state.planSort.asc = !state.planSort.asc; }
+  else { state.planSort.key = key; state.planSort.asc = true; }
+  renderPlan();
+};
 window.switchTenant = (tenant) => {
   state.tenant = tenant;
   state.selectedProject = null;

templates/index.html

@@ -45,9 +45,13 @@
         <div class="w-8 h-px bg-slate-700 my-2"></div>
         <!-- 导航 Tab 图标 -->
         <div class="flex flex-col items-center gap-1 w-14" id="sidebarTabs">
-          <div class="sidebar-tab active" data-tab="home" onclick="switchTab('home')" title="首页">
-            <i data-lucide="home" style="width:20px;height:20px"></i>
-            <span class="text-[10px] mt-1">首页</span>
+          <div class="sidebar-tab active" data-tab="home" onclick="switchTab('home')" title="部门">
+            <i data-lucide="trending-up" style="width:20px;height:20px"></i>
+            <span class="text-[10px] mt-1">部门</span>
+          </div>
+          <div class="sidebar-tab" data-tab="plan" onclick="switchTab('plan')" title="计划">
+            <i data-lucide="calendar-range" style="width:20px;height:20px"></i>
+            <span class="text-[10px] mt-1">计划</span>
           </div>
           <div class="sidebar-tab" data-tab="finance" onclick="switchTab('finance')" title="业务">
             <i data-lucide="folder-open-dot" style="width:20px;height:20px"></i>
@@ -76,7 +80,7 @@
     <header class="topbar border-b border-slate-200 bg-white px-8 py-5">
       <div class="flex items-center gap-3 w-full">
         <div class="flex-1">
-          <p class="eyebrow text-xs font-semibold uppercase tracking-[0.18em] text-blue-700">OPC Manager <span class="ml-2 text-xs font-normal text-slate-400 tracking-normal">v1.0.0.3</span></p>
+          <p class="eyebrow text-xs font-semibold uppercase tracking-[0.18em] text-blue-700">OPC Manager <span class="ml-2 text-xs font-normal text-slate-400 tracking-normal">v1.0.0.17</span></p>
           <div class="flex items-center gap-4 mt-1">
             <h1 class="text-2xl font-semibold" id="workspaceTitle">科普 OPC 工作台</h1>
             <div class="hidden sm:flex items-center gap-1.5 bg-gradient-to-r from-blue-50 to-indigo-50 border border-blue-100 rounded-full px-4 py-1.5">
@@ -99,6 +103,7 @@
       <section id="performance" class="panel"></section>
       <section id="performance" class="panel"></section>
       <section id="finance" class="panel"></section>
+      <section id="plan" class="panel"></section>
     </main>
       </div><!-- 关闭主内容区 -->
     </div><!-- 关闭 flex 容器 -->
@@ -129,6 +134,8 @@
     <script src="{{ url_for('static', filename='modules/performance.js') }}"></script>
     <script src="{{ url_for('static', filename='modules/finance.js') }}"></script>
     <script src="{{ url_for('static', filename='modules/expense.js') }}"></script>
+    <script src="{{ url_for('static', filename='modules/plan.js') }}"></script>
+    <script src="{{ url_for('static', filename='modules/plan_expense.js') }}"></script>
     <script src="{{ url_for('static', filename='modules/drawer.js') }}"></script>
     <script src="{{ url_for('static', filename='modules/admin.js') }}"></script>
     <script src="{{ url_for('static', filename='app.js') }}"></script>