Merge branch 'dev'

- 计划+实际模块: 汇总卡片移除项目利润和执行率
- 计划+实际模块: 表格现金流移到最后一列
- 计划+实际模块: 月度总览改名为经营月报, 季度总览改名为季度月报
- 实际模块: 已付全部改名为支出
- 月度总览: 毛利统一绿色, 利润/现金流条件着色
- 版本号 v1.0.0.34

README.md

@@ -53,3 +53,4 @@ curl http://127.0.0.1:5177/api/health
 - 产品：慰心斋产品路线图中的 5 个产品版本
 - 财务：首版财务样例和原财务 manager 合并方向
 
+# test trigger

backend/routes.py

@@ -25,7 +25,7 @@ TABLES = {
     "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", "client_name", "sign_amount", "sign_month", "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", "status", "tenant"]),
-    "planFinances": ("plan_finances", ["project_id", "tenant", "business_type", "customer_name", "client_name", "sign_amount", "sign_month", "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", "client_name", "project_type", "weight"]),
+    "planFinances": ("plan_finances", ["project_id", "tenant", "business_type", "customer_name", "client_name", "sign_amount", "sign_month", "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", "project_type", "weight"]),
     "planExpense": ("plan_expense_records", ["expense_type", "expense_month", "amount", "incurred_amount", "notes", "status", "tenant"]),
 }
 

static/modules/finance.js

@@ -113,7 +113,7 @@ function renderFinance() {
   const finHeaderBase = `<div class="flex items-center gap-2"><button onclick="setFinView('overview')" class="px-3 py-1 rounded text-sm font-medium ${state.finView==='overview'?'bg-blue-600 text-white':'bg-slate-100 text-slate-600 hover:bg-slate-200'}">总视图</button><span class="text-slate-300 mx-2">|</span><span class="text-sm text-slate-500">按季度：</span>${qLabels.map((q,i) => `<button onclick="setFinQuarter(${i})" class="px-3 py-1 rounded text-sm font-medium ${state.finView==='quarterly'&&activeQ===i?'bg-blue-600 text-white':'bg-slate-100 text-slate-600 hover:bg-slate-200'}">${q}</button>`).join('')}<span class="text-slate-300 mx-2">|</span><span class="text-sm text-slate-500">按月度：</span>${activeMonths.map(m => { const ms = `2026-${String(m).padStart(2,'0')}`; return `<button onclick="setFinMonth('${ms}')" class="px-3 py-1 rounded text-sm font-medium ${state.finView==='monthly'&&state.finMonth===ms?'bg-blue-600 text-white':'bg-slate-100 text-slate-600 hover:bg-slate-200'}">${m}月</button>`; }).join('')}</div>`;
   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('overview')" class="finance-tab${state.finFilter==='overview'?' active':''}" style="font-size:14px;font-weight:600">月度总览</button><button onclick="switchFinFilter('quarterlyOverview')" class="finance-tab${state.finFilter==='quarterlyOverview'?' active':''}" style="font-size:14px;font-weight:600">季度总览</button><button onclick="switchFinFilter('projects')" class="finance-tab${state.finFilter==='projects'?' active':''}" style="font-size:14px;font-weight:600">项目 (${pfs.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('quarterlyOverview')" class="finance-tab${state.finFilter==='quarterlyOverview'?' active':''}" style="font-size:14px;font-weight:600">季度月报</button><button onclick="switchFinFilter('projects')" class="finance-tab${state.finFilter==='projects'?' active':''}" style="font-size:14px;font-weight:600">项目 (${pfs.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}
@@ -192,12 +192,12 @@ function renderFinance() {
       <p class="text-lg font-bold text-rose-700" id="costTotalCost">¥0</p>
     </div>
     <div class="bg-purple-50 rounded-lg p-3 text-center border border-purple-100">
-      <p class="text-xs text-purple-600 font-medium">总已付</p>
+      <p class="text-xs text-purple-600 font-medium">总支出</p>
       <p class="text-lg font-bold text-purple-700" id="costTotalPaid">¥0</p>
     </div>
   </div>
   <table class="w-full text-sm border border-slate-200 rounded-lg overflow-hidden" id="costTable">
-    <thead><tr class="bg-slate-50 border-b border-slate-200"><th class="p-2.5 text-left font-medium text-slate-500" style="min-width:140px">月份</th><th class="p-2.5 text-left font-medium text-slate-500" style="min-width:120px">费用类型</th><th class="p-2.5 text-right font-medium text-slate-500">成本</th><th class="p-2.5 text-right font-medium text-slate-500">已付</th><th class="p-2.5 text-left font-medium text-slate-500">备注</th><th class="p-2.5 w-8"></th></tr></thead>
+    <thead><tr class="bg-slate-50 border-b border-slate-200"><th class="p-2.5 text-left font-medium text-slate-500" style="min-width:140px">月份</th><th class="p-2.5 text-left font-medium text-slate-500" style="min-width:120px">费用类型</th><th class="p-2.5 text-right font-medium text-slate-500">成本</th><th class="p-2.5 text-right font-medium text-slate-500">支出</th><th class="p-2.5 text-left font-medium text-slate-500">备注</th><th class="p-2.5 w-8"></th></tr></thead>
     <tbody id="costTbody"></tbody>
   </table>
   <button type="button" class="btn btn-ghost btn-sm mt-3" onclick="addCostRow()"><i data-lucide="plus"></i>添加月份</button>
@@ -252,11 +252,9 @@ function renderFinance() {
         { label: '已确收', hideUnsigned: true, value: ctx => moneyWan(ctx.sumRev), color: 'text-blue-700' },
         { label: '毛利', value: ctx => money(ctx.sumGross), color: 'text-green-700' },
         { label: '成本', value: ctx => moneyWan(ctx.sumCost), color: 'text-rose-700' },
-        { label: '项目利润', value: ctx => { const v = ctx.sumGross; return { val: moneyWan(v), cls: v >= 0 ? 'text-green-600' : 'text-red-600' }; }, color: null },
         { label: '已回款', hideUnsigned: true, value: ctx => moneyWan(ctx.sumPay), color: 'text-amber-700' },
-        { label: '已付', hideUnsigned: true, value: ctx => moneyWan(ctx.sumPaid), color: 'text-purple-700' },
+        { label: '支出', hideUnsigned: true, value: ctx => moneyWan(ctx.sumPaid), color: 'text-purple-700' },
         { label: '现金流', hideUnsigned: true, value: ctx => { const v = ctx.sumPay - ctx.sumPaid; return { val: money(v), cls: v >= 0 ? 'text-green-600' : 'text-red-600' }; }, color: null },
-        { label: '执行率', hideUnsigned: true, value: ctx => ctx.sumRev && ctx.signTotal ? Math.round(ctx.sumRev / ctx.signTotal * 100) + '%' : '—', color: 'text-slate-500' },
         { label: '毛利率', hideUnsigned: true, value: ctx => ctx.sumRev && ctx.sumGross ? Math.round(ctx.sumGross / ctx.sumRev * 100) + '%' : '—', color: 'text-slate-500' },
         { label: '回款率', hideUnsigned: true, value: ctx => ctx.sumRev && ctx.sumPay ? Math.round(ctx.sumPay / ctx.sumRev * 100) + '%' : '—', color: 'text-slate-500' },
         { label: '付款率', hideUnsigned: true, value: ctx => ctx.sumCost && ctx.sumPaid ? Math.round(ctx.sumPaid / ctx.sumCost * 100) + '%' : '—', color: 'text-slate-500' },
@@ -287,15 +285,15 @@ function renderFinance() {
       };
       const SIGNED_COLS = [
         { key: 'client_name', label: '客户' }, { key: 'customer_name', 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: '付款率' },
+        { key: 'rev', label: '已确收' }, { key: 'gross', label: '毛利' }, { key: 'gross_rate', label: '毛利率' },
+        { key: 'payment', label: '回款' }, { key: 'pay_rate', label: '回款率' },
+        { key: 'cost', label: '成本' }, { key: 'paid', label: '支出' }, { key: 'paid_rate', label: '付款率' },
+        { key: 'cashflow', label: '现金流' },
       ];
       const UNSIGNED_COLS = [
         { key: 'client_name', label: '客户' }, { key: 'customer_name', 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) => {
@@ -305,13 +303,13 @@ function renderFinance() {
           return typeof v === 'object' ? [c.label, v.val, v.cls] : [c.label, v, c.color];
         });
         const thead = isUnsigned ? buildThead(UNSIGNED_COLS, 'uns') : buildThead(SIGNED_COLS, 'sig');
-        const theadCols = isUnsigned ? 7 : 14;
+        const theadCols = isUnsigned ? 6 : 12;
         const tbody = rows.length ? `<tbody>${rows.join("")}</tbody>` : `<tr><td colspan="${theadCols}" class="p-6 text-center text-slate-400">${emptyText}</td></tr>`;
 
         const cardGrid = isUnsigned ? 'grid-cols-4' : 'grid-cols-6';
         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-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");
       };
@@ -327,17 +325,11 @@ function renderFinance() {
         const grossR = rev && gross ? Math.round(gross / rev * 100) + '%' : '<span class="text-slate-300">—</span>';
                 const cf = cashflow ? money(cashflow) : '<span class="text-slate-300">—</span>';
         const cfCls = cashflow >= 0 ? 'text-green-600' : 'text-red-600';
-        const profit = gross;
-        const pfCls = profit >= 0 ? 'text-green-600' : 'text-red-600';
-        const pfVal = profit ? money(profit) : '<span class="text-slate-300">—</span>';
-        return `<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="openPfEditModal(${pf.id})"><td class="p-2 text-center align-middle text-sm">${esc(pf.client_name || "")}</td><td class="p-2 text-sm font-medium text-center align-middle truncate" style="min-width:300px;max-width:300px;width:300px" title="${esc(pf.customer_name)}">${esc(pf.customer_name)}</td><td class="p-2 text-center align-middle text-sm font-medium">${money(pf.sign_amount)}</td><td class="p-2 text-center text-blue-700 align-middle">${fmtNoUnit(rev)}</td><td class="p-2 text-center align-middle text-sm font-medium">${fmtNoUnit(gross)}</td><td class="p-2 text-center text-rose-700 align-middle">${fmtNoUnit(cost)}</td><td class="p-2 text-center font-semibold align-middle ${pfCls}">${pfVal}</td><td class="p-2 text-center text-amber-700 align-middle">${fmtNoUnit(payment)}</td><td class="p-2 text-center text-purple-700 align-middle">${fmtNoUnit(paid)}</td><td class="p-2 text-center font-semibold align-middle ${cfCls}">${cf}</td><td class="p-2 text-center align-middle text-sm">${exe}</td><td class="p-2 text-center align-middle text-sm">${grossR}</td><td class="p-2 text-center align-middle text-sm">${payR}</td><td class="p-2 text-center align-middle text-sm">${paidR}</td></tr>`;
+        return `<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="openPfEditModal(${pf.id})"><td class="p-2 text-center align-middle text-sm">${esc(pf.client_name || "")}</td><td class="p-2 text-sm font-medium text-center align-middle truncate" style="min-width:300px;max-width:300px;width:300px" title="${esc(pf.customer_name)}">${esc(pf.customer_name)}</td><td class="p-2 text-center align-middle text-sm font-medium">${money(pf.sign_amount)}</td><td class="p-2 text-center text-blue-700 align-middle">${fmtNoUnit(rev)}</td><td class="p-2 text-center align-middle text-sm font-medium">${fmtNoUnit(gross)}</td><td class="p-2 text-center align-middle text-sm">${grossR}</td><td class="p-2 text-center text-amber-700 align-middle">${fmtNoUnit(payment)}</td><td class="p-2 text-center align-middle text-sm">${payR}</td><td class="p-2 text-center text-rose-700 align-middle">${fmtNoUnit(cost)}</td><td class="p-2 text-center text-purple-700 align-middle">${fmtNoUnit(paid)}</td><td class="p-2 text-center align-middle text-sm">${paidR}</td><td class="p-2 text-center font-semibold align-middle ${cfCls}">${cf}</td></tr>`;
       };
       // 待签约简版行
       const tdRowUnsigned = (pf, cost, gross) => {
-                const profit = gross;
-        const pfCls = profit >= 0 ? 'text-green-600' : 'text-red-600';
-        const pfVal = profit ? money(profit) : '<span class="text-slate-300">—</span>';
-        return `<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="openPfEditModal(${pf.id})"><td class="p-2 text-sm font-medium text-center align-middle truncate" style="min-width:300px;max-width:300px;width:300px" title="${esc(pf.customer_name)}">${esc(pf.customer_name)}</td><td class="p-2 text-center align-middle text-sm font-medium">${money(pf.sign_amount)}</td><td class="p-2 text-center align-middle text-sm">${pf.sign_month || '—'}</td><td class="p-2 text-center align-middle text-sm font-medium">${fmtNoUnit(gross)}</td><td class="p-2 text-center text-rose-700 align-middle">${fmtNoUnit(cost)}</td><td class="p-2 text-center font-semibold align-middle ${pfCls}">${pfVal}</td></tr>`;
+        return `<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="openPfEditModal(${pf.id})"><td class="p-2 text-sm font-medium text-center align-middle truncate" style="min-width:300px;max-width:300px;width:300px" title="${esc(pf.customer_name)}">${esc(pf.customer_name)}</td><td class="p-2 text-center align-middle text-sm font-medium">${money(pf.sign_amount)}</td><td class="p-2 text-center align-middle text-sm">${pf.sign_month || '—'}</td><td class="p-2 text-center align-middle text-sm font-medium">${fmtNoUnit(gross)}</td><td class="p-2 text-center text-rose-700 align-middle">${fmtNoUnit(cost)}</td></tr>`;
       };
 
       if (state.finView === 'monthly') {
@@ -360,7 +352,7 @@ function renderFinance() {
           if (!rev && !payment && !cost && !paid && !gross) return;
           dataItems.push({
             pf: pf, customer_name: pf.customer_name || '',             sign_amount: pf.sign_amount || 0, sign_month: pf.sign_month || '',
-            rev: rev, gross: gross, cost: cost, profit: gross, payment: payment, paid: paid,
+            rev: rev, gross: gross, cost: cost, 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,
@@ -411,7 +403,7 @@ function renderFinance() {
           if (!rev && !payment && !cost && !paid && !gross) return;
           dataItems.push({
             pf: pf, customer_name: pf.customer_name || '',             sign_amount: pf.sign_amount || 0, sign_month: pf.sign_month || '',
-            rev: rev, gross: gross, cost: cost, profit: gross, payment: payment, paid: paid,
+            rev: rev, gross: gross, cost: cost, 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,
@@ -447,7 +439,7 @@ function renderFinance() {
         var t = calcTotals(pf);
         return {
           pf: pf, customer_name: pf.customer_name || '',           sign_amount: pf.sign_amount || 0, sign_month: pf.sign_month || '',
-          rev: t.rev, gross: t.gross, cost: t.cost, profit: t.gross,
+          rev: t.rev, gross: t.gross, cost: t.cost,
           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,
@@ -933,7 +925,7 @@ window.deleteFinanceItem = async () => {
   }
 }
 
-// 月度总览渲染
+// 经营月报渲染
 function renderFinanceOverview() {
   const { summary, financeMonthly } = state.data;
   if (!summary) return;
@@ -943,38 +935,106 @@ function renderFinanceOverview() {
   const card = (body, cls) => '<div class="card ' + (cls || 'p-4') + '">' + body + '</div>';
   const fm = financeMonthly || [];
   const mLbl = ['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月'];
-  const LABELS = ['合同金额','确收金额','确收毛利','成本','项目利润','回款金额','已付','现金流'];
-  const annualVals = [m.signed_annual||m.signed_amount||0, m.revenue_annual||0, m.gross_annual||0, m.cost_annual||0, m.profit_annual||0, m.payment_annual||0, m.paid_annual||0, m.cashflow_annual||0];
-  const fmFields = ['sign','revenue','gross','cost',null,'payment','paid',null];
+  const LABELS = ['合同金额','确收金额','确收毛利','成本','支出','回款','项目现金流'];
+  const annualVals = [m.signed_annual||m.signed_amount||0, m.revenue_annual||0, m.gross_annual||0, m.cost_annual||0, m.paid_annual||0, m.payment_annual||0, (m.payment_annual||0) - (m.paid_annual||0)];
+  const fmFields = ['sign','revenue','gross','cost','paid','payment',null];
   var thead = '<tr class="border-b border-slate-200"><th class="py-2 text-left text-slate-500 whitespace-nowrap">指标</th><th class="py-2 text-right font-semibold text-slate-700 whitespace-nowrap">年度累计</th>';
   for (var mi = 0; mi < 12; mi++) { thead += '<th class="py-2 text-right font-semibold text-slate-600 whitespace-nowrap">' + mLbl[mi] + '</th>'; }
   thead += '</tr>';
   var tbody = '';
-  for (var ri = 0; ri < 8; ri++) {
+  for (var ri = 0; ri < 7; ri++) {
     var rowHtml = '<tr class="border-b border-slate-100 last:border-0"><td class="py-2 text-left font-semibold text-slate-700 whitespace-nowrap">' + LABELS[ri] + '</td>';
     rowHtml += '<td class="py-2 text-right font-semibold text-slate-800 whitespace-nowrap">' + moneyIntL(annualVals[ri]) + '</td>';
     for (var mi = 0; mi < 12; mi++) {
       var val = 0;
       if (fm[mi]) {
-        if (ri === 4) { val = (fm[mi].gross || 0) - (fm[mi].cost || 0); }
-        else if (ri === 7) { val = (fm[mi].payment || 0) - (fm[mi].paid || 0); }
+        if (ri === 6) { val = (fm[mi].payment || 0) - (fm[mi].paid || 0); }
         else { var fk = fmFields[ri]; if (fk) val = fm[mi][fk] || 0; }
       }
       var cls = 'text-slate-700';
-      if (ri === 4) cls = val >= 0 ? 'text-green-600' : 'text-red-600';
-      if (ri === 7) cls = val >= 0 ? 'text-green-600' : 'text-red-600';
+      if (ri === 6) cls = val >= 0 ? 'text-green-600' : 'text-red-600';
       rowHtml += '<td class="py-2 text-right text-sm whitespace-nowrap ' + cls + '">' + moneyIntL(val) + '</td>';
     }
     tbody += rowHtml + '</tr>';
   }
 
+
+  // 业务线经营情况卡片
+  var finExp = state.data.expense || [];
+  var expMonthly = [0,0,0,0,0,0,0,0,0,0,0,0];
+  for (var ei = 0; ei < finExp.length; ei++) {
+    if ((finExp[ei].status || '') === '暂不计入') continue;
+    var em = (finExp[ei].expense_month || '').substring(0, 7);
+    var mi2 = parseInt(em.substring(5)) - 1;
+    if (mi2 >= 0 && mi2 < 12) expMonthly[mi2] += parseFloat(finExp[ei].amount || 0);
+  }
+  var expAnnual = 0; for (var ei = 0; ei < 12; ei++) expAnnual += expMonthly[ei];
+  var grossAnnual = 0; for (var ei = 0; ei < 12; ei++) grossAnnual += (fm[ei] ? fm[ei].gross : 0);
+  var deptThead = '<tr class="border-b border-slate-200"><th class="py-2 text-left text-slate-500 whitespace-nowrap">指标</th><th class="py-2 text-right font-semibold text-slate-700 whitespace-nowrap">年度累计</th>';
+  for (var dmi = 0; dmi < 12; dmi++) { deptThead += '<th class="py-2 text-right font-semibold text-slate-600 whitespace-nowrap">' + mLbl[dmi] + '</th>'; }
+  deptThead += '</tr>';
+  var deptRows = [
+    { label: '毛利', vals: fm.map(function(x) { return x ? x.gross : 0; }), annual: grossAnnual },
+    { label: '平台费用', vals: expMonthly, annual: expAnnual },
+    { label: '利润', vals: fm.map(function(x, i) { return (x ? x.gross : 0) - expMonthly[i]; }), annual: grossAnnual - expAnnual }
+  ];
+  var deptTbody = '';
+  for (var dri = 0; dri < 3; dri++) {
+    var dr = deptRows[dri];
+    var rowCls = dri === 2 ? 'font-semibold' : '';
+    var valCls = dri === 2 ? 'text-green-600' : 'text-slate-700';
+    var rowHtml = '<tr class="border-b border-slate-100 last:border-0"><td class="py-2 text-left ' + rowCls + ' text-slate-700 whitespace-nowrap">' + dr.label + '</td>';
+    rowHtml += '<td class="py-2 text-right ' + rowCls + ' ' + valCls + ' whitespace-nowrap">' + moneyIntL(dr.annual) + '</td>';
+    for (var dmi = 0; dmi < 12; dmi++) {
+      rowHtml += '<td class="py-2 text-right text-sm whitespace-nowrap ' + valCls + '">' + moneyIntL(dr.vals[dmi]) + '</td>';
+    }
+    deptTbody += rowHtml + '</tr>';
+  }
+  var deptCard = 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>' + deptThead + '</thead><tbody>' + deptTbody + '</tbody></table></div>', 'p-4');
+
+  // 业务线现金流卡片
+  var cfMonthly = [0,0,0,0,0,0,0,0,0,0,0,0];
+  for (var cfi = 0; cfi < 12; cfi++) { cfMonthly[cfi] = (fm[cfi] ? (fm[cfi].payment - fm[cfi].paid) : 0); }
+  var cfAnnual = 0; for (var cfi = 0; cfi < 12; cfi++) cfAnnual += cfMonthly[cfi];
+  var expPaidMonthly = [0,0,0,0,0,0,0,0,0,0,0,0];
+  for (var epi = 0; epi < finExp.length; epi++) {
+    if ((finExp[epi].status || '') === '暂不计入') continue;
+    var epm = (finExp[epi].expense_month || '').substring(0, 7);
+    var epmi = parseInt(epm.substring(5)) - 1;
+    if (epmi >= 0 && epmi < 12) expPaidMonthly[epmi] += parseFloat(finExp[epi].incurred_amount || 0);
+  }
+  var expPaidAnnual = 0; for (var epi = 0; epi < 12; epi++) expPaidAnnual += expPaidMonthly[epi];
+  var blCfMonthly = cfMonthly.map(function(v, i) { return v - expPaidMonthly[i]; });
+  var blCfAnnual = cfAnnual - expPaidAnnual;
+  var cfRows = [
+    { label: '项目现金流', vals: cfMonthly, annual: cfAnnual },
+    { label: '平台费用（支出）', vals: expPaidMonthly, annual: expPaidAnnual },
+    { label: '业务线现金流', vals: blCfMonthly, annual: blCfAnnual }
+  ];
+  var cfTbody = '';
+  for (var cfri = 0; cfri < 3; cfri++) {
+    var cfdr = cfRows[cfri];
+    var cfRowCls = cfri === 2 ? 'font-semibold' : '';
+    var cfValCls = cfri === 2 ? (cfdr.annual >= 0 ? 'text-green-600' : 'text-red-600') : 'text-slate-700';
+    var cfRowHtml = '<tr class="border-b border-slate-100 last:border-0"><td class="py-2 text-left ' + cfRowCls + ' text-slate-700 whitespace-nowrap">' + cfdr.label + '</td>';
+    cfRowHtml += '<td class="py-2 text-right ' + cfRowCls + ' ' + cfValCls + ' whitespace-nowrap">' + moneyIntL(cfdr.annual) + '</td>';
+    for (var cfdmi = 0; cfdmi < 12; cfdmi++) {
+      var cellCls = cfValCls;
+      if (cfri === 2) cellCls = blCfMonthly[cfdmi] >= 0 ? 'text-green-600' : 'text-red-600';
+      cfRowHtml += '<td class="py-2 text-right text-sm whitespace-nowrap ' + cellCls + '">' + moneyIntL(cfdr.vals[cfdmi]) + '</td>';
+    }
+    cfTbody += cfRowHtml + '</tr>';
+  }
+  var cfCard = 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>' + deptThead + '</thead><tbody>' + cfTbody + '</tbody></table></div>', 'p-4');
+
   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('<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') +
+    deptCard +
+    cfCard +
+    '<div class="grid grid-cols-3 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') +
+      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') +
     '</div></div>';
 
   if (window.lucide) window.lucide.createIcons();
@@ -983,7 +1043,7 @@ function renderFinanceOverview() {
   }
 }
 
-// 季度总览渲染
+// 季度月报渲染
 function renderFinanceQuarterlyOverview() {
   const { summary, financeMonthly } = state.data;
   if (!summary) return;
@@ -991,21 +1051,19 @@ function renderFinanceQuarterlyOverview() {
   const moneyIntL = (v) => Math.round(Number(v || 0)).toLocaleString("zh-CN");
   const card = (body, cls) => '<div class="card ' + (cls || 'p-4') + '">' + body + '</div>';
   const fm = financeMonthly || [];
-  const LABELS = ['合同金额','确收金额','确收毛利','成本','项目利润','回款金额','已付','现金流'];
+  const LABELS = ['合同金额','确收金额','确收毛利','成本','支出'];
   const qLbl = ['Q1','Q2','Q3','Q4'];
   const qRanges = [[0,1,2],[3,4,5],[6,7,8],[9,10,11]];
-  const annualVals = [m.signed_annual||m.signed_amount||0, m.revenue_annual||0, m.gross_annual||0, m.cost_annual||0, m.profit_annual||0, m.payment_annual||0, m.paid_annual||0, m.cashflow_annual||0];
-  const fmFields = ['sign','revenue','gross','cost',null,'payment','paid',null];
-  var qData = [[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0]];
+  const annualVals = [m.signed_annual||m.signed_amount||0, m.revenue_annual||0, m.gross_annual||0, m.cost_annual||0, m.paid_annual||0];
+  const fmFields = ['sign','revenue','gross','cost','paid'];
+  var qData = [[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0]];
   for (var qi = 0; qi < 4; qi++) {
-    for (var ri = 0; ri < 8; ri++) {
+    for (var ri = 0; ri < 5; ri++) {
       var sum = 0;
       for (var mi = 0; mi < 3; mi++) {
         var idx = qRanges[qi][mi];
         if (fm[idx]) {
-          if (ri === 4) { sum += (fm[idx].gross||0) - (fm[idx].cost||0); }
-          else if (ri === 7) { sum += (fm[idx].payment||0) - (fm[idx].paid||0); }
-          else { var fk = fmFields[ri]; if (fk) sum += fm[idx][fk] || 0; }
+          var fk = fmFields[ri]; if (fk) sum += fm[idx][fk] || 0;
         }
       }
       qData[ri][qi] = sum;
@@ -1019,21 +1077,19 @@ function renderFinanceQuarterlyOverview() {
   thead += '</tr>';
   var qoq = function(cur, prev) { if (!prev) return '<span class="text-slate-300">—</span>'; var pct = Math.round((cur - prev) / prev * 100); var cls = pct >= 0 ? 'text-green-600' : 'text-red-600'; var sign = pct >= 0 ? '+' : ''; return '<span class="' + cls + '">' + sign + pct + '%</span>'; };
   var tbody = '';
-  for (var ri = 0; ri < 8; ri++) {
+  for (var ri = 0; ri < 5; ri++) {
     var rowHtml = '<tr class="border-b border-slate-100 last:border-0"><td class="py-2 text-left font-semibold text-slate-700 whitespace-nowrap">' + LABELS[ri] + '</td>';
     rowHtml += '<td class="py-2 text-right font-semibold text-slate-800 whitespace-nowrap">' + moneyIntL(annualVals[ri]) + '</td>';
     for (var qi = 0; qi < 4; qi++) {
       var val = qData[ri][qi];
       var cls = 'text-slate-700';
-      if (ri === 4) cls = val >= 0 ? 'text-green-600' : 'text-red-600';
-      if (ri === 7) cls = val >= 0 ? 'text-green-600' : 'text-red-600';
       rowHtml += '<td class="py-2 text-right text-sm whitespace-nowrap ' + cls + '">' + moneyIntL(val) + '</td>';
       if (qi > 0) { rowHtml += '<td class="py-2 text-right text-sm whitespace-nowrap">' + qoq(val, qData[ri][qi - 1]) + '</td>'; }
     }
     tbody += rowHtml + '</tr>';
   }
   document.querySelector("#financeQuarterlyOverview").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') +
+    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>';
   if (window.lucide) window.lucide.createIcons();
 }
@@ -1057,7 +1113,7 @@ function renderOverviewCharts(data) {
   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 }] } }));
+    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) {

static/modules/plan.js

@@ -111,7 +111,7 @@ function renderPlan() {
   const finHeaderBase = `<div class="flex items-center gap-2"><button onclick="setPlanView('overview')" class="px-3 py-1 rounded text-sm font-medium ${state.planView==='overview'?'bg-blue-600 text-white':'bg-slate-100 text-slate-600 hover:bg-slate-200'}">总视图</button><span class="text-slate-300 mx-2">|</span><span class="text-sm text-slate-500">按季度：</span>${qLabels.map((q,i) => `<button onclick="setPlanQuarter(${i})" class="px-3 py-1 rounded text-sm font-medium ${state.planView==='quarterly'&&activeQ===i?'bg-blue-600 text-white':'bg-slate-100 text-slate-600 hover:bg-slate-200'}">${q}</button>`).join('')}<span class="text-slate-300 mx-2">|</span><span class="text-sm text-slate-500">按月度：</span>${activeMonths.map(m => { const ms = `2026-${String(m).padStart(2,'0')}`; return `<button onclick="setPlanMonth('${ms}')" class="px-3 py-1 rounded text-sm font-medium ${state.planView==='monthly'&&state.planMonth===ms?'bg-blue-600 text-white':'bg-slate-100 text-slate-600 hover:bg-slate-200'}">${m}月</button>`; }).join('')}</div>`;
   const finAddBtn = `<button class="btn btn-primary btn-sm" onclick="openPlanModal()">新增财务项目</button>`;
 
-  const planFilterTabs = `<div class="finance-tabs" style="padding:0 0 0 0;border-bottom:1px solid #e2e8f0;margin-bottom:0;display:flex;gap:4px"><button onclick="switchPlanFilter('overview')" class="finance-tab${state.planFilter==='overview'?' active':''}" style="font-size:14px;font-weight:600;padding:8px 16px;margin-right:0">月度总览</button><button onclick="switchPlanFilter('quarterlyOverview')" class="finance-tab${state.planFilter==='quarterlyOverview'?' active':''}" style="font-size:14px;font-weight:600">季度总览</button><button onclick="switchPlanFilter('projects')" class="finance-tab${state.planFilter==='projects'?' active':''}" style="font-size:14px;font-weight:600">项目计划 (${pfs.length})</button><button onclick="switchPlanFilter('expense')" class="finance-tab${state.planFilter==='expense'?' active':''}" style="font-size:14px;font-weight:600">平台费用计划</button></div>`;
+  const planFilterTabs = `<div class="finance-tabs" style="padding:0 0 0 0;border-bottom:1px solid #e2e8f0;margin-bottom:0;display:flex;gap:4px"><button onclick="switchPlanFilter('overview')" class="finance-tab${state.planFilter==='overview'?' active':''}" style="font-size:14px;font-weight:600;padding:8px 16px;margin-right:0">经营月报</button><button onclick="switchPlanFilter('quarterlyOverview')" class="finance-tab${state.planFilter==='quarterlyOverview'?' active':''}" style="font-size:14px;font-weight:600">季度月报</button><button onclick="switchPlanFilter('projects')" class="finance-tab${state.planFilter==='projects'?' active':''}" style="font-size:14px;font-weight:600">项目计划 (${pfs.length})</button><button onclick="switchPlanFilter('expense')" class="finance-tab${state.planFilter==='expense'?' active':''}" style="font-size:14px;font-weight:600">平台费用计划</button></div>`;
 
   document.querySelector("#plan").innerHTML = `<div class="grid gap-4">
     ${planFilterTabs}
@@ -254,11 +254,9 @@ function renderPlan() {
         { label: '已确收', hideUnsigned: true, value: ctx => moneyWan(ctx.sumRev), color: 'text-blue-700' },
         { label: '毛利', value: ctx => money(ctx.sumGross), color: 'text-green-700' },
         { label: '成本', value: ctx => moneyWan(ctx.sumCost), color: 'text-rose-700' },
-        { label: '项目利润', value: ctx => { const v = ctx.sumGross; return { val: moneyWan(v), cls: v >= 0 ? 'text-green-600' : 'text-red-600' }; }, color: null },
         { label: '已回款', hideUnsigned: true, value: ctx => moneyWan(ctx.sumPay), color: 'text-amber-700' },
         { label: '已付', hideUnsigned: true, value: ctx => moneyWan(ctx.sumPaid), color: 'text-purple-700' },
         { label: '现金流', hideUnsigned: true, value: ctx => { const v = ctx.sumPay - ctx.sumPaid; return { val: money(v), cls: v >= 0 ? 'text-green-600' : 'text-red-600' }; }, color: null },
-        { label: '执行率', hideUnsigned: true, value: ctx => ctx.sumRev && ctx.signTotal ? Math.round(ctx.sumRev / ctx.signTotal * 100) + '%' : '—', color: 'text-slate-500' },
         { label: '毛利率', hideUnsigned: true, value: ctx => ctx.sumRev && ctx.sumGross ? Math.round(ctx.sumGross / ctx.sumRev * 100) + '%' : '—', color: 'text-slate-500' },
         { label: '回款率', hideUnsigned: true, value: ctx => ctx.sumRev && ctx.sumPay ? Math.round(ctx.sumPay / ctx.sumRev * 100) + '%' : '—', color: 'text-slate-500' },
         { label: '付款率', hideUnsigned: true, value: ctx => ctx.sumCost && ctx.sumPaid ? Math.round(ctx.sumPaid / ctx.sumCost * 100) + '%' : '—', color: 'text-slate-500' },
@@ -294,15 +292,15 @@ function renderPlan() {
         { key: 'weight', label: '加权' },
         { key: 'project_type', label: '项目类型' },
         { key: 'sign_amount', label: '签约金额' },
-        { key: 'rev', 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: 'payment', label: '回款' },
         { key: 'pay_rate', label: '回款率' },
+        { key: 'cost', label: '成本' },
+        { key: 'paid', label: '付款' },
+        { key: 'paid_rate', label: '付款率' },
+        { key: 'cashflow', label: '现金流' },
       ];
       const UNSIGNED_COLS = [
         { key: 'client_name', label: '客户' },
@@ -337,18 +335,14 @@ function renderPlan() {
       const fmtNoUnit = (v) => v ? `<span class="font-medium">${Number(v||0).toLocaleString('zh-CN')}</span>` : '<span class="text-slate-300">—</span>';
       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 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 cf = cashflow ? money(cashflow) : '<span class="text-slate-300">—</span>';
+        const cf = cashflow ? money(cashflow) : '<span class="text-slate-300">—</span>';
         const cfCls = cashflow >= 0 ? 'text-green-600' : 'text-red-600';
-        const profit = gross;
-        const pfCls = profit >= 0 ? 'text-green-600' : 'text-red-600';
-        const pfVal = profit ? money(profit) : '<span class="text-slate-300">—</span>';
-        return `<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="planOpenPfEditModal(${pf.id})"><td class="p-2 text-center align-middle text-sm">${esc(pf.client_name || "")}</td><td class="p-2 text-sm font-medium text-center align-middle truncate" style="min-width:300px;max-width:300px;width:300px" title="${esc(pf.customer_name)}">${esc(pf.customer_name)}</td><td class="p-2 text-center align-middle text-sm" onclick="event.stopPropagation()">${planInlineSelect('weight', pf.id, 'weight', pf.weight || '20%', ['20%','40%','60%','80%','100%'])}</td><td class="p-2 text-center align-middle text-sm" onclick="event.stopPropagation()">${planInlineSelect('ptype', pf.id, 'project_type', pf.project_type || '待签约', ['待签约','已签约'])}</td><td class="p-2 text-center align-middle text-sm font-medium">${money(pf.sign_amount)}</td><td class="p-2 text-center text-blue-700 align-middle">${fmtNoUnit(rev)}</td><td class="p-2 text-center align-middle text-sm font-medium">${fmtNoUnit(gross)}</td><td class="p-2 text-center text-rose-700 align-middle">${fmtNoUnit(cost)}</td><td class="p-2 text-center font-semibold align-middle ${pfCls}">${pfVal}</td><td class="p-2 text-center text-amber-700 align-middle">${fmtNoUnit(payment)}</td><td class="p-2 text-center text-purple-700 align-middle">${fmtNoUnit(paid)}</td><td class="p-2 text-center font-semibold align-middle ${cfCls}">${cf}</td><td class="p-2 text-center align-middle text-sm">${exe}</td><td class="p-2 text-center align-middle text-sm">${payR}</td></tr>`;
+        return `<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="planOpenPfEditModal(${pf.id})"><td class="p-2 text-center align-middle text-sm">${esc(pf.client_name || "")}</td><td class="p-2 text-sm font-medium text-center align-middle truncate" style="min-width:300px;max-width:300px;width:300px" title="${esc(pf.customer_name)}">${esc(pf.customer_name)}</td><td class="p-2 text-center align-middle text-sm" onclick="event.stopPropagation()">${planInlineSelect('weight', pf.id, 'weight', pf.weight || '20%', ['20%','40%','60%','80%','100%'])}</td><td class="p-2 text-center align-middle text-sm" onclick="event.stopPropagation()">${planInlineSelect('ptype', pf.id, 'project_type', pf.project_type || '待签约', ['待签约','已签约'])}</td><td class="p-2 text-center align-middle text-sm font-medium">${money(pf.sign_amount)}</td><td class="p-2 text-center text-blue-700 align-middle">${fmtNoUnit(rev)}</td><td class="p-2 text-center align-middle text-sm font-medium">${fmtNoUnit(gross)}</td><td class="p-2 text-center align-middle text-sm">${grossR}</td><td class="p-2 text-center text-amber-700 align-middle">${fmtNoUnit(payment)}</td><td class="p-2 text-center align-middle text-sm">${payR}</td><td class="p-2 text-center text-rose-700 align-middle">${fmtNoUnit(cost)}</td><td class="p-2 text-center text-purple-700 align-middle">${fmtNoUnit(paid)}</td><td class="p-2 text-center align-middle text-sm">${paidR}</td><td class="p-2 text-center font-semibold align-middle ${cfCls}">${cf}</td></tr>`;
       };
       // 待签约简版行
       const tdRowUnsigned = (pf, cost, gross) => {
@@ -939,13 +933,18 @@ window.createPlanFinance = async (event) => {
       const result = await api("/api/planFinances", { method: "POST", body: JSON.stringify({ data }) });
       if (result.id && data.customer_name) logActivity("finance", result.id, "创建了「" + data.customer_name + "」的财务项目");
     }
+  } catch (error) {
+    toast("保存失败：" + error.message, "error");
+    return;
+  }
+  try {
     form.reset();
     document.querySelector("#plan_pf-id-input").value = "";
     document.querySelector("#planModalTitle").textContent = "新增项目财务";
     closePlanModal();
     await load();
   } catch (error) {
-    toast("保存失败：" + error.message, "error");
+    toast("刷新失败：" + error.message, "error");
   }
 };
 
@@ -1009,44 +1008,111 @@ function renderPlanOverview() {
     annualSums.payment += fm[i].payment; annualSums.paid += fm[i].paid;
   }
   const mLbl = ['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月'];
-  const LABELS = ['合同金额','确收金额','确收毛利','成本','项目利润','回款金额','已付','现金流'];
+  const LABELS = ['合同金额','确收金额','确收毛利','成本','支出','回款','项目现金流'];
   // 每行的年度累计 + 12个月值
   const annualVals = [
-    annualSums.sign, annualSums.revenue, annualSums.gross, annualSums.cost,
-    annualSums.gross - annualSums.cost, annualSums.payment, annualSums.paid,
-    annualSums.payment - annualSums.paid,
+    annualSums.sign, annualSums.revenue, annualSums.gross, annualSums.cost, annualSums.paid,
+    annualSums.payment, annualSums.payment - annualSums.paid,
   ];
-  // 字段映射: sign, revenue, gross, cost, profit(=gross-cost), payment, paid, cashflow(=payment-paid)
-  const fmFields = ['sign','revenue','gross','cost',null,'payment','paid',null];
+  // 字段映射: sign, revenue, gross, cost, paid, payment, cashflow(=payment-paid)
+  const fmFields = ['sign','revenue','gross','cost','paid','payment',null];
   var thead = '<tr class="border-b border-slate-200"><th class="py-2 text-left text-slate-500 whitespace-nowrap">指标</th><th class="py-2 text-right font-semibold text-slate-700 whitespace-nowrap">年度累计</th>';
   for (var mi = 0; mi < 12; mi++) { thead += '<th class="py-2 text-right font-semibold text-slate-600 whitespace-nowrap">' + mLbl[mi] + '</th>'; }
   thead += '</tr>';
   var tbody = '';
-  for (var ri = 0; ri < 8; ri++) {
+  for (var ri = 0; ri < 7; ri++) {
     var rowHtml = '<tr class="border-b border-slate-100 last:border-0"><td class="py-2 text-left font-semibold text-slate-700 whitespace-nowrap">' + LABELS[ri] + '</td>';
     rowHtml += '<td class="py-2 text-right font-semibold text-slate-800 whitespace-nowrap">' + moneyIntL(annualVals[ri]) + '</td>';
     for (var mi = 0; mi < 12; mi++) {
       var val = 0;
       if (fm[mi]) {
-        if (ri === 4) { val = (fm[mi].gross || 0) - (fm[mi].cost || 0); }
-        else if (ri === 7) { val = (fm[mi].payment || 0) - (fm[mi].paid || 0); }
+        if (ri === 6) { val = (fm[mi].payment || 0) - (fm[mi].paid || 0); }
         else { var fk = fmFields[ri]; if (fk) val = fm[mi][fk] || 0; }
       }
       var cls = 'text-slate-700';
-      if (ri === 4) cls = val >= 0 ? 'text-green-600' : 'text-red-600';
-      if (ri === 7) cls = val >= 0 ? 'text-green-600' : 'text-red-600';
+      if (ri === 2) cls = 'text-green-600';
+      if (ri === 6) cls = val >= 0 ? 'text-green-600' : 'text-red-600';
       rowHtml += '<td class="py-2 text-right text-sm whitespace-nowrap ' + cls + '">' + moneyIntL(val) + '</td>';
     }
     tbody += rowHtml + '</tr>';
   }
 
+  // 部门经营卡片：毛利、平台费用、利润
+  var planExp = state.data.planExpense || [];
+  var expMonthly = [0,0,0,0,0,0,0,0,0,0,0,0];
+  for (var ei = 0; ei < planExp.length; ei++) {
+    var em = (planExp[ei].expense_month || '').substring(0, 7);
+    var mi = parseInt(em.substring(5)) - 1;
+    if (mi >= 0 && mi < 12) expMonthly[mi] += parseFloat(planExp[ei].amount || 0);
+  }
+  var expAnnual = 0; for (var ei = 0; ei < 12; ei++) expAnnual += expMonthly[ei];
+  var grossAnnual = 0; for (var ei = 0; ei < 12; ei++) grossAnnual += (fm[ei] ? fm[ei].gross : 0);
+  var deptThead = '<tr class="border-b border-slate-200"><th class="py-2 text-left text-slate-500 whitespace-nowrap">指标</th><th class="py-2 text-right font-semibold text-slate-700 whitespace-nowrap">年度累计</th>';
+  for (var dmi = 0; dmi < 12; dmi++) { deptThead += '<th class="py-2 text-right font-semibold text-slate-600 whitespace-nowrap">' + mLbl[dmi] + '</th>'; }
+  deptThead += '</tr>';
+  var deptRows = [
+    { label: '毛利', vals: fm.map(function(x) { return x ? x.gross : 0; }), annual: grossAnnual },
+    { label: '平台费用', vals: expMonthly, annual: expAnnual },
+    { label: '利润', vals: fm.map(function(x, i) { return (x ? x.gross : 0) - expMonthly[i]; }), annual: grossAnnual - expAnnual }
+  ];
+  var deptTbody = '';
+  for (var dri = 0; dri < 3; dri++) {
+    var dr = deptRows[dri];
+    var rowCls = dri === 2 ? 'font-semibold' : '';
+    var rowHtml = '<tr class="border-b border-slate-100 last:border-0"><td class="py-2 text-left ' + rowCls + ' text-slate-700 whitespace-nowrap">' + dr.label + '</td>';
+    var annualCls = dri === 2 ? (dr.annual >= 0 ? 'text-green-600' : 'text-red-600') : 'text-slate-700';
+    rowHtml += '<td class="py-2 text-right ' + rowCls + ' ' + annualCls + ' whitespace-nowrap">' + moneyIntL(dr.annual) + '</td>';
+    for (var dmi = 0; dmi < 12; dmi++) {
+      var cellCls = dri === 2 ? (dr.vals[dmi] >= 0 ? 'text-green-600' : 'text-red-600') : 'text-slate-700';
+      rowHtml += '<td class="py-2 text-right text-sm whitespace-nowrap ' + cellCls + '">' + moneyIntL(dr.vals[dmi]) + '</td>';
+    }
+    deptTbody += rowHtml + '</tr>';
+  }
+  var deptCard = 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>' + deptThead + '</thead><tbody>' + deptTbody + '</tbody></table></div>', 'p-4');
+
+
+  // 业务线现金流卡片
+  var cfMonthly = [0,0,0,0,0,0,0,0,0,0,0,0];
+  for (var cfi = 0; cfi < 12; cfi++) { cfMonthly[cfi] = (fm[cfi] ? (fm[cfi].payment - fm[cfi].paid) : 0); }
+  var cfAnnual = 0; for (var cfi = 0; cfi < 12; cfi++) cfAnnual += cfMonthly[cfi];
+  var expPaidMonthly = [0,0,0,0,0,0,0,0,0,0,0,0];
+  for (var epi = 0; epi < planExp.length; epi++) {
+    var epm = (planExp[epi].expense_month || '').substring(0, 7);
+    var epmi = parseInt(epm.substring(5)) - 1;
+    if (epmi >= 0 && epmi < 12) expPaidMonthly[epmi] += parseFloat(planExp[epi].incurred_amount || 0);
+  }
+  var expPaidAnnual = 0; for (var epi = 0; epi < 12; epi++) expPaidAnnual += expPaidMonthly[epi];
+  var blCfMonthly = cfMonthly.map(function(v, i) { return v - expPaidMonthly[i]; });
+  var blCfAnnual = cfAnnual - expPaidAnnual;
+  var cfRows = [
+    { label: '项目现金流', vals: cfMonthly, annual: cfAnnual },
+    { label: '平台费用（已付）', vals: expPaidMonthly, annual: expPaidAnnual },
+    { label: '业务线现金流', vals: blCfMonthly, annual: blCfAnnual }
+  ];
+  var cfTbody = '';
+  for (var cfri = 0; cfri < 3; cfri++) {
+    var cfdr = cfRows[cfri];
+    var cfRowCls = cfri === 2 ? 'font-semibold' : '';
+    var cfValCls = cfri === 2 ? (cfdr.annual >= 0 ? 'text-green-600' : 'text-red-600') : 'text-slate-700';
+    var cfRowHtml = '<tr class="border-b border-slate-100 last:border-0"><td class="py-2 text-left ' + cfRowCls + ' text-slate-700 whitespace-nowrap">' + cfdr.label + '</td>';
+    cfRowHtml += '<td class="py-2 text-right ' + cfRowCls + ' ' + cfValCls + ' whitespace-nowrap">' + moneyIntL(cfdr.annual) + '</td>';
+    for (var cfdmi = 0; cfdmi < 12; cfdmi++) {
+      var cellCls = cfValCls;
+      if (cfri === 2) cellCls = blCfMonthly[cfdmi] >= 0 ? 'text-green-600' : 'text-red-600';
+      cfRowHtml += '<td class="py-2 text-right text-sm whitespace-nowrap ' + cellCls + '">' + moneyIntL(cfdr.vals[cfdmi]) + '</td>';
+    }
+    cfTbody += cfRowHtml + '</tr>';
+  }
+  var cfCard = 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>' + deptThead + '</thead><tbody>' + cfTbody + '</tbody></table></div>', 'p-4');
+
   document.querySelector("#planOverview").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('<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') +
+    deptCard +
+    cfCard +
+    '<div class="grid grid-cols-3 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="planChartSign"></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="planChartRev"></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="planChartCash"></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="planChartProfit"></canvas></div>', 'p-4') +
     '</div></div>';
 
   if (window.lucide) window.lucide.createIcons();
@@ -1062,7 +1128,7 @@ function renderPlanQuarterlyOverview() {
   const fm = computePlanMonthly(planFinances);
   const moneyIntL = (v) => Math.round(Number(v || 0)).toLocaleString("zh-CN");
   const card = (body, cls) => '<div class="card ' + (cls || 'p-4') + '">' + body + '</div>';
-  const LABELS = ['合同金额','确收金额','确收毛利','成本','项目利润','回款金额','已付','现金流'];
+  const LABELS = ['合同金额','确收金额','确收毛利','成本','支出'];
   const qLbl = ['Q1','Q2','Q3','Q4'];
   const qRanges = [[0,1,2],[3,4,5],[6,7,8],[9,10,11]];
   var annualSums2 = { sign: 0, revenue: 0, gross: 0, cost: 0, payment: 0, paid: 0 };
@@ -1071,20 +1137,18 @@ function renderPlanQuarterlyOverview() {
     annualSums2.gross += fm[i2].gross; annualSums2.cost += fm[i2].cost;
     annualSums2.payment += fm[i2].payment; annualSums2.paid += fm[i2].paid;
   }
-  const annualVals = [annualSums2.sign, annualSums2.revenue, annualSums2.gross, annualSums2.cost, annualSums2.gross - annualSums2.cost, annualSums2.payment, annualSums2.paid, annualSums2.payment - annualSums2.paid];
-  const fmFields = ['sign','revenue','gross','cost',null,'payment','paid',null];
+  const annualVals = [annualSums2.sign, annualSums2.revenue, annualSums2.gross, annualSums2.cost, annualSums2.paid];
+  const fmFields = ['sign','revenue','gross','cost','paid'];
 
   // Calculate quarterly sums
-  var qData = [[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0]];
+  var qData = [[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0]];
   for (var qi = 0; qi < 4; qi++) {
-    for (var ri = 0; ri < 8; ri++) {
+    for (var ri = 0; ri < 5; ri++) {
       var sum = 0;
       for (var mi = 0; mi < 3; mi++) {
         var idx = qRanges[qi][mi];
         if (fm[idx]) {
-          if (ri === 4) { sum += (fm[idx].gross||0) - (fm[idx].cost||0); }
-          else if (ri === 7) { sum += (fm[idx].payment||0) - (fm[idx].paid||0); }
-          else { var fk = fmFields[ri]; if (fk) sum += fm[idx][fk] || 0; }
+          var fk = fmFields[ri]; if (fk) sum += fm[idx][fk] || 0;
         }
       }
       qData[ri][qi] = sum;
@@ -1101,14 +1165,12 @@ function renderPlanQuarterlyOverview() {
   var qoq = function(cur, prev) { if (!prev) return '<span class="text-slate-300">—</span>'; var pct = Math.round((cur - prev) / prev * 100); var cls = pct >= 0 ? 'text-green-600' : 'text-red-600'; var sign = pct >= 0 ? '+' : ''; return '<span class="' + cls + '">' + sign + pct + '%</span>'; };
 
   var tbody = '';
-  for (var ri = 0; ri < 8; ri++) {
+  for (var ri = 0; ri < 5; ri++) {
     var rowHtml = '<tr class="border-b border-slate-100 last:border-0"><td class="py-2 text-left font-semibold text-slate-700 whitespace-nowrap">' + LABELS[ri] + '</td>';
     rowHtml += '<td class="py-2 text-right font-semibold text-slate-800 whitespace-nowrap">' + moneyIntL(annualVals[ri]) + '</td>';
     for (var qi = 0; qi < 4; qi++) {
       var val = qData[ri][qi];
       var cls = 'text-slate-700';
-      if (ri === 4) cls = val >= 0 ? 'text-green-600' : 'text-red-600';
-      if (ri === 7) cls = val >= 0 ? 'text-green-600' : 'text-red-600';
       rowHtml += '<td class="py-2 text-right text-sm whitespace-nowrap ' + cls + '">' + moneyIntL(val) + '</td>';
       if (qi > 0) {
         rowHtml += '<td class="py-2 text-right text-sm whitespace-nowrap">' + qoq(val, qData[ri][qi - 1]) + '</td>';
@@ -1144,11 +1206,6 @@ function renderPlanCharts(data) {
     if (state.planChart3) state.planChart3.destroy();
     state.planChart3 = 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("#planChartProfit");
-  if (c4 && window.Chart) {
-    if (state.planChart4) state.planChart4.destroy();
-    state.planChart4 = 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 }] } }));
-  }
 };
 
 function planInlineSelect(name, pfId, field, currentVal, options) {

static/modules/plan_expense.js

@@ -184,36 +184,35 @@ window.savePlanExpense = async function(event) {
   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;
+  var id = data.expense_id;
   delete data.expense_id;
+  data.tenant = state.tenant;
 
-  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();
+  try {
+    if (id) {
+      await api("/api/planExpense/" + id, { method: "PUT", body: JSON.stringify({ data }) });
+    } else {
+      await api("/api/planExpense", { method: "POST", body: JSON.stringify({ data }) });
+    }
+  } catch (error) {
+    toast("保存失败：" + error.message, "error");
+    return;
   }
   closePlanExpModal();
+  await load();
+  renderPlanExpense();
 };
 
 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();
+  try {
+    await api("/api/planExpense/" + id, { method: "DELETE" });
+  } catch (error) {
+    toast("删除失败：" + error.message, "error");
+    return;
   }
+  closePlanExpModal();
+  await load();
+  renderPlanExpense();
 };

templates/index.html

@@ -80,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.28</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.34</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">